diff --git a/lib/oidc-utils.js b/lib/oidc-utils.js index 88e598d58..e230a3326 100644 --- a/lib/oidc-utils.js +++ b/lib/oidc-utils.js @@ -233,7 +233,7 @@ class OidcUtils { * @private */ static buildOidcTokenExchangePayload(jwt, providerName, applicationKey) { - var _a, _b, _c, _d, _e, _f, _g, _h; + var _a, _b, _c, _d, _e, _f; return { grant_type: 'urn:ietf:params:oauth:grant-type:token-exchange', subject_token_type: 'urn:ietf:params:oauth:token-type:id_token', @@ -246,16 +246,11 @@ class OidcUtils { gh_repo: (_d = process.env.GITHUB_REPOSITORY) !== null && _d !== void 0 ? _d : '', gh_revision: (_e = process.env.GITHUB_SHA) !== null && _e !== void 0 ? _e : '', gh_branch: (_f = process.env.GITHUB_REF_NAME) !== null && _f !== void 0 ? _f : '', + // AppTrust context parameters + repo: process.env.GITHUB_REPOSITORY, + revision: process.env.GITHUB_SHA, + branch: process.env.GITHUB_REF_NAME, application_key: applicationKey, - // This object is planned to be expanded as needed - // even though currently it contains some duplicated parameters - context: { - vcs_commit: { - vcs_url: utils_1.Utils.buildVcsUrl(), - branch: (_g = process.env.GITHUB_REF_NAME) !== null && _g !== void 0 ? _g : '', - revision: (_h = process.env.GITHUB_SHA) !== null && _h !== void 0 ? _h : '', - }, - }, }; } /** diff --git a/src/oidc-utils.ts b/src/oidc-utils.ts index 2769070d5..a7b324ce2 100644 --- a/src/oidc-utils.ts +++ b/src/oidc-utils.ts @@ -234,16 +234,11 @@ export class OidcUtils { gh_repo: process.env.GITHUB_REPOSITORY ?? '', gh_revision: process.env.GITHUB_SHA ?? '', gh_branch: process.env.GITHUB_REF_NAME ?? '', + // AppTrust context parameters + repo: process.env.GITHUB_REPOSITORY, + revision: process.env.GITHUB_SHA, + branch: process.env.GITHUB_REF_NAME, application_key: applicationKey, - // This object is planned to be expanded as needed - // even though currently it contains some duplicated parameters - context: { - vcs_commit: { - vcs_url: Utils.buildVcsUrl(), - branch: process.env.GITHUB_REF_NAME ?? '', - revision: process.env.GITHUB_SHA ?? '', - }, - }, }; }