@unito/integration-cli 0.63.3 → 0.63.4

package/dist/src/commands/oauth2.js

@@ -102,7 +102,7 @@ class Oauth2 extends core_1.Command {
             }
             const refreshToken = decryptionResult?.successful.refreshToken;
             core_1.ux.action.start(`Refreshing test account ${testAccount}`, undefined, { stdout: true });
-            credentials = await Oauth2Resource.updateToken(oauth2, refreshToken);
+            credentials = await Oauth2Resource.updateToken(oauth2, refreshToken, decryptionResult?.successful, environment);
             // If provider response doesn't contain a new refresh token, use the existing one
             credentials.refreshToken = credentials.refreshToken ?? refreshToken;
             core_1.ux.action.stop();

package/dist/src/resources/oauth2.d.ts

@@ -1,4 +1,4 @@
 import { Oauth2Response, Oauth2Payload } from '../services/oauth2';
 import { Environment } from './globalConfiguration';
 export declare function performOAuth2Flow(applicationCredentials: Oauth2Payload, environment?: Environment, credentialPayload?: Record<string, unknown>): Promise<Oauth2Response>;
-export declare function updateToken(applicationCredentials: Oauth2Payload, refreshToken: string): Promise<Oauth2Response>;
+export declare function updateToken(applicationCredentials: Oauth2Payload, refreshToken: string, credentialPayload?: Record<string, unknown>, environment?: Environment): Promise<Oauth2Response>;

package/dist/src/resources/oauth2.js

@@ -22,7 +22,7 @@ async function performOAuth2Flow(applicationCredentials, environment = globalCon
     }
     return oauth2Response;
 }
