@unito/integration-cli 0.58.0 → 0.58.1

package/dist/.eslintrc.d.ts

@@ -4,13 +4,13 @@ export declare namespace env {
 export declare let plugins: string[];
 declare let _extends: string[];
 export { _extends as extends };
-export declare let rules: {
-    'no-console': string;
-};
-export declare let ignorePatterns: string[];
 export declare let overrides: {
     files: string[];
     rules: {
         '@typescript-eslint/no-floating-promises': string;
     };
 }[];
+export declare let rules: {
+    'no-console': string;
+};
+export declare let ignorePatterns: string[];

package/dist/.eslintrc.js

@@ -10,6 +10,14 @@ module.exports = {
         'eslint:recommended',
         'plugin:@typescript-eslint/recommended',
     ],
+    overrides: [
+        {
+            'files': ['test/**/*.test.ts'],
+            'rules': {
+                '@typescript-eslint/no-floating-promises': 'off'
+            }
+        }
+    ],
     rules: {
         'no-console': 'off',
     },

package/dist/src/commands/oauth2.js

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const configuration_1 = require("../resources/configuration");
-const Oauth2Helper = tslib_1.__importStar(require("../resources/oauth2Helper"));
+const Oauth2Resource = tslib_1.__importStar(require("../resources/oauth2"));
 const IntegrationsPlatform = tslib_1.__importStar(require("../services/integrationsPlatform"));
 const configurationTypes_1 = require("../configurationTypes");
 const errors_1 = require("../errors");
@@ -56,9 +56,9 @@ class Oauth2 extends core_1.Command {
     }
     async run() {
         const { flags } = await this.parse(Oauth2);
-        const testAccount = flags['test-account'] ?? 'development';
         const environment = flags.environment ?? globalConfiguration_1.Environment.Production;
-        const configuration = await (0, configuration_1.getConfiguration)(environment, flags['config-path']);
+        const customConfigPath = flags['config-path'];
+        const configuration = await (0, configuration_1.getConfiguration)(environment, customConfigPath);
         // First check for development oauth2 authorization scheme
         let oauth2 = configuration.authorizations?.find(authorization => authorization.method === configurationTypes_1.Method.OAUTH2 && authorization.development)?.oauth2;
         // Try for any oauth2 authorization scheme if there was no development one
@@ -70,22 +70,23 @@ class Oauth2 extends core_1.Command {
         }
         // Decrypt any encrypted oauth2 fields (mainly clientSecret)
         oauth2 = (await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, oauth2)).entries;
-        const account = testAccount === 'development' ? configuration.testAccounts?.development : configuration.testAccounts?.compliance;
+        const testAccount = flags['test-account'];
+        const testAccountCredentials = configuration.testAccounts?.[testAccount];
         let credentials;
-        if (!account || Object.entries(account).length === 0 || flags.reauth) {
-            core_1.ux.action.start(`Starting Oauth2 flow for account: ${testAccount}`, undefined, { stdout: true });
-            credentials = await Oauth2Helper.performOAuth2Flow(oauth2, environment);
-            core_1.ux.action.stop();
+        if (!testAccountCredentials?.accessToken || flags.reauth) {
+            core_1.ux.log(`Starting Oauth2 flow for test account: ${testAccount}`);
+            credentials = await Oauth2Resource.performOAuth2Flow(oauth2, environment, testAccountCredentials);
+            core_1.ux.log(`Oauth2 flow... Done`);
         }
         else {
-            if (!account?.refreshToken) {
+            if (!testAccountCredentials?.refreshToken) {
                 core_1.ux.log(chalk_1.default.redBright('No refresh token found, nothing to do.'));
                 return;
             }
-            const decryptionResult = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, account);
+            const decryptionResult = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, testAccountCredentials);
             const refreshToken = decryptionResult.entries?.refreshToken;
-            core_1.ux.action.start(`Refreshing test account ${testAccount}`, undefined, { stdout: true });
-            credentials = await Oauth2Helper.updateToken(oauth2, refreshToken);
+            core_1.ux.action.start(`Refreshing test account ${testAccountCredentials}`, undefined, { stdout: true });
+            credentials = await Oauth2Resource.updateToken(oauth2, refreshToken);
             // If provider response doesn't contain a new refresh token, use the one we already have
             if (!credentials.refreshToken) {
                 credentials.refreshToken = refreshToken;
@@ -99,7 +100,7 @@ class Oauth2 extends core_1.Command {
             core_1.ux.action.stop();
         }
         core_1.ux.action.start(`Saving credentials for account: ${testAccount}`, undefined, { stdout: true });
-        await (0, configuration_1.writeTestAccount)(configuration, credentials, testAccount);
+        await (0, configuration_1.writeTestAccount)(configuration, environment, customConfigPath, credentials, testAccount);
         core_1.ux.action.stop();
         return;
     }

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

@@ -24,7 +24,7 @@ export declare function getConfiguration(environment: Environment, customConfigP
  * Write the configuration to the default configuration file.
  */
 export declare function writeConfiguration(configuration: Configuration, environment?: Environment, customConfigPath?: string): Promise<void>;
-export declare function writeTestAccount(configuration: Configuration, account: {
+export declare function writeTestAccount(configuration: Configuration, environment: Environment | undefined, customConfigPath: string | undefined, account: {
     accessToken: string;
     refreshToken?: string;
 }, accountName: string): Promise<void>;

package/dist/src/resources/configuration.js

@@ -95,14 +95,14 @@ async function writeConfiguration(configuration, environment = globalConfigurati
     await fs.promises.writeFile(configurationPath, JSON.stringify(configuration, null, 2));
 }
 exports.writeConfiguration = writeConfiguration;
-async function writeTestAccount(configuration, account, accountName) {
+async function writeTestAccount(configuration, environment = globalConfiguration_1.Environment.Production, customConfigPath, account, accountName) {
     // istanbul ignore next
     if (accountName !== 'development' && accountName !== 'compliance') {
         throw new Error('Invalid account name');
     }
-    configuration.testAccounts = configuration.testAccounts ?? {};
-    configuration.testAccounts[accountName] = account;
-    await writeConfiguration(configuration);
+    configuration.testAccounts ??= {};
+    configuration.testAccounts[accountName] = { ...configuration.testAccounts[accountName], ...account };
+    await writeConfiguration(configuration, environment, customConfigPath);
 }
 exports.writeTestAccount = writeTestAccount;
 async function validateConfiguration(configuration) {

package/dist/src/resources/{oauth2Helper.d.ts → oauth2.d.ts}

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

package/dist/src/resources/{oauth2Helper.js → oauth2.js}

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateToken = exports.performOAuth2Flow = void 0;
 const tslib_1 = require("tslib");
-const oauth2Helper_1 = tslib_1.__importDefault(require("../services/oauth2Helper"));
+const oauth2_1 = tslib_1.__importDefault(require("../services/oauth2"));
 const errors_1 = require("../errors");
 const globalConfiguration_1 = require("./globalConfiguration");
-async function performOAuth2Flow(applicationCredentials, environment = globalConfiguration_1.Environment.Production) {
-    const oauthHelper = new oauth2Helper_1.default(applicationCredentials, environment);
+async function performOAuth2Flow(applicationCredentials, environment = globalConfiguration_1.Environment.Production, credentialPayload) {
+    const oauthHelper = new oauth2_1.default(applicationCredentials, environment, credentialPayload);
     const serverUrl = await oauthHelper.startServer();
     const healthCheck = await fetch(`${serverUrl}/health`);
     if (healthCheck.status !== 200) {
@@ -21,10 +21,8 @@ async function performOAuth2Flow(applicationCredentials, environment = globalCon
     return oauth2Response;
 }
 exports.performOAuth2Flow = performOAuth2Flow;
-/* istanbul ignore next */
-// No point to test this function as it is just a wrapper around OAuth2Helper
 async function updateToken(applicationCredentials, refreshToken) {
-    const oauthHelper = new oauth2Helper_1.default(applicationCredentials);
+    const oauthHelper = new oauth2_1.default(applicationCredentials);
     return oauthHelper.updateToken(refreshToken);
 }
 exports.updateToken = updateToken;

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

@@ -0,0 +1,3 @@
+export declare function parseTemplate(template: string): {
+    expand: (context: Record<string, unknown>) => string;
+};

package/dist/src/resources/template.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseTemplate = void 0;
+const operators = Object.freeze(['+']);
+function encode(value) {
+    return value
+        ? value
+            .toString()
+            .split(/(%[0-9A-Fa-f]{2})/g)
+            .map(function (part) {
+            if (!/%[0-9A-Fa-f]/.test(part)) {
+                part = encodeURI(part).replace(/%5B/g, '[').replace(/%5D/g, ']');
+            }
+            return part;
+        })
+            .join('')
+        : '';
+}
+function parseTemplate(template) {
+    return {
+        expand: function (context) {
+            return template.replace(/\{([^{}]+)\}|([^{}]+)/g, function (_, expression, literal) {
+                if (expression) {
+                    if (operators.indexOf(expression.charAt(0)) !== -1) {
+                        expression = expression.substr(1);
+                        return encode(context[expression]);
+                    }
+                    else {
+                        // For now, if no '+' operator is present, do not expand
+                        return `{${expression}}`;
+                    }
+                }
+                else {
+                    return encode(literal);
+                }
+            });
+        },
+    };
+}
+exports.parseTemplate = parseTemplate;

package/dist/src/services/{oauth2Helper.d.ts → oauth2.d.ts}

@@ -25,7 +25,7 @@ export interface TokenPayload extends Oauth2Credentials {
     code: string;
 }
 export type Oauth2Payload = Oauth2;
-declare class OAuth2Helper {
+declare class OAuth2Service {
     private environment;
     private server;
     private clientId;
@@ -39,6 +39,7 @@ declare class OAuth2Helper {
     private serverUrl;
     private tokenRequestParameters;
     private refreshRequestParameters;
+    private credentialPayload;
     /**
      * Constructs an instance of OAuthHelper.
      * @param clientId The client ID for your OAuth application.
@@ -47,7 +48,7 @@ declare class OAuth2Helper {
      * @param scopes The scopes required for the OAuth authorization.
      * @param providerTokenUrl The URL for the token endpoint of the provider.
      */
-    constructor(authorizationInfo: Oauth2Payload, environment?: Environment);
+    constructor(authorizationInfo: Oauth2Payload, environment?: Environment, credentialPayload?: Record<string, unknown>);
     /**
      * Initiate the authorization flow and redirects the user to the provider's authorization page.
      */
@@ -75,4 +76,4 @@ declare class OAuth2Helper {
      */
     stopServer(): Promise<void>;
 }
-export default OAuth2Helper;
+export default OAuth2Service;

package/dist/src/services/{oauth2Helper.js → oauth2.js}

@@ -8,13 +8,15 @@ const openUrl = tslib_1.__importStar(require("openurl"));
 const ngrok_1 = tslib_1.__importDefault(require("ngrok"));
 const IntegrationsPlatformClient = tslib_1.__importStar(require("./integrationsPlatform"));
 const configurationTypes_1 = require("../configurationTypes");
+const template_1 = require("../resources/template");
 const errors_1 = require("../errors");
 const globalConfiguration_1 = require("../resources/globalConfiguration");
 // It allows to stub openUrl library in the test
 exports.open = openUrl;
 exports.HTML_ERROR_MSG = `<!doctype html><head><title>Unito</title></head><body style="text-align:center"> An unknown error occured </body>`;
 exports.HTML_SUCCESS_MSG = `<!doctype html><head><title>Unito</title></head><body style="text-align:center"> Redirected to the CLI successfully </body>`;
-class OAuth2Helper {
+const AUTHORIZATION_RESPONSE_QUERY_PARAMS = ['code', 'state', 'error', 'error_description', 'error_uri'];
+class OAuth2Service {
     environment;
     server = null;
     clientId;
@@ -28,6 +30,7 @@ class OAuth2Helper {
     serverUrl = '';
     tokenRequestParameters;
     refreshRequestParameters;
+    credentialPayload;
     /**
      * Constructs an instance of OAuthHelper.
      * @param clientId The client ID for your OAuth application.
@@ -36,7 +39,7 @@ class OAuth2Helper {
      * @param scopes The scopes required for the OAuth authorization.
      * @param providerTokenUrl The URL for the token endpoint of the provider.
      */
-    constructor(authorizationInfo, environment = globalConfiguration_1.Environment.Production) {
+    constructor(authorizationInfo, environment = globalConfiguration_1.Environment.Production, credentialPayload) {
         const { clientId, clientSecret, authorizationUrl, scopes, tokenUrl, grantType, requestContentType, refreshRequestParameters, tokenRequestParameters, } = authorizationInfo;
         this.startServer = this.startServer.bind(this);
         this.stopServer = this.stopServer.bind(this);
@@ -51,6 +54,7 @@ class OAuth2Helper {
         this.tokenRequestParameters = tokenRequestParameters;
         this.refreshRequestParameters = refreshRequestParameters;
         this.environment = environment;
+        this.credentialPayload = credentialPayload;
         if (!Object.values(configurationTypes_1.RequestContentType).includes(this.requestContentType)) {
             throw new errors_1.UnsupportedContentTypeError(`Request content type not supported: ${this.requestContentType}`);
         }
@@ -62,22 +66,27 @@ class OAuth2Helper {
         if (!this.providerAuthorizationUrl) {
             throw new errors_1.InvalidRequestContentTypeError('authorizationUrl must be defined in .unito.json');
         }
-        const authUrl = new URL(this.providerAuthorizationUrl);
-        const params = new URLSearchParams(authUrl.search);
+        const authorizationParams = new URLSearchParams();
         if (this.clientId) {
-            params.set('client_id', this.clientId);
+            authorizationParams.set('client_id', this.clientId);
+        }
+        if (this.scopes) {
+            authorizationParams.set('scope', this.scopes.join(' '));
         }
-        params.set('redirect_uri', `${IntegrationsPlatformClient.Servers[this.environment]}/credentials/new/oauth2/callback-cli`);
         const state = Buffer.from(JSON.stringify({
             cliCallbackUrl: `${this.serverUrl}/oauth2/callback`,
         })).toString('base64');
-        params.set('state', state);
-        if (this.scopes) {
-            params.set('scope', this.scopes.join(' '));
-        }
-        params.set('response_type', 'code');
-        authUrl.search = params.toString();
-        exports.open.open(authUrl.toString());
+        authorizationParams.set('state', state);
+        authorizationParams.set('response_type', 'code');
+        authorizationParams.set('redirect_uri', `${IntegrationsPlatformClient.Servers[this.environment]}/credentials/new/oauth2/callback-cli`);
+        const delimiter = this.providerAuthorizationUrl.includes('?') ? '&' : '?';
+        const authorizationUrlTemplate = `${this.providerAuthorizationUrl}${delimiter}${authorizationParams.toString()}`;
+        const authorizationUrl = (0, template_1.parseTemplate)(authorizationUrlTemplate).expand({
+            ...(this.credentialPayload ?? {}),
+            ...Object.fromEntries(authorizationParams.entries()),
+        });
+        console.log('  Calling the following authorization URL: \n  ', authorizationUrl);
+        exports.open.open(authorizationUrl);
     }
     /**
      * Handles the callback request from the provider and stores the authorization code.
@@ -93,28 +102,39 @@ class OAuth2Helper {
             res.setHeader('Content-Type', 'text/html').send(exports.HTML_ERROR_MSG);
             return;
         }
-        const code = req.query.code;
-        const bodyData = {
-            code,
+        // We keep all the non-standard query parameters of the authorization response
+        // so they can be used later on for the access token request (see tokenRequestParameters).
+        const authorizationResponseVariables = {};
+        for (const [key, value] of Object.entries(req.query)) {
+            if (!AUTHORIZATION_RESPONSE_QUERY_PARAMS.includes(key)) {
+                authorizationResponseVariables[`authorizationResponse.${key}`] = value?.toString() ?? '';
+            }
+        }
+        const templateVariables = { ...(this.credentialPayload ?? {}), ...authorizationResponseVariables };
+        const tokenRequestPayload = {
+            ...Object.fromEntries(Object.entries(this.tokenRequestParameters?.body ?? {}).map(([key, value]) => [
+                key,
+                typeof value === 'string' ? decodeURIComponent((0, template_1.parseTemplate)(value).expand(templateVariables)) : value,
+            ])),
             grant_type: this.grantType,
+            code: req.query.code,
             redirect_uri: `${IntegrationsPlatformClient.Servers[this.environment]}/credentials/new/oauth2/callback-cli`,
+            ...(this.clientId && { client_id: this.clientId }),
+            ...(this.clientSecret && { client_secret: this.clientSecret }),
         };
-        if (this.clientId) {
-            bodyData.client_id = this.clientId;
-        }
-        if (this.clientSecret) {
-            bodyData.client_secret = this.clientSecret;
-        }
-        const fetchOptions = {
-            headers: {
-                'Content-type': this.requestContentType,
-                ...(this.tokenRequestParameters?.header ?? {}),
-            },
-            body: this.encodeBody(bodyData, this.requestContentType),
-            method: 'POST',
+        const tokenRequestHeaders = {
+            'Content-Type': this.requestContentType,
+            ...Object.fromEntries(Object.entries(this.tokenRequestParameters?.header ?? {}).map(([key, value]) => [
+                key,
+                decodeURIComponent((0, template_1.parseTemplate)(String(value)).expand(templateVariables)),
+            ])),
         };
         try {
-            const fetchResult = await fetch(this.tokenUrl, fetchOptions);
+            const fetchResult = await fetch((0, template_1.parseTemplate)(this.tokenUrl).expand(templateVariables), {
+                headers: tokenRequestHeaders,
+                body: this.encodeBody(tokenRequestPayload, this.requestContentType),
+                method: 'POST',
+            });
             if (fetchResult.status !== 200) {
                 res.setHeader('Content-Type', 'text/html');
                 res.send(exports.HTML_ERROR_MSG);
@@ -176,7 +196,7 @@ class OAuth2Helper {
         }
         const fetchOptions = {
             headers: {
-                'Content-type': this.requestContentType,
+                'Content-Type': this.requestContentType,
                 ...(this.refreshRequestParameters?.header ?? {}),
             },
             body: this.encodeBody(bodyData, this.requestContentType),
@@ -214,7 +234,7 @@ class OAuth2Helper {
         });
         app.get('/oauth2/callback', this.handleCallback);
         this.server = app.listen(PORT, () => {
-            console.log(`Listening at port ${PORT}`);
+            console.log(`  Listening at port ${PORT}`);
         });
         return this.serverUrl;
     }
@@ -226,9 +246,9 @@ class OAuth2Helper {
         if (this.server) {
             await ngrok_1.default.kill();
             this.server.close(() => {
-                console.log('Server has stopped');
+                console.log('  Server has stopped');
             });
         }
     }
 }
-exports.default = OAuth2Helper;
+exports.default = OAuth2Service;

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

@@ -6,7 +6,7 @@ const core_1 = require("@oclif/core");
 const sinon = tslib_1.__importStar(require("sinon"));
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const Configuration = tslib_1.__importStar(require("../../src/resources/configuration"));
-const oauth2Service = tslib_1.__importStar(require("../../src/resources/oauth2Helper"));
+const oauth2Service = tslib_1.__importStar(require("../../src/resources/oauth2"));
 const IntegrationsPlatform = tslib_1.__importStar(require("../../src/services/integrationsPlatform"));
 const decryptionResource = tslib_1.__importStar(require("../../src/resources/decryption"));
 const configurationTypes_1 = require("../../src/configurationTypes");
@@ -87,6 +87,7 @@ describe('oauth2', () => {
         (0, test_1.expect)(performOAuth2FlowStub.getCall(0).args).to.deep.equal([
             { ...oauth2Information, clientId: 'devClientID' },
             'production',
+            undefined,
         ]);
         (0, test_1.expect)(updateTokenStub.getCalls().length).to.equal(0);
         (0, test_1.expect)(writeTestAccountStub.getCall(0).args).to.deep.equal([
@@ -102,6 +103,8 @@ describe('oauth2', () => {
                     },
                 ],
             },
+            'production',
+            undefined,
             credentials,
             'development',
         ]);
@@ -112,7 +115,13 @@ describe('oauth2', () => {
         .it('performs the oauth flow when there is no test accounts and the auth information are setup', () => {
         (0, test_1.expect)(performOAuth2FlowStub.getCalls().length).to.equal(1);
         (0, test_1.expect)(updateTokenStub.getCalls().length).to.equal(0);
-        (0, test_1.expect)(writeTestAccountStub.getCall(0).args).to.deep.equal([baseConfiguration, credentials, 'development']);
+        (0, test_1.expect)(writeTestAccountStub.getCall(0).args).to.deep.equal([
+            baseConfiguration,
+            'production',
+            undefined,
+            credentials,
+            'development',
+        ]);
     });
     test_1.test
         .stdout()
@@ -133,6 +142,8 @@ describe('oauth2', () => {
                     development: credentials,
                 },
             },
+            'production',
+            undefined,
             credentials,
             'development',
         ]);
@@ -156,6 +167,8 @@ describe('oauth2', () => {
                     development: { something: 'something' },
                 },
             },
+            'production',
+            undefined,
             credentials,
             'compliance',
         ]);
@@ -179,6 +192,8 @@ describe('oauth2', () => {
                     development: credentials,
                 },
             },
+            'production',
+            undefined,
             credentials,
             'development',
         ]);
@@ -242,6 +257,8 @@ describe('oauth2', () => {
                     },
                 },
             },
+            'production',
+            undefined,
             {
                 accessToken: `${Configuration.ENCRYPTION_PREFIX}encryptedAccessToken`,
                 refreshToken: `${Configuration.ENCRYPTION_PREFIX}encryptedRefreshToken`,

package/dist/test/resources/{oauth2Helper.test.js → oauth2.test.js}

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const strict_1 = tslib_1.__importDefault(require("node:assert/strict"));
 const sinon_1 = tslib_1.__importDefault(require("sinon"));
-const oauth2Helper_1 = tslib_1.__importDefault(require("../../src/services/oauth2Helper"));
+const oauth2_1 = tslib_1.__importDefault(require("../../src/services/oauth2"));
 const configurationTypes_1 = require("../../src/configurationTypes");
-const oauth2HelperResource = tslib_1.__importStar(require("../../src/resources/oauth2Helper"));
+const oauth2HelperResource = tslib_1.__importStar(require("../../src/resources/oauth2"));
 const errors_1 = require("../../src/errors");
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 describe('OAuth2Helper', () => {
@@ -21,9 +21,9 @@ describe('OAuth2Helper', () => {
         responseContentType: configurationTypes_1.RequestContentType.JSON,
     };
     beforeEach(() => {
-        sinon_1.default.stub(oauth2Helper_1.default.prototype, 'startServer').resolves('http://localhost:5050');
-        sinon_1.default.stub(oauth2Helper_1.default.prototype, 'stopServer');
-        sinon_1.default.stub(oauth2Helper_1.default.prototype, 'authorize');
+        sinon_1.default.stub(oauth2_1.default.prototype, 'startServer').resolves('http://localhost:5050');
+        sinon_1.default.stub(oauth2_1.default.prototype, 'stopServer');
+        sinon_1.default.stub(oauth2_1.default.prototype, 'authorize');
         sinon_1.default.stub(inquirer_1.default, 'prompt');
     });
     afterEach(() => {
@@ -33,21 +33,21 @@ describe('OAuth2Helper', () => {
         it('should perform the oauth flow', async () => {
             fetchStub = sinon_1.default.stub().onFirstCall().resolves({ status: 200 }).onSecondCall().resolves({ status: 200 });
             sinon_1.default.replace(global, 'fetch', fetchStub);
-            sinon_1.default.stub(oauth2Helper_1.default.prototype, 'callbackIsDone').resolves({ accessToken: 'token' });
+            sinon_1.default.stub(oauth2_1.default.prototype, 'callbackIsDone').resolves({ accessToken: 'token' });
             await oauth2HelperResource.performOAuth2Flow(authorizationInfo);
             strict_1.default.equal(fetchStub.getCall(0).args.at(0), 'http://localhost:5050/health');
         });
         it('raises a FailedToRetrieveAccessTokenError', async () => {
             fetchStub = sinon_1.default.stub().onFirstCall().resolves({ status: 200 }).onSecondCall().resolves({ status: 200 });
             sinon_1.default.replace(global, 'fetch', fetchStub);
-            sinon_1.default.stub(oauth2Helper_1.default.prototype, 'callbackIsDone').resolves({});
+            sinon_1.default.stub(oauth2_1.default.prototype, 'callbackIsDone').resolves({});
             const response = oauth2HelperResource.performOAuth2Flow(authorizationInfo);
             await strict_1.default.rejects(response, errors_1.FailedToRetrieveAccessTokenError);
         });
         it('raises a FailedToRetrieveAccessTokenError when the accessToken is not returned', async () => {
             fetchStub = sinon_1.default.stub().onFirstCall().resolves({ status: 200 }).onSecondCall().resolves({ status: 200 });
             sinon_1.default.replace(global, 'fetch', fetchStub);
-            sinon_1.default.stub(oauth2Helper_1.default.prototype, 'callbackIsDone').resolves({});
+            sinon_1.default.stub(oauth2_1.default.prototype, 'callbackIsDone').resolves({});
             const response = oauth2HelperResource.performOAuth2Flow(authorizationInfo);
             await strict_1.default.rejects(response, errors_1.FailedToRetrieveAccessTokenError);
         });

package/dist/test/resources/template.test.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const strict_1 = tslib_1.__importDefault(require("node:assert/strict"));
+const node_test_1 = require("node:test");
+const template_1 = require("../../src/resources/template");
+(0, node_test_1.describe)('template', function () {
+    const context = {
+        var: 'value',
+        'some.value': 'some',
+        some_value: 'value',
+        'Some%20Thing': 'Some%20Thing',
+        foo: 'bar',
+        hello: 'Hello World!',
+        bool: 'false',
+        toString: 'string',
+        chars: 'šö䟜ñꀣ¥‡ÑÒÓÔÕÖ×ØÙÚàáâãäåæçÿü',
+        path: '/foo/bar',
+        surrogatepairs: '\uD834\uDF06',
+    };
+    (0, node_test_1.it)('empty string', function () {
+        strict_1.default.equal((0, template_1.parseTemplate)('').expand(context), '');
+    });
+    (0, node_test_1.it)('does not encode non expressions', function () {
+        strict_1.default.equal((0, template_1.parseTemplate)('hello/world').expand(context), 'hello/world');
+        strict_1.default.equal((0, template_1.parseTemplate)('Hello World!/{foo}').expand(context), 'Hello%20World!/{foo}');
+    });
+    (0, node_test_1.it)('expand non-ASCII strings', function () {
+        strict_1.default.equal((0, template_1.parseTemplate)('{+chars}').expand(context), '%C5%A1%C3%B6%C3%A4%C5%B8%C5%93%C3%B1%C3%AA%E2%82%AC%C2%A3%C2%A5%E2%80%A1%C3%91%C3%92%C3%93%C3%94%C3%95%C3%96%C3%97%C3%98%C3%99%C3%9A%C3%A0%C3%A1%C3%A2%C3%A3%C3%A4%C3%A5%C3%A6%C3%A7%C3%BF%C3%BC');
+    });
+    (0, node_test_1.it)('reserved expansion of basic strings', function () {
+        strict_1.default.equal((0, template_1.parseTemplate)('{+var}').expand(context), 'value');
+        strict_1.default.equal((0, template_1.parseTemplate)('{+hello}').expand(context), 'Hello%20World!');
+        strict_1.default.equal((0, template_1.parseTemplate)('{+Some%20Thing}').expand(context), 'Some%20Thing');
+    });
+    (0, node_test_1.it)('preserves paths', function () {
+        strict_1.default.equal((0, template_1.parseTemplate)('{+path}/here').expand(context), '/foo/bar/here');
+        strict_1.default.equal((0, template_1.parseTemplate)('here?ref={+path}').expand(context), 'here?ref=/foo/bar');
+    });
+});

package/dist/test/services/oauth2.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/{oauth2Helper/oauth2Helper.test.js → services/oauth2.test.js}

@@ -4,9 +4,10 @@ const tslib_1 = require("tslib");
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 const strict_1 = tslib_1.__importDefault(require("node:assert/strict"));
 const sinon_1 = tslib_1.__importDefault(require("sinon"));
-const oauth2Helper_1 = tslib_1.__importStar(require("../../src/services/oauth2Helper")), oauth2Namespace = oauth2Helper_1;
+const oauth2_1 = tslib_1.__importStar(require("../../src/services/oauth2")), oauth2Namespace = oauth2_1;
 const configurationTypes_1 = require("../../src/configurationTypes");
 const errors_1 = require("../../src/errors");
+const globalConfiguration_1 = require("../../src/resources/globalConfiguration");
 describe('OAuth2Helper', () => {
     let oauth2Helper;
     let openSpy;
@@ -14,14 +15,14 @@ describe('OAuth2Helper', () => {
     describe('constructor', () => {
         it('should throw an error if the request content type is not supported', async () => {
             try {
-                new oauth2Helper_1.default({ scopes: [], requestContentType: 'random' });
+                new oauth2_1.default({ scopes: [], requestContentType: 'random' });
             }
             catch (err) {
                 (0, strict_1.default)(err instanceof errors_1.UnsupportedContentTypeError);
             }
         });
     });
-    describe('endpoints', () => {
+    describe('method', () => {
         beforeEach(() => {
             const authorizationInfo = {
                 clientId: 'your-client-id',
@@ -38,7 +39,7 @@ describe('OAuth2Helper', () => {
                     },
                 },
             };
-            oauth2Helper = new oauth2Helper_1.default(authorizationInfo);
+            oauth2Helper = new oauth2_1.default(authorizationInfo, globalConfiguration_1.Environment.Production, { foo: 'fooValue', bar: 'barValue' });
             fetchStub = sinon_1.default.stub().resolves({ json: sinon_1.default.stub().resolves({}), status: 200 });
             sinon_1.default.stub(oauth2Helper, 'startServer').resolves('http://localhost:5050');
             sinon_1.default.stub(oauth2Helper, 'stopServer');
@@ -49,17 +50,23 @@ describe('OAuth2Helper', () => {
         afterEach(() => {
             sinon_1.default.restore();
         });
-        describe('handleAuthorize', () => {
+        describe('authorize', () => {
             it('should open the authorization URL', async () => {
                 await oauth2Helper.authorize();
                 sinon_1.default.assert.calledOnce(openSpy);
-                sinon_1.default.assert.calledWith(openSpy, 'https://provider.com/oauth/authorize?client_id=your-client-id&redirect_uri=https%3A%2F%2Fintegrations-platform.unito.io%2Fcredentials%2Fnew%2Foauth2%2Fcallback-cli&state=eyJjbGlDYWxsYmFja1VybCI6Ii9vYXV0aDIvY2FsbGJhY2sifQ%3D%3D&scope=scope1+scope2&response_type=code');
+                sinon_1.default.assert.calledWith(openSpy, 'https://provider.com/oauth/authorize?client_id=your-client-id&scope=scope1+scope2&state=eyJjbGlDYWxsYmFja1VybCI6Ii9vYXV0aDIvY2FsbGJhY2sifQ%3D%3D&response_type=code&redirect_uri=https%3A%2F%2Fintegrations-platform.unito.io%2Fcredentials%2Fnew%2Foauth2%2Fcallback-cli');
             });
             it('should maintain the pre-existing query parameters in authorization URL', async () => {
                 oauth2Helper['providerAuthorizationUrl'] = 'https://provider.com/oauth/authorize?query1=value1&query2=value2';
                 await oauth2Helper.authorize();
                 sinon_1.default.assert.calledOnce(openSpy);
-                sinon_1.default.assert.calledWith(openSpy, 'https://provider.com/oauth/authorize?query1=value1&query2=value2&client_id=your-client-id&redirect_uri=https%3A%2F%2Fintegrations-platform.unito.io%2Fcredentials%2Fnew%2Foauth2%2Fcallback-cli&state=eyJjbGlDYWxsYmFja1VybCI6Ii9vYXV0aDIvY2FsbGJhY2sifQ%3D%3D&scope=scope1+scope2&response_type=code');
+                sinon_1.default.assert.calledWith(openSpy, 'https://provider.com/oauth/authorize?query1=value1&query2=value2&client_id=your-client-id&scope=scope1+scope2&state=eyJjbGlDYWxsYmFja1VybCI6Ii9vYXV0aDIvY2FsbGJhY2sifQ%3D%3D&response_type=code&redirect_uri=https%3A%2F%2Fintegrations-platform.unito.io%2Fcredentials%2Fnew%2Foauth2%2Fcallback-cli');
+            });
+            it('should support dynamic params', async () => {
+                oauth2Helper['providerAuthorizationUrl'] = 'https://pro-{+foo}-der.com/oauth/authorize?query1={+bar}';
+                await oauth2Helper.authorize();
+                sinon_1.default.assert.calledOnce(openSpy);
+                sinon_1.default.assert.calledWith(openSpy, 'https://pro-fooValue-der.com/oauth/authorize?query1=barValue&client_id=your-client-id&scope=scope1+scope2&state=eyJjbGlDYWxsYmFja1VybCI6Ii9vYXV0aDIvY2FsbGJhY2sifQ%3D%3D&response_type=code&redirect_uri=https%3A%2F%2Fintegrations-platform.unito.io%2Fcredentials%2Fnew%2Foauth2%2Fcallback-cli');
             });
         });
         describe('handleCallback', () => {
@@ -71,7 +78,25 @@ describe('OAuth2Helper', () => {
                 sinon_1.default.assert.calledOnce(fetchStub);
                 sinon_1.default.assert.calledWith(fetchStub, 'https://provider.com/oauth/token', {
                     headers: {
-                        'Content-type': 'application/x-www-form-urlencoded',
+                        'Content-Type': 'application/x-www-form-urlencoded',
+                        Authorization: 'custom',
+                    },
+                    body: sinon_1.default.match.string,
+                    method: 'POST',
+                });
+                sinon_1.default.assert.calledOnce(res.send);
+                sinon_1.default.assert.calledWith(res.send, oauth2Namespace.HTML_SUCCESS_MSG);
+            });
+            it('should handle dynamic variables with values from provider response and credential payload', async () => {
+                oauth2Helper['tokenUrl'] = 'https://{+foo}.com/oauth/token?specialParam={+authorizationResponse.responseValue}';
+                const code = 'test-code';
+                const req = { query: { code, responseValue: 'DynamicValue' } };
+                const res = { send: sinon_1.default.stub(), setHeader: sinon_1.default.stub() };
+                await oauth2Helper['handleCallback'](req, res);
+                sinon_1.default.assert.calledOnce(fetchStub);
+                sinon_1.default.assert.calledWith(fetchStub, 'https://fooValue.com/oauth/token?specialParam=DynamicValue', {
+                    headers: {
+                        'Content-Type': 'application/x-www-form-urlencoded',
                         Authorization: 'custom',
                     },
                     body: sinon_1.default.match.string,

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.58.0",
+  "version": "0.58.1",
   "commands": {
     "activity": {
       "id": "activity",

package/package.json

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