@unito/integration-cli 0.55.5 → 0.56.1

package/dist/integrationGenerator/integrationBoilerplate/.nvmrc

@@ -1 +1 @@
-lts/hydrogen
+lts/iron

package/dist/integrationGenerator/integrationBoilerplate/Dockerfile

@@ -4,7 +4,7 @@
 # Build
 #
 
-FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/node:18-alpine as build
+FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/node:20-alpine as build
 
 WORKDIR /build
 
@@ -19,7 +19,7 @@ RUN npm run compile
 # Runtime
 #
 
-FROM --platform=$TARGETPLATFORM public.ecr.aws/docker/library/node:18-alpine as runtime
+FROM --platform=$TARGETPLATFORM public.ecr.aws/docker/library/node:20-alpine as runtime
 
 WORKDIR /app
 

package/dist/integrationGenerator/integrationBoilerplate/integrationBoilerplate/.nvmrc

@@ -1 +1 @@
-lts/hydrogen
+lts/iron

package/dist/integrationGenerator/integrationBoilerplate/integrationBoilerplate/Dockerfile

@@ -4,7 +4,7 @@
 # Build
 #
 
-FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/node:18-alpine as build
+FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/node:20-alpine as build
 
 WORKDIR /build
 
@@ -19,7 +19,7 @@ RUN npm run compile
 # Runtime
 #
 
-FROM --platform=$TARGETPLATFORM public.ecr.aws/docker/library/node:18-alpine as runtime
+FROM --platform=$TARGETPLATFORM public.ecr.aws/docker/library/node:20-alpine as runtime
 
 WORKDIR /app
 

package/dist/integrationGenerator/integrationBoilerplate/integrationBoilerplate/package.json

