.

jfrog · Jan 1, 2024 · b9de761 · b9de761
1 parent 019192f
commit b9de761
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -39,7 +39,7 @@ function main() {
         try {
             core.startGroup('Setup JFrog CLI');
             utils_1.Utils.setCliEnv();
-            console.log("ERAN CHECK: ####################### 11 #######################"); // TODO del
+            console.log("ERAN CHECK: ####################### 12 #######################"); // TODO del
             let accessToken = yield utils_1.Utils.getJfrogAccessToken();
             console.log(`ERAN CHECK: finished access token flow with access token: ${accessToken}`); // TODO del
             yield utils_1.Utils.getAndAddCliToPath();

diff --git a/lib/utils.js b/lib/utils.js
@@ -85,24 +85,33 @@ class Utils {
     static getAccessTokenFromJWT(basicUrl, jsonWebToken) {
         return __awaiter(this, void 0, void 0, function* () {
             const exchangeUrl = basicUrl.replace(/\/$/, '') + "/access/api/v1/oidc/token";
-            console.log(`ERAN CHECK: Url for REST command: ${exchangeUrl}`); // TODO del
+            console.log(`ERAN CHECK: Exchanging JWT with ACCESS TOKEN. Url for REST command: ${exchangeUrl}`); // TODO del
             console.log("Exchanging JSON web token with access token");
             const audience = core.getInput(Utils.OIDC_AUDIENCE_ARG, { required: false });
             const httpClient = new http_client_1.HttpClient();
+            // TODO fix request
             try {
-                const dataString = JSON.stringify({
+                /*
+                const dataString: string = JSON.stringify({
                     grant_type: "urn:ietf:params:oauth:grant-type:token-exchange",
-                    subject_token_type: "urn:ietf:params:oauth:token-type:access_token",
+                    subject_token_type: "urn:ietf:params:oauth:token-type:access_token", //TODO try: id-token -> access_token
                     subject_token: jsonWebToken,
                     provider_name: "github-oidc" // https://token.actions.githubusercontent.com
                     //assertion: jsonWebToken,
-                    //audience: audience,
+                    //audience: audience, //TODO should I pass audience here as well? it was passed to the JWT generator
                 });
-                const headers = {
+                 */
+                const data = `{
+                "grant_type": "urn:ietf:params:oauth:grant-type:token-exchange",
+                "subject_token_type": "urn:ietf:params:oauth:token-type:id_token",
+                "subject_token": "${jsonWebToken}",
+                "provider_name": "github-oidc-integration"
+            }`;
+                const additionalHeaders = {
                     'Content-Type': 'application/json',
                 };
                 console.log(`ERAN CHECK: starting POST`); // TODO del
-                const response = yield httpClient.post(exchangeUrl, dataString, headers);
+                const response = yield httpClient.post(exchangeUrl, data, additionalHeaders);
                 console.log(`ERAN CHECK: POST succeeded`); // TODO del
                 const responseData = yield response.readBody();
                 console.log(`ERAN CHECK: response string: ${responseData}`); // TODO del

diff --git a/src/main.ts b/src/main.ts
@@ -5,7 +5,7 @@ async function main() {
     try {
         core.startGroup('Setup JFrog CLI');
         Utils.setCliEnv();
-        console.log("ERAN CHECK: ####################### 12 #######################") // TODO del
+        console.log("ERAN CHECK: ####################### 13 #######################") // TODO del
         let accessToken :string = await Utils.getJfrogAccessToken()
         console.log(`ERAN CHECK: finished access token flow with access token: ${accessToken}`) // TODO del
         await Utils.getAndAddCliToPath();

diff --git a/src/utils.ts b/src/utils.ts
@@ -104,7 +104,7 @@ export class Utils {
 
             const data = `{
                 "grant_type": "urn:ietf:params:oauth:grant-type:token-exchange",
-                "subject_token_type": "urn:ietf:params:oauth:token-type:id_token",
+                "subject_token_type": "urn:ietf:params:oauth:token-type:access_token",
                 "subject_token": "${jsonWebToken}",
                 "provider_name": "github-oidc-integration"
             }`;