mirror of https://github.com/actions/toolkit
Addressed minor comments
parent
4631854e0f
commit
d9212ff45b
|
@ -1,5 +1,8 @@
|
||||||
# @actions/core Releases
|
# @actions/core Releases
|
||||||
|
|
||||||
|
### 1.6.0
|
||||||
|
- [Added OIDC Client function `getIDToken`](https://github.com/actions/toolkit/pull/887)
|
||||||
|
|
||||||
### 1.4.0
|
### 1.4.0
|
||||||
- [Added the `getMultilineInput` function](https://github.com/actions/toolkit/pull/829)
|
- [Added the `getMultilineInput` function](https://github.com/actions/toolkit/pull/829)
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "@actions/core",
|
"name": "@actions/core",
|
||||||
"version": "1.5.1",
|
"version": "1.6.0",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "@actions/core",
|
"name": "@actions/core",
|
||||||
"version": "1.5.1",
|
"version": "1.6.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@actions/http-client": "^1.0.11"
|
"@actions/http-client": "^1.0.11"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "@actions/core",
|
"name": "@actions/core",
|
||||||
"version": "1.5.1",
|
"version": "1.6.0",
|
||||||
"description": "Actions core lib",
|
"description": "Actions core lib",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"github",
|
"github",
|
||||||
|
|
|
@ -351,6 +351,6 @@ export function getState(name: string): string {
|
||||||
return process.env[`STATE_${name}`] || ''
|
return process.env[`STATE_${name}`] || ''
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function getIDToken(aud?: string | undefined): Promise<string> {
|
export async function getIDToken(aud?: string): Promise<string> {
|
||||||
return await OidcClient.getIDToken(aud)
|
return await OidcClient.getIDToken(aud)
|
||||||
}
|
}
|
|
@ -5,11 +5,11 @@ import {BearerCredentialHandler} from '@actions/http-client/auth'
|
||||||
import {debug, setSecret} from './core'
|
import {debug, setSecret} from './core'
|
||||||
|
|
||||||
interface TokenRequest {
|
interface TokenRequest {
|
||||||
aud: string | undefined
|
aud?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
interface TokenResponse {
|
interface TokenResponse {
|
||||||
value: string | undefined
|
value?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export class OidcClient {
|
export class OidcClient {
|
||||||
|
@ -45,7 +45,9 @@ export class OidcClient {
|
||||||
return runtimeUrl + '?api-version=' + OidcClient.getApiVersion()
|
return runtimeUrl + '?api-version=' + OidcClient.getApiVersion()
|
||||||
}
|
}
|
||||||
|
|
||||||
private static async postCall(httpclient: actions_http_client.HttpClient, id_token_url: string, data: TokenRequest): Promise<string> {
|
private static async postCall(id_token_url: string, data: TokenRequest): Promise<string> {
|
||||||
|
const httpclient = OidcClient.createHttpClient()
|
||||||
|
|
||||||
const res = await httpclient.postJson<TokenResponse>(id_token_url,data).catch((error) => {
|
const res = await httpclient.postJson<TokenResponse>(id_token_url,data).catch((error) => {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`Failed to get ID Token. \n
|
`Failed to get ID Token. \n
|
||||||
|
@ -55,7 +57,7 @@ export class OidcClient {
|
||||||
})
|
})
|
||||||
|
|
||||||
const id_token = res.result?.value
|
const id_token = res.result?.value
|
||||||
if (id_token === undefined) {
|
if (!id_token) {
|
||||||
throw new Error('Response json body do not have ID Token field')
|
throw new Error('Response json body do not have ID Token field')
|
||||||
}
|
}
|
||||||
return id_token
|
return id_token
|
||||||
|
@ -64,8 +66,6 @@ export class OidcClient {
|
||||||
|
|
||||||
static async getIDToken(audience: string | undefined): Promise<string> {
|
static async getIDToken(audience: string | undefined): Promise<string> {
|
||||||
try {
|
try {
|
||||||
const httpclient = OidcClient.createHttpClient()
|
|
||||||
|
|
||||||
// New ID Token is requested from action service
|
// New ID Token is requested from action service
|
||||||
const id_token_url: string = OidcClient.getIDTokenUrl()
|
const id_token_url: string = OidcClient.getIDTokenUrl()
|
||||||
|
|
||||||
|
@ -75,7 +75,7 @@ export class OidcClient {
|
||||||
|
|
||||||
debug(`audience is ${!!audience ? audience : 'not defined'}`)
|
debug(`audience is ${!!audience ? audience : 'not defined'}`)
|
||||||
|
|
||||||
const id_token = await OidcClient.postCall(httpclient ,id_token_url, data)
|
const id_token = await OidcClient.postCall(id_token_url, data)
|
||||||
setSecret(id_token)
|
setSecret(id_token)
|
||||||
return id_token
|
return id_token
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|
Loading…
Reference in New Issue