@@ -17,7 +17,7 @@
     "email": "hello@unito.io"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "license": "LicenseRef-LICENSE",
   "dependencies": {
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@types/express": "4.x",
     "@types/mocha": "10.x",
-    "@types/node": "18.x",
+    "@types/node": "20.x",
     "@types/uuid": "9.x",
     "@typescript-eslint/eslint-plugin": "5.x",
     "@typescript-eslint/parser": "5.x",

package/dist/integrationGenerator/integrationBoilerplate/integrationBoilerplate/src/middlewares/additionalLoggingContext.ts

@@ -10,7 +10,7 @@ export const extractAdditionalLoggingContext = (req: express.Request, res: expre
     try {
       additionalLoggingContext = JSON.parse(additionalLoggingContextHeader);
     } catch (error) {
-      logger.warn(`Failed parsing header X-Unito-Additional-Logging-Context: ${additionalLoggingContext}`);
+      logger.warn(`Failed parsing header X-Unito-Additional-Logging-Context: ${additionalLoggingContextHeader}`);
     }
   }
 

package/dist/integrationGenerator/integrationBoilerplate/package.json

@@ -17,7 +17,7 @@
     "email": "hello@unito.io"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "license": "LicenseRef-LICENSE",
   "dependencies": {
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@types/express": "4.x",
     "@types/mocha": "10.x",
-    "@types/node": "18.x",
+    "@types/node": "20.x",
     "@types/uuid": "9.x",
     "@typescript-eslint/eslint-plugin": "5.x",
     "@typescript-eslint/parser": "5.x",

package/dist/integrationGenerator/integrationBoilerplate/src/middlewares/additionalLoggingContext.ts

@@ -10,7 +10,7 @@ export const extractAdditionalLoggingContext = (req: express.Request, res: expre
     try {
       additionalLoggingContext = JSON.parse(additionalLoggingContextHeader);
     } catch (error) {
-      logger.warn(`Failed parsing header X-Unito-Additional-Logging-Context: ${additionalLoggingContext}`);
+      logger.warn(`Failed parsing header X-Unito-Additional-Logging-Context: ${additionalLoggingContextHeader}`);
     }
   }
 

package/dist/src/commands/activity.js

@@ -28,7 +28,7 @@ class Activity extends baseCommand_1.BaseCommand {
     };
     async catch(error) {
         /* istanbul ignore if */
-        if ((0, errors_1.handleError)(error)) {
+        if ((0, errors_1.handleError)(this, error)) {
             this.exit(-1);
         }
         throw error;
@@ -55,10 +55,19 @@ class Activity extends baseCommand_1.BaseCommand {
         IntegrationsPlatform.setApiKey(apiKey);
         IntegrationsPlatform.setEnvironment(environment);
         core_1.ux.action.start('Finding the integration');
-        const integration = await IntegrationsPlatform.getIntegrationByName(integrationConfiguration.name);
-        if (!integration) {
-            core_1.ux.log(chalk_1.default.redBright(`Integration not found! You can only retrieve activity for existing integrations.`));
-            this.exit(-1);
+        let integration;
+        try {
+            integration = await IntegrationsPlatform.getIntegrationByName(integrationConfiguration.name);
+        }
+        catch (error) {
+            if (error instanceof IntegrationsPlatform.HttpError && error.status === 403) {
+                core_1.ux.log(chalk_1.default.redBright(`Access Denied! You do not have access to this integration.`));
+                this.exit(-1);
+            }
+            else {
+                core_1.ux.log(chalk_1.default.redBright(`Integration not found! You can only retrieve activity for existing integrations.`));
+                this.exit(-1);
+            }
         }
         core_1.ux.action.stop();
         core_1.ux.action.start('Retrieving activity');

package/dist/src/commands/dev.js

@@ -14,7 +14,7 @@ class Dev extends baseCommand_1.BaseCommand {
     static examples = ['<%= config.bin %> <%= command.id %>'];
     async catch(error) {
         /* istanbul ignore if */
-        if ((0, errors_1.handleError)(error)) {
+        if ((0, errors_1.handleError)(this, error)) {
             this.exit(-1);
         }
         throw error;
@@ -63,15 +63,21 @@ class Dev extends baseCommand_1.BaseCommand {
         // Resolve the configuration.
         const environment = flags.environment ?? GlobalConfiguration.Environment.Production;
         const configuration = await (0, configuration_1.getConfiguration)(environment, flags['config-path']);
-        const credentialPayload = await (0, decryption_1.decryptTestAccountCredentials)(configuration, environment, configuration_1.CredentialScope.DEVELOPMENT, this.config.configDir);
+        let credentials = configuration.testAccounts?.[configuration_1.CredentialScope.DEVELOPMENT];
+        if (credentials) {
+            ({ entries: credentials } = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, credentials));
+        }
+        let secrets = {};
         // Decrypt secrets, if necessary.
-        const secrets = await (0, decryption_1.decryptSecrets)(configuration, environment, this.config.configDir);
+        if (configuration.secrets) {
+            secrets = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, configuration.secrets);
+        }
         // Launch the debugger.
         const commandArguments = [
             `${process.env.NODE_MODULES_FOLDER}/@unito/integration-debugger/dist/src/index.js`,
             '--integration-url=http://localhost:9200',
             `--spawn-process=npm run dev`,
-            `--credential-payload=${JSON.stringify(credentialPayload)}`,
+            `--credential-payload=${JSON.stringify(credentials)}`,
             `--secrets-payload=${JSON.stringify(secrets)}`,
         ];
         if (configuration.graphRelativeUrl) {

package/dist/src/commands/encrypt.js

@@ -23,7 +23,7 @@ class Encrypt extends baseCommand_1.BaseCommand {
     };
     async catch(error) {
         /* istanbul ignore if */
-        if ((0, errors_1.handleError)(error)) {
+        if ((0, errors_1.handleError)(this, error)) {
             this.exit(-1);
         }
         throw error;

package/dist/src/commands/init.js

@@ -16,7 +16,7 @@ class Init extends baseCommand_1.BaseCommand {
     };
     async catch(error) {
         /* istanbul ignore if */
-        if ((0, errors_1.handleError)(error)) {
+        if ((0, errors_1.handleError)(this, error)) {
             this.exit(-1);
         }
         throw error;

package/dist/src/commands/invite.js

@@ -22,7 +22,7 @@ class Invite extends baseCommand_1.BaseCommand {
     };
     async catch(error) {
         /* istanbul ignore if */
-        if ((0, errors_1.handleError)(error)) {
+        if ((0, errors_1.handleError)(this, error)) {
             this.exit(-1);
         }
         throw error;
@@ -56,10 +56,19 @@ class Invite extends baseCommand_1.BaseCommand {
             },
         ]);
         core_1.ux.action.start('Finding the integration');
-        const integration = await IntegrationsPlatform.getIntegrationByName(integrationConfiguration.name);
-        if (!integration) {
-            core_1.ux.log(chalk_1.default.redBright(`Integration not found! You can only invite users to a published integration.`));
-            this.exit(-1);
+        let integration;
+        try {
+            integration = await IntegrationsPlatform.getIntegrationByName(integrationConfiguration.name);
+        }
+        catch (error) {
+            if (error instanceof IntegrationsPlatform.HttpError && error.status === 403) {
+                core_1.ux.log(chalk_1.default.redBright(`Access Denied! You do not have access to this integration.`));
+                this.exit(-1);
+            }
+            else {
+                core_1.ux.log(chalk_1.default.redBright(`Integration not found! You can only invite users to a published integration.`));
+                this.exit(-1);
+            }
         }
         core_1.ux.action.stop();
         core_1.ux.action.start('Inviting user');

package/dist/src/commands/login.js

@@ -21,7 +21,7 @@ class Login extends baseCommand_1.BaseCommand {
     };
     async catch(error) {
         /* istanbul ignore if */
-        if ((0, errors_1.handleError)(error)) {
+        if ((0, errors_1.handleError)(this, error)) {
             this.exit(-1);
         }
         throw error;

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

@@ -1,9 +1,14 @@
 import { Command } from '@oclif/core';
+import { Environment } from '../resources/globalConfiguration';
 export default class Oauth2 extends Command {
+    static summary: string;
     static description: string;
     static examples: string[];
     static flags: {
-        accountName: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'test-account': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<Environment | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        reauth: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'config-path': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
     };
     catch(error: Error): Promise<void>;
     run(): Promise<void>;

package/dist/src/commands/oauth2.js

@@ -2,96 +2,99 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
-const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const configuration_1 = require("../resources/configuration");
 const Oauth2Helper = tslib_1.__importStar(require("../services/oauth2Helper"));
+const IntegrationsPlatform = tslib_1.__importStar(require("../services/integrationsPlatform"));
 const configurationTypes_1 = require("../configurationTypes");
 const errors_1 = require("../errors");
 const globalConfiguration_1 = require("../resources/globalConfiguration");
+const decryption_1 = require("../resources/decryption");
 class Oauth2 extends core_1.Command {
-    static description = 'Perform an OAuth2 workflow locally';
+    static summary = 'Perform an OAuth2 workflow locally';
+    static description = 'The Oauth2 command allows you to perform an OAuth2 workflow locally, either to create a new test account or to refresh an existing one.';
     static examples = ['<%= config.bin %> <%= command.id %>'];
     static flags = {
-        accountName: core_1.Flags.string({ description: 'Name of the account used to perfom oauth2 actions' }),
+        'test-account': core_1.Flags.string({
+            description: 'Test account to use.',
+            options: Object.values(configuration_1.CredentialScope),
+            default: configuration_1.CredentialScope.DEVELOPMENT,
+        }),
+        environment: core_1.Flags.custom({
+            description: 'the environment of the platform',
+            options: Object.values(globalConfiguration_1.Environment),
+            default: globalConfiguration_1.Environment.Production,
+        })(),
+        reauth: core_1.Flags.boolean({
+            description: 'triggers a new oauth2 flow to collect credentials and overwrite the current one',
+            default: false,
+        }),
+        'config-path': core_1.Flags.string({
+            summary: 'relative path to a custom ".unito.json" file',
+            description: `Use a custom configuration file instead of the default '.unito.json' or other environment specific
+      ones.
+
+      If you want to force the CLI to use a specific configuration file, you can use this flag to specify the relative
+      path from your integration's root folder (with a leading '/').
+
+      Usage: <%= config.bin %> <%= command.id %> --config-path=/myCustomConfig.json`,
+        }),
     };
     async catch(error) {
         /* istanbul ignore if */
-        if ((0, errors_1.handleError)(error)) {
+        if ((0, errors_1.handleError)(this, error)) {
             this.exit(-1);
         }
         throw error;
     }
     async run() {
         const { flags } = await this.parse(Oauth2);
-        const accountName = flags.accountName ?? 'development';
-        // Might want to expose Environment flag, but for now we'll default to Production
-        const configuration = await (0, configuration_1.getConfiguration)(globalConfiguration_1.Environment.Production);
-        let oauth2 = configuration.authorizations?.find(authorization => authorization.method === configurationTypes_1.Method.OAUTH2 && authorization.name === accountName && authorization.development)?.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']);
+        // 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
         if (!oauth2) {
-            const { oauth2Information } = await inquirer_1.default.prompt([
-                {
-                    name: 'oauth2Information',
-                    type: 'editor',
-                    message: `${chalk_1.default.yellowBright('OAuth2 credentials')} that will be used to authenticate to the API`,
-                    validate: (value) => {
-                        try {
-                            JSON.parse(value);
-                        }
-                        catch (e) {
-                            return false;
-                        }
-                        return true;
-                    },
-                    default: JSON.stringify({
-                        clientId: '',
-                        clientSecret: '',
-                        tokenUrl: '',
-                        authorizationUrl: '',
-                        scopes: [{ name: '', help: '' }],
-                        requestContentType: 'application/x-www-form-urlencoded',
-                        responseContentType: 'application/json',
-                        grantType: 'authorization_code',
-                    }, null, 2),
-                },
-            ]);
-            oauth2 = JSON.parse(oauth2Information);
-            if (!configuration.authorizations) {
-                configuration.authorizations = [];
-            }
-            configuration.authorizations.push({
-                name: 'development',
-                method: configurationTypes_1.Method.OAUTH2,
-                development: true,
-                oauth2,
-            });
-            core_1.ux.action.start('Saving configuration');
-            await (0, configuration_1.writeConfiguration)(configuration);
-            core_1.ux.action.stop();
+            oauth2 = configuration.authorizations?.find(authorization => authorization.method === configurationTypes_1.Method.OAUTH2)?.oauth2;
         }
         if (!oauth2) {
-            throw new Error('No oauth2 information found');
+            throw new errors_1.MissingAuth2AuthorizationError();
         }
-        const account = accountName === 'development' ? configuration.testAccounts?.development : configuration.testAccounts?.compliance;
+        // 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;
         let credentials;
-        if (Object.keys(account || {}).length === 0) {
-            core_1.ux.action.start(`Starting Oauth2 flow for account: ${accountName}`);
+        if (!account || Object.entries(account).length === 0 || flags.reauth) {
+            core_1.ux.action.start(`Starting Oauth2 flow for account: ${testAccount}`);
             credentials = await Oauth2Helper.performOAuth2Flow(oauth2);
             core_1.ux.action.stop();
         }
         else {
             if (!account?.refreshToken) {
-                core_1.ux.log('No refresh token found, aborting refresh token flow');
+                core_1.ux.log(chalk_1.default.redBright('No refresh token found, nothing to do.'));
+                return;
             }
-            core_1.ux.action.start(`Refreshing test account ${accountName}`);
-            credentials = await Oauth2Helper.updateToken({ ...oauth2, refreshToken: account?.refreshToken });
+            const decryptionResult = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, account);
+            core_1.ux.action.start(`Refreshing test account ${testAccount}`);
+            credentials = await Oauth2Helper.updateToken({
+                ...oauth2,
+                refreshToken: decryptionResult.entries?.refreshToken,
+            });
+            // If provider response doesn't contain a new refresh token, use the one we already have
             if (!credentials.refreshToken) {
                 credentials.refreshToken = account?.refreshToken;
             }
+            if (decryptionResult.decryptedKeys.includes('accessToken')) {
+                credentials.accessToken = (await IntegrationsPlatform.encryptData(configuration.name, credentials.accessToken)).encryptedData;
+            }
+            if (decryptionResult.decryptedKeys.includes('refreshToken')) {
+                credentials.refreshToken = (await IntegrationsPlatform.encryptData(configuration.name, credentials.refreshToken)).encryptedData;
+            }
             core_1.ux.action.stop();
         }
-        core_1.ux.action.start(`Saving credentials for account: ${accountName}`);
-        await (0, configuration_1.writeTestAccount)(configuration, credentials, accountName);
+        core_1.ux.action.start(`Saving credentials for account: ${testAccount}`);
+        await (0, configuration_1.writeTestAccount)(configuration, credentials, testAccount);
         core_1.ux.action.stop();
         return;
     }

package/dist/src/commands/publish.js

@@ -61,7 +61,7 @@ class Publish extends baseCommand_1.BaseCommand {
     };
     async catch(error) {
         /* istanbul ignore if */
-        if ((0, errors_1.handleError)(error)) {
+        if ((0, errors_1.handleError)(this, error)) {
             this.exit(-1);
         }
         throw error;
@@ -144,8 +144,19 @@ class Publish extends baseCommand_1.BaseCommand {
         });
     }
     async updateRegistry(integrationConfiguration) {
-        const integrations = await IntegrationsPlatform.getIntegrations();
-        const existing = integrations.find(integration => integration.name === integrationConfiguration.name);
+        let existing;
+        try {
+            existing = await IntegrationsPlatform.getIntegrationByName(integrationConfiguration.name);
+        }
+        catch (error) {
+            if (error instanceof IntegrationsPlatform.HttpError && error.status === 403) {
+                core_1.ux.log(chalk_1.default.redBright(`Access Denied! You do not have access to this integration.`));
+                this.exit(-1);
+            }
+            else {
+                existing = undefined;
+            }
+        }
         // Create or update the integration.
         let updated;
         for (const authorization of integrationConfiguration.authorizations ?? []) {

package/dist/src/commands/test.js

@@ -71,7 +71,7 @@ class Test extends baseCommand_1.BaseCommand {
     };
     async catch(error) {
         /* istanbul ignore if */
-        if ((0, errors_1.handleError)(error)) {
+        if ((0, errors_1.handleError)(this, error)) {
             this.exit(-1);
         }
         throw error;
@@ -92,14 +92,20 @@ class Test extends baseCommand_1.BaseCommand {
         let credentialPayload = flags['credential-payload'];
         // Default to test account's credentials if none are specifically provided
         if (credentialPayload === null || credentialPayload === undefined) {
-            const decryptedCredentials = await (0, decryption_1.decryptTestAccountCredentials)(configuration, environment, flags['test-account'], this.config.configDir);
-            credentialPayload = JSON.stringify(decryptedCredentials);
+            let credentials = configuration.testAccounts?.[flags['test-account']];
+            if (credentials) {
+                ({ entries: credentials } = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, credentials));
+            }
+            credentialPayload = JSON.stringify(credentials);
         }
         if (!credentialPayload || credentialPayload === '{}') {
             throw new errors_1.MissingCredentialsError();
         }
+        let secrets = {};
         // Decrypt secrets, if necessary.
-        const secrets = await (0, decryption_1.decryptSecrets)(configuration, environment, this.config.configDir);
+        if (configuration.secrets) {
+            secrets = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, configuration.secrets);
+        }
         // Launch the tests.
         const commandArguments = [
             `${process.env.NODE_MODULES_FOLDER}/@unito/integration-debugger/dist/src/index.js`,

package/dist/src/commands/upgrade.js

@@ -12,7 +12,7 @@ class Upgrade extends baseCommand_1.BaseCommand {
     static examples = ['<%= config.bin %> <%= command.id %>'];
     /* istanbul ignore next */
     async catch(error) {
-        if ((0, errors_1.handleError)(error)) {
+        if ((0, errors_1.handleError)(this, error)) {
             this.exit(-1);
         }
         throw error;

package/dist/src/errors.d.ts

@@ -1,3 +1,4 @@
+import { Command } from '@oclif/core';
 export declare class NoIntegrationFoundError extends Error {
 }
 export declare class NoConfigurationFileError extends Error {
@@ -14,6 +15,8 @@ export declare class InvalidRequestContentTypeError extends Error {
 }
 export declare class MissingCredentialsError extends Error {
 }
+export declare class MissingAuth2AuthorizationError extends Error {
+}
 export declare class FileSizeExceeded extends Error {
 }
 export declare class MissingApiKey extends Error {
@@ -35,4 +38,4 @@ export declare class ConfigurationInvalid extends Error {
     prettyDetails: string;
     constructor(message: string, details: unknown, prettyDetails: string);
 }
-export declare function handleError(error: Error): boolean;
+export declare function handleError(command: Command, error: Error): boolean;