revert

Author: EyalDelarea

lib/oidc-utils.js

@@ -223,21 +223,33 @@ class OidcUtils {
         core.exportVariable('JFROG_CLI_USAGE_OIDC_USED', 'TRUE');
     }
     static buildOidcTokenExchangePayload(jwt, providerName, applicationKey) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         return {
             grant_type: 'urn:ietf:params:oauth:grant-type:token-exchange',
             subject_token_type: 'urn:ietf:params:oauth:token-type:id_token',
             subject_token: jwt,
             provider_name: providerName,
             project_key: (_a = process.env.JF_PROJECT) !== null && _a !== void 0 ? _a : '',
-            job_id: (_b = process.env.GITHUB_JOB) !== null && _b !== void 0 ? _b : '',
-            run_id: (_c = process.env.GITHUB_RUN_ID) !== null && _c !== void 0 ? _c : '',
-            repo: (_d = process.env.GITHUB_REPOSITORY) !== null && _d !== void 0 ? _d : '',
-            revision: (_e = process.env.GITHUB_SHA) !== null && _e !== void 0 ? _e : '',
-            branch: (_f = process.env.GITHUB_REF_NAME) !== null && _f !== void 0 ? _f : '',
+            gh_job_id: (_b = process.env.GITHUB_JOB) !== null && _b !== void 0 ? _b : '',
+            gh_run_id: (_c = process.env.GITHUB_RUN_ID) !== null && _c !== void 0 ? _c : '',
+            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 : '',
             application_key: applicationKey,
+            context: {
+                vcs_commit: {
+                    vcs_url: this.buildVcsUrl(),
+                    branch: (_g = process.env.GITHUB_REF_NAME) !== null && _g !== void 0 ? _g : '',
+                    revision: (_h = process.env.GITHUB_SHA) !== null && _h !== void 0 ? _h : '',
+                },
+            },
         };
     }
+    static buildVcsUrl() {
+        const serverUrl = process.env.GITHUB_SERVER_URL;
+        const repo = process.env.GITHUB_REPOSITORY;
+        return serverUrl && repo ? `${serverUrl}/${repo}` : '';
+    }
     /**
      * Retrieves the application key from .jfrog/config file.
      *

src/oidc-utils.ts

@@ -218,15 +218,28 @@ export class OidcUtils {
             subject_token: jwt,
             provider_name: providerName,
             project_key: process.env.JF_PROJECT ?? '',
-            job_id: process.env.GITHUB_JOB ?? '',
-            run_id: process.env.GITHUB_RUN_ID ?? '',
-            repo: process.env.GITHUB_REPOSITORY ?? '',
-            revision: process.env.GITHUB_SHA ?? '',
-            branch: process.env.GITHUB_REF_NAME ?? '',
+            gh_job_id: process.env.GITHUB_JOB ?? '',
+            gh_run_id: process.env.GITHUB_RUN_ID ?? '',
+            gh_repo: process.env.GITHUB_REPOSITORY ?? '',
+            gh_revision: process.env.GITHUB_SHA ?? '',
+            gh_branch: process.env.GITHUB_REF_NAME ?? '',
             application_key: applicationKey,
+            context: {
+                vcs_commit: {
+                    vcs_url: this.buildVcsUrl(),
+                    branch: process.env.GITHUB_REF_NAME ?? '',
+                    revision: process.env.GITHUB_SHA ?? '',
+                },
+            },
         };
     }
 
+    private static buildVcsUrl(): string {
+        const serverUrl: string | undefined = process.env.GITHUB_SERVER_URL;
+        const repo: string | undefined = process.env.GITHUB_REPOSITORY;
+        return serverUrl && repo ? `${serverUrl}/${repo}` : '';
+    }
+
     /**
      * Retrieves the application key from .jfrog/config file.
      *