-async function updateToken(applicationCredentials, refreshToken) {
-    const oauthHelper = new oauth2_1.default(applicationCredentials);
+async function updateToken(applicationCredentials, refreshToken, credentialPayload, environment = globalConfiguration_1.Environment.Production) {
+    const oauthHelper = new oauth2_1.default(applicationCredentials, environment, credentialPayload);
     return oauthHelper.updateToken(refreshToken);
 }

package/dist/src/services/oauth2.js

@@ -250,7 +250,7 @@ class OAuth2Service {
             });
         }
         try {
-            const tokenResponse = await fetch(this.tokenUrl, {
+            const tokenResponse = await fetch((0, template_1.expandTemplate)(this.tokenUrl, templateVariables, { urlEncodeVariables: true }), {
                 headers: {
                     'Content-Type': this.requestContentType,
                     ...(tokenRequestHeaders ?? {}),

package/dist/test/commands/oauth2.test.js

@@ -303,4 +303,70 @@ describe('oauth2', () => {
         .it('must successfully decrypt all secrets', ctx => {
         (0, test_1.expect)(ctx.stderr).to.contain((0, styles_1.uncolorize)('The secret boom! could not be decrypted.'));
     });
+    test_1.test
+        .stdout()
+        .do(() => {
+        getConfigurationsStub.returns({
+            ...baseConfiguration,
+            testAccounts: {
+                development: credentials,
+            },
+        });
+        sinon
+            .stub(IntegrationsPlatform, 'encryptData')
+            .onFirstCall()
+            .resolves({ encryptedData: `${Configuration.ENCRYPTION_PREFIX}encryptedAccessToken` })
+            .onSecondCall()
+            .resolves({ encryptedData: `${Configuration.ENCRYPTION_PREFIX}encryptedRefreshToken` });
+    })
+        .stub(DecryptionResource, 'decryptEntries', stub => stub
+        .onFirstCall()
+        .resolves({ successful: { ...oauth2Information }, failed: [] })
+        .onSecondCall()
+        .resolves({ successful: { refreshToken: 'test-refresh-token' }, failed: [] }))
+        .command(['oauth2', '--test-account', 'development', '--environment', 'staging'])
+        .it('passes the staging environment to updateToken when specified', () => {
+        (0, test_1.expect)(performOAuth2FlowStub.getCalls().length).to.equal(0);
+        (0, test_1.expect)(updateTokenStub.getCalls().length).to.equal(1);
+        // Verify that updateToken was called with the correct environment parameter
+        const updateTokenCall = updateTokenStub.getCall(0);
+        (0, test_1.expect)(updateTokenCall.args).to.have.lengthOf(4);
+        (0, test_1.expect)(updateTokenCall.args[0]).to.deep.equal(oauth2Information); // oauth2 config
+        (0, test_1.expect)(updateTokenCall.args[1]).to.equal('test-refresh-token'); // refresh token
+        (0, test_1.expect)(updateTokenCall.args[2]).to.deep.equal({ refreshToken: 'test-refresh-token' }); // credential payload
+        (0, test_1.expect)(updateTokenCall.args[3]).to.equal('staging'); // environment
+    });
+    test_1.test
+        .stdout()
+        .do(() => {
+        getConfigurationsStub.returns({
+            ...baseConfiguration,
+            testAccounts: {
+                development: credentials,
+            },
+        });
+        sinon
+            .stub(IntegrationsPlatform, 'encryptData')
+            .onFirstCall()
+            .resolves({ encryptedData: `${Configuration.ENCRYPTION_PREFIX}encryptedAccessToken` })
+            .onSecondCall()
+            .resolves({ encryptedData: `${Configuration.ENCRYPTION_PREFIX}encryptedRefreshToken` });
+    })
+        .stub(DecryptionResource, 'decryptEntries', stub => stub
+        .onFirstCall()
+        .resolves({ successful: { ...oauth2Information }, failed: [] })
+        .onSecondCall()
+        .resolves({ successful: { refreshToken: 'test-refresh-token' }, failed: [] }))
+        .command(['oauth2', '--test-account', 'development'])
+        .it('defaults to production environment when no environment flag is specified', () => {
+        (0, test_1.expect)(performOAuth2FlowStub.getCalls().length).to.equal(0);
+        (0, test_1.expect)(updateTokenStub.getCalls().length).to.equal(1);
+        // Verify that updateToken was called with the default production environment
+        const updateTokenCall = updateTokenStub.getCall(0);
+        (0, test_1.expect)(updateTokenCall.args).to.have.lengthOf(4);
+        (0, test_1.expect)(updateTokenCall.args[0]).to.deep.equal(oauth2Information); // oauth2 config
+        (0, test_1.expect)(updateTokenCall.args[1]).to.equal('test-refresh-token'); // refresh token
+        (0, test_1.expect)(updateTokenCall.args[2]).to.deep.equal({ refreshToken: 'test-refresh-token' }); // credential payload
+        (0, test_1.expect)(updateTokenCall.args[3]).to.equal('production'); // environment (default)
+    });
 });

package/dist/test/resources/oauth2.test.js

@@ -52,4 +52,32 @@ describe('OAuth2Helper', () => {
             await strict_1.default.rejects(response, errors_1.FailedToRetrieveAccessTokenError);
         });
     });
+    describe('updateToken', () => {
+        let updateTokenStub;
+        beforeEach(() => {
+            updateTokenStub = sinon_1.default.stub(oauth2_1.default.prototype, 'updateToken');
+        });
+        it('should create OAuth2Service with credential payload and call updateToken', async () => {
+            const mockResponse = { accessToken: 'new-token', refreshToken: 'new-refresh-token' };
+            updateTokenStub.resolves(mockResponse);
+            const credentialPayload = { domain: 'test-domain', customVar: 'test-value' };
+            const refreshToken = 'test-refresh-token';
+            const result = await oauth2HelperResource.updateToken(authorizationInfo, refreshToken, credentialPayload);
+            // Assert that the OAuth2Service was instantiated with the credential payload
+            // and that updateToken was called with the refresh token
+            sinon_1.default.assert.calledOnce(updateTokenStub);
+            sinon_1.default.assert.calledWith(updateTokenStub, refreshToken);
+            strict_1.default.deepEqual(result, mockResponse);
+        });
+        it('should work without credential payload', async () => {
+            const mockResponse = { accessToken: 'new-token', refreshToken: 'new-refresh-token' };
+            updateTokenStub.resolves(mockResponse);
+            const refreshToken = 'test-refresh-token';
+            const result = await oauth2HelperResource.updateToken(authorizationInfo, refreshToken);
+            // Should still work when no credential payload is provided
+            sinon_1.default.assert.calledOnce(updateTokenStub);
+            sinon_1.default.assert.calledWith(updateTokenStub, refreshToken);
+            strict_1.default.deepEqual(result, mockResponse);
+        });
+    });
 });

package/dist/test/services/oauth2.test.js

@@ -422,6 +422,43 @@ describe('OAuth2Helper', () => {
                 const response = oauth2Helper.updateToken(refreshToken);
                 await strict_1.default.rejects(response, errors_1.InvalidRequestContentTypeError);
             });
+            describe('token URL template expansion', () => {
+                it('expands template variables in token URL during refresh', async () => {
+                    const credentialPayload = { domain: 'test-domain' };
+                    oauth2Helper = new oauth2_1.default({
+                        clientId: 'test-client-id',
+                        clientSecret: 'test-client-secret',
+                        authorizationUrl: 'https://provider.com/oauth/authorize',
+                        scopes: [{ name: 'scope1' }],
+                        tokenUrl: 'https://{+domain}.provider.com/oauth/token', // Template URL
+                        grantType: configurationTypes_1.GrantType.AUTHORIZATION_CODE,
+                        requestContentType: configurationTypes_1.RequestContentType.URL_ENCODED,
+                    }, globalConfiguration_1.Environment.Production, credentialPayload);
+                    const { refreshToken } = setupSuccessfulRefreshResponse();
+                    await oauth2Helper.updateToken(refreshToken);
+                    // Assert that the token URL was expanded with the domain
+                    sinon_1.default.assert.calledWith(fetchStub, 'https://test-domain.provider.com/oauth/token', sinon_1.default.match.object);
+                });
+                it('expands multiple template variables in token URL', async () => {
+                    const credentialPayload = {
+                        domain: 'my-company',
+                        environment: 'staging',
+                    };
+                    oauth2Helper = new oauth2_1.default({
+                        clientId: 'test-client-id',
+                        clientSecret: 'test-client-secret',
+                        authorizationUrl: 'https://provider.com/oauth/authorize',
+                        scopes: [{ name: 'scope1' }],
+                        tokenUrl: 'https://{+domain}.{+environment}.provider.com/oauth/token',
+                        grantType: configurationTypes_1.GrantType.AUTHORIZATION_CODE,
+                        requestContentType: configurationTypes_1.RequestContentType.URL_ENCODED,
+                    }, globalConfiguration_1.Environment.Production, credentialPayload);
+                    const { refreshToken } = setupSuccessfulRefreshResponse();
+                    await oauth2Helper.updateToken(refreshToken);
+                    // Assert that both template variables were expanded
+                    sinon_1.default.assert.calledWith(fetchStub, 'https://my-company.staging.provider.com/oauth/token', sinon_1.default.match.object);
+                });
+            });
         });
         describe('encodeBody', () => {
             it('encodes body data as URL-encoded when content type is URL_ENCODED', () => {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.63.3",
+  "version": "0.63.4",
   "commands": {
     "activity": {
       "id": "activity",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unito/integration-cli",
-  "version": "0.63.3",
+  "version": "0.63.4",
   "description": "Integration CLI",
   "bin": {
     "integration-cli": "./bin/run"