@unito/integration-cli 1.3.5 → 1.5.0

package/dist/src/commands/test.js

@@ -19,7 +19,7 @@ class Test extends baseCommand_1.BaseCommand {
         environment: core_1.Flags.custom({
             description: 'the environment of the platform',
             options: Object.values(GlobalConfiguration.Environment),
-            default: GlobalConfiguration.Environment.Production,
+            default: GlobalConfiguration.Environment.Local,
         })(),
         verbose: core_1.Flags.boolean({
             description: 'output more (debug) information',
@@ -45,11 +45,6 @@ class Test extends baseCommand_1.BaseCommand {
             description: '(advanced) credential to use.',
             exclusive: ['credential-payload'],
         }),
-        'test-account': core_1.Flags.string({
-            description: 'test account to use.',
-            options: Object.values(configuration_1.CredentialScope),
-            default: configuration_1.CredentialScope.DEVELOPMENT,
-        }),
         'read-only': core_1.Flags.boolean({
             description: 'whether or not to only perform read operations',
             allowNo: true,
@@ -113,12 +108,11 @@ class Test extends baseCommand_1.BaseCommand {
             core_1.ux.action.stop();
         }
         // Resolve the configuration.
-        const environment = flags.environment ?? GlobalConfiguration.Environment.Production;
-        const configuration = await (0, configuration_1.getConfiguration)(environment, flags['config-path']);
+        const configuration = await (0, configuration_1.getConfiguration)(flags.environment, flags['config-path']);
         let credentialPayload = '{}';
         let readOnly = flags['read-only'] ?? false;
         if (flags['credential-id']) {
-            const credential = await (0, credentials_1.fetchCredential)(environment, this.config.configDir, flags['credential-id']);
+            const credential = await (0, credentials_1.fetchCredential)(flags.environment, this.config.configDir, flags['credential-id']);
             credentialPayload = JSON.stringify({
                 ...credential.payload,
                 unitoCredentialId: credential.id,
@@ -130,27 +124,24 @@ class Test extends baseCommand_1.BaseCommand {
         else if (flags['credential-payload']) {
             credentialPayload = flags['credential-payload'];
         }
-        else {
-            const credentials = configuration.testAccounts?.[flags['test-account']];
-            if (credentials) {
-                const decryptedEntries = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, credentials);
-                if (decryptedEntries.failed.length) {
-                    throw new errors_1.EntryDecryptionError(decryptedEntries.failed.at(0), environment);
-                }
-                credentialPayload = JSON.stringify({
-                    ...decryptedEntries.successful,
-                    unitoCredentialId: flags['test-account'],
-                    unitoUserId: flags['test-account'],
-                });
+        else if (configuration.testAccount && Object.keys(configuration.testAccount).length) {
+            const decryptedEntries = await (0, decryption_1.decryptEntries)(configuration.name, flags.environment, this.config.configDir, configuration.testAccount);
+            if (decryptedEntries.failed.length) {
+                throw new errors_1.EntryDecryptionError(decryptedEntries.failed.at(0), flags.environment);
             }
+            credentialPayload = JSON.stringify({
+                ...decryptedEntries.successful,
+                unitoCredentialId: 'testAccount',
+                unitoUserId: 'testAccount',
+            });
         }
         // Load secrets.
-        const { successful: secrets, failed: failedSecrets } = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, configuration.secrets ?? {});
+        const { successful: secrets, failed: failedSecrets } = await (0, decryption_1.decryptEntries)(configuration.name, flags.environment, this.config.configDir, configuration.secrets ?? {});
         if (failedSecrets.length) {
-            throw new errors_1.EntryDecryptionError(failedSecrets.at(0), environment);
+            throw new errors_1.EntryDecryptionError(failedSecrets.at(0), flags.environment);
         }
         // Load environment variables.
-        const { successful: environmentVariables, failed: failedEnvironmentVariables } = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, configuration.environmentVariables ?? {});
+        const { successful: environmentVariables, failed: failedEnvironmentVariables } = await (0, decryption_1.decryptEntries)(configuration.name, flags.environment, this.config.configDir, configuration.environmentVariables ?? {});
         for (const environmentVariable of failedEnvironmentVariables) {
             if (!process.env[environmentVariable]) {
                 core_1.ux.log();

package/dist/src/configurationTypes.d.ts

@@ -53,21 +53,10 @@ export interface Configuration {
      */
     authorizations?: Authorization[];
     /**
-     * The test accounts of the integration
+     * The test account of the integration
      */
-    testAccounts?: {
-        /**
-         * Test account for local development
-         */
-        development?: {
-            [k: string]: unknown;
-        };
-        /**
-         * Test account for compliance tests
-         */
-        compliance?: {
-            [k: string]: unknown;
-        };
+    testAccount?: {
+        [k: string]: unknown;
     };
     /**
      * The secrets of the integration

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

@@ -5,10 +5,6 @@ export declare enum CrawlMode {
     SAMPLE = "sample",
     SINGLE = "single"
 }
-export declare enum CredentialScope {
-    DEVELOPMENT = "development",
-    COMPLIANCE = "compliance"
-}
 export declare const DEFAULT_CONFIGURATION_NAME: string;
 export declare const ENCRYPTION_PREFIX = "unito-secret-v1://";
 /**
@@ -27,4 +23,4 @@ export declare function writeConfiguration(configuration: Configuration, environ
 export declare function writeTestAccount(configuration: Configuration, environment: Environment | undefined, customConfigPath: string | undefined, account: {
     accessToken: string;
     refreshToken?: string;
-}, accountName: string): Promise<void>;
+}): Promise<void>;

package/dist/src/resources/configuration.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ENCRYPTION_PREFIX = exports.DEFAULT_CONFIGURATION_NAME = exports.CredentialScope = exports.CrawlMode = void 0;
+exports.ENCRYPTION_PREFIX = exports.DEFAULT_CONFIGURATION_NAME = exports.CrawlMode = void 0;
 exports.getConfigurationPath = getConfigurationPath;
 exports.getConfiguration = getConfiguration;
 exports.writeConfiguration = writeConfiguration;
@@ -20,11 +20,6 @@ var CrawlMode;
     CrawlMode["SAMPLE"] = "sample";
     CrawlMode["SINGLE"] = "single";
 })(CrawlMode || (exports.CrawlMode = CrawlMode = {}));
-var CredentialScope;
-(function (CredentialScope) {
-    CredentialScope["DEVELOPMENT"] = "development";
-    CredentialScope["COMPLIANCE"] = "compliance";
-})(CredentialScope || (exports.CredentialScope = CredentialScope = {}));
 exports.DEFAULT_CONFIGURATION_NAME = '.unito.json';
 exports.ENCRYPTION_PREFIX = 'unito-secret-v1://';
 /**
@@ -63,12 +58,7 @@ async function getConfiguration(environment, customConfigPath) {
         throw new errors_1.ConfigurationMalformed();
     }
     // Initialize the required structure in the configuration.
-    if (!configuration.testAccounts) {
-        configuration.testAccounts = { development: {} };
-    }
-    if (!configuration.testAccounts.development) {
-        configuration.testAccounts.development = {};
-    }
+    configuration.testAccount ??= {};
     for (const authorization of configuration.authorizations ?? []) {
         if (authorization.oauth2) {
             if (!authorization.oauth2.grantType) {
@@ -96,13 +86,8 @@ async function writeConfiguration(configuration, environment = globalConfigurati
         : getConfigurationPath(environment);
     await fs.promises.writeFile(configurationPath, JSON.stringify(configuration, null, 2));
 }
-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[accountName] = { ...configuration.testAccounts[accountName], ...account };
+async function writeTestAccount(configuration, environment = globalConfiguration_1.Environment.Production, customConfigPath, account) {
+    configuration.testAccount = { ...configuration.testAccount, ...account };
     await writeConfiguration(configuration, environment, customConfigPath);
 }
 async function validateConfiguration(configuration) {
@@ -124,22 +109,20 @@ async function validateConfiguration(configuration) {
     if (validate.errors) {
         throw new errors_1.ConfigurationInvalid('Your configuration file is invalid!', validate.errors, (0, better_ajv_errors_1.default)(schema, configuration, validate.errors, { indent: 2 }));
     }
-    // Validate test accounts.
-    if (configuration.testAccounts && configuration.authorizations?.length) {
-        for (const [name, account] of Object.entries(configuration.testAccounts)) {
-            if (Object.keys(account).length) {
-                validateTestAccount(name, account, configuration.authorizations, spec);
-            }
-        }
+    // Validate the test account.
+    if (configuration.testAccount &&
+        Object.keys(configuration.testAccount).length &&
+        configuration.authorizations?.length) {
+        validateTestAccount(configuration.testAccount, configuration.authorizations, spec);
     }
 }
-function validateTestAccount(credentialName, credential, authorizationDefinitions, spec) {
+function validateTestAccount(credential, authorizationDefinitions, spec) {
     const authorizationSchemas = authorizationDefinitions.map(constructAuthorizationSchema);
     const schema = { anyOf: authorizationSchemas };
     const validate = spec.compile(schema);
     validate(credential);
     if (validate.errors) {
-        throw new errors_1.ConfigurationInvalid(`Your testAccount ${credentialName} is invalid!`, validate.errors, (0, better_ajv_errors_1.default)(schema, credential, validate.errors, { indent: 2 }));
+        throw new errors_1.ConfigurationInvalid(`Your testAccount is invalid!`, validate.errors, (0, better_ajv_errors_1.default)(schema, credential, validate.errors, { indent: 2 }));
     }
 }
 function constructAuthorizationSchema(authorizationDefinition) {

package/dist/test/commands/dev.test.js

@@ -26,11 +26,9 @@ describe('Dev', () => {
         secrets: {
             secret: 'encryptedSecret',
         },
-        testAccounts: {
-            development: {
-                key: 'value',
-                encryptedToken: `${ConfigurationResource.ENCRYPTION_PREFIX}decrypt-me`,
-            },
+        testAccount: {
+            key: 'value',
+            encryptedToken: `${ConfigurationResource.ENCRYPTION_PREFIX}decrypt-me`,
         },
     };
     let execSyncStub;
@@ -62,7 +60,7 @@ describe('Dev', () => {
         .stub(ConfigurationResource, 'getConfiguration', stub => stub.returns(cliConfiguration))
         .command(['dev'])
         .it('decrypts credentials', () => {
-        (0, test_1.expect)(spawnStub.getCall(0).args.at(1)).to.include('--credential-payload={"key":"value","encryptedToken":"decrypted-me","unitoCredentialId":"development","unitoUserId":"development"}');
+        (0, test_1.expect)(spawnStub.getCall(0).args.at(1)).to.include('--credential-payload={"key":"value","encryptedToken":"decrypted-me","unitoCredentialId":"testAccount","unitoUserId":"testAccount"}');
     });
     test_1.test
         .stdout()

package/dist/test/commands/encrypt.test.js

@@ -34,14 +34,14 @@ describe('encrypt', () => {
     test_1.test
         .stdout()
         .stub(GlobalConfiguration, 'read', stub => stub.returns({ apiKey: 'foo' }))
-        .command(['encrypt'])
+        .command(['encrypt', '--environment=production'])
         .it('encrypts data - default', ctx => {
         (0, test_1.expect)(ctx.stdout).to.contains('Encrypted Data:');
     });
     test_1.test
         .stdout()
         .stub(GlobalConfiguration, 'read', stub => stub.returns({ apiKey: 'foo' }))
-        .command(['encrypt', '--sensitive'])
+        .command(['encrypt', '--sensitive', '--environment=production'])
         .it('encrypts data - sensitive', ctx => {
         (0, test_1.expect)(ctx.stdout).to.contains('Encrypted Data:');
     });

package/dist/test/commands/graph.test.js

@@ -11,9 +11,7 @@ const Integrations = tslib_1.__importStar(require("../../src/resources/integrati
 const originalReadFile = fs_1.default.promises.readFile.bind(fs_1.default.promises);
 const MOCK_CONFIG = {
     name: 'salesforce-v2',
-    testAccounts: {
-        development: { token: 'test-token' },
-    },
+    testAccount: { token: 'test-token' },
     secrets: {},
 };
 const MOCK_RESPONSE = {

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

@@ -35,7 +35,6 @@ describe('oauth2', () => {
                 oauth2: oauth2Information,
             },
         ],
-        testAccounts: {},
     };
     const credentials = {
         accessToken: 'accessToken',
@@ -62,7 +61,7 @@ describe('oauth2', () => {
         ...baseConfiguration,
         authorizations: [],
     }))
-        .command(['oauth2', '--test-account', 'development'])
+        .command(['oauth2'])
         .exit(-1)
         .it("Errors out if no oauth2 authorization scheme is found in the integration's configuration");
     test_1.test
@@ -88,12 +87,12 @@ describe('oauth2', () => {
             .resolves({ encryptedData: `${Configuration.ENCRYPTION_PREFIX}encryptedRefreshToken` });
     })
         .stub(DecryptionResource, 'decryptEntries', stub => stub.resolves({ successful: { ...oauth2Information, clientId: 'devClientID' }, failed: [] }))
-        .command(['oauth2', '--test-account', 'development'])
+        .command(['oauth2'])
         .it('prioritize development authorization', () => {
         (0, test_1.expect)(performOAuth2FlowStub.getCalls().length).to.equal(1);
         (0, test_1.expect)(performOAuth2FlowStub.getCall(0).args).to.deep.equal([
             { ...oauth2Information, clientId: 'devClientID' },
-            'production',
+            'local',
             undefined,
         ]);
         (0, test_1.expect)(updateTokenStub.getCalls().length).to.equal(0);
@@ -110,10 +109,9 @@ describe('oauth2', () => {
                     },
                 ],
             },
-            'production',
+            'local',
             undefined,
             credentials,
-            'development',
         ]);
     });
     test_1.test
@@ -121,9 +119,7 @@ describe('oauth2', () => {
         .do(() => {
         getConfigurationsStub.returns({
             ...baseConfiguration,
-            testAccounts: {
-                development: credentials,
-            },
+            testAccount: credentials,
         });
         sinon
             .stub(IntegrationsPlatform, 'encryptData')
@@ -133,21 +129,18 @@ describe('oauth2', () => {
             .resolves({ encryptedData: `${Configuration.ENCRYPTION_PREFIX}encryptedRefreshToken` });
     })
         .stub(DecryptionResource, 'decryptEntries', stub => stub.resolves({ successful: { ...oauth2Information }, failed: [] }))
-        .command(['oauth2', '--test-account', 'development', '--reauth'])
-        .it('performs the oauth flow when there is a test accounts, the auth information are setup and --reauth flag is present', () => {
+        .command(['oauth2', '--reauth'])
+        .it('performs the oauth flow when there is a test account, the auth information are setup and --reauth flag is present', () => {
         (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,
-                testAccounts: {
-                    development: credentials,
-                },
+                testAccount: credentials,
             },
-            'production',
+            'local',
             undefined,
             credentials,
-            'development',
         ]);
     });
     test_1.test
@@ -155,9 +148,7 @@ describe('oauth2', () => {
         .do(() => {
         getConfigurationsStub.returns({
             ...baseConfiguration,
-            testAccounts: {
-                development: { something: 'something' },
-            },
+            testAccount: {},
         });
         sinon
             .stub(IntegrationsPlatform, 'encryptData')
@@ -167,21 +158,18 @@ describe('oauth2', () => {
             .resolves({ encryptedData: `${Configuration.ENCRYPTION_PREFIX}encryptedRefreshToken` });
     })
         .stub(DecryptionResource, 'decryptEntries', stub => stub.resolves({ successful: { ...oauth2Information }, failed: [] }))
-        .command(['oauth2', '--test-account', 'compliance'])
-        .it('performs the oauth flow when the requested test account is not setup', () => {
+        .command(['oauth2'])
+        .it('performs the oauth flow when the test account is not 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,
-                testAccounts: {
-                    development: { something: 'something' },
-                },
+                testAccount: {},
             },
-            'production',
+            'local',
             undefined,
             credentials,
-            'compliance',
         ]);
     });
     test_1.test
@@ -189,9 +177,7 @@ describe('oauth2', () => {
         .do(() => {
         getConfigurationsStub.returns({
             ...baseConfiguration,
-            testAccounts: {
-                development: credentials,
-            },
+            testAccount: credentials,
         });
         sinon
             .stub(IntegrationsPlatform, 'encryptData')
@@ -201,21 +187,18 @@ describe('oauth2', () => {
             .resolves({ encryptedData: `${Configuration.ENCRYPTION_PREFIX}encryptedRefreshToken` });
     })
         .stub(DecryptionResource, 'decryptEntries', stub => stub.resolves({ successful: { ...oauth2Information }, failed: [] }))
-        .command(['oauth2', '--test-account', 'development'])
-        .it('refresh the token when there is an existing test accounts and the auth information are setup', () => {
+        .command(['oauth2'])
+        .it('refresh the token when there is an existing test account and the auth information are setup', () => {
         (0, test_1.expect)(performOAuth2FlowStub.getCalls().length).to.equal(0);
         (0, test_1.expect)(updateTokenStub.getCalls().length).to.equal(1);
         (0, test_1.expect)(writeTestAccountStub.getCall(0).args).to.deep.equal([
             {
                 ...baseConfiguration,
-                testAccounts: {
-                    development: credentials,
-                },
+                testAccount: credentials,
             },
-            'production',
+            'local',
             undefined,
             credentials,
-            'development',
         ]);
     });
     test_1.test
@@ -230,11 +213,9 @@ describe('oauth2', () => {
                     oauth2: { ...oauth2Information, clientSecret: `${Configuration.ENCRYPTION_PREFIX}devClientID` },
                 },
             ],
-            testAccounts: {
-                development: {
-                    accessToken: `${Configuration.ENCRYPTION_PREFIX}devAccessToken`,
-                    refreshToken: `${Configuration.ENCRYPTION_PREFIX}devRefreshToken`,
-                },
+            testAccount: {
+                accessToken: `${Configuration.ENCRYPTION_PREFIX}devAccessToken`,
+                refreshToken: `${Configuration.ENCRYPTION_PREFIX}devRefreshToken`,
             },
         });
         sinon
@@ -256,8 +237,8 @@ describe('oauth2', () => {
             .onSecondCall()
             .resolves({ encryptedData: `${Configuration.ENCRYPTION_PREFIX}encryptedRefreshToken` });
     })
-        .command(['oauth2', '--test-account', 'development'])
-        .it('decrypt oauth2 authorization entries and test-account', () => {
+        .command(['oauth2'])
+        .it('decrypt oauth2 authorization entries and test account', () => {
         (0, test_1.expect)(performOAuth2FlowStub.getCalls().length).to.equal(0);
         (0, test_1.expect)(updateTokenStub.getCalls().length).to.equal(1);
         (0, test_1.expect)(writeTestAccountStub.getCall(0).args).to.deep.equal([
@@ -270,20 +251,17 @@ describe('oauth2', () => {
                         oauth2: { ...oauth2Information, clientSecret: `${Configuration.ENCRYPTION_PREFIX}devClientID` },
                     },
                 ],
-                testAccounts: {
-                    development: {
-                        accessToken: `${Configuration.ENCRYPTION_PREFIX}devAccessToken`,
-                        refreshToken: `${Configuration.ENCRYPTION_PREFIX}devRefreshToken`,
-                    },
+                testAccount: {
+                    accessToken: `${Configuration.ENCRYPTION_PREFIX}devAccessToken`,
+                    refreshToken: `${Configuration.ENCRYPTION_PREFIX}devRefreshToken`,
                 },
             },
-            'production',
+            'local',
             undefined,
             {
                 accessToken: `${Configuration.ENCRYPTION_PREFIX}encryptedAccessToken`,
                 refreshToken: `${Configuration.ENCRYPTION_PREFIX}encryptedRefreshToken`,
             },
-            'development',
         ]);
     });
     test_1.test
@@ -291,9 +269,7 @@ describe('oauth2', () => {
         .stderr()
         .do(() => getConfigurationsStub.returns({
         ...baseConfiguration,
-        testAccounts: {
-            development: { something: 'something' },
-        },
+        testAccount: { something: 'something' },
     }))
         .stub(DecryptionResource, 'decryptEntries', stub => stub.resolves({ successful: {}, failed: ['boom!'] }))
         .command(['oauth2'])
@@ -308,9 +284,7 @@ describe('oauth2', () => {
         .do(() => {
         getConfigurationsStub.returns({
             ...baseConfiguration,
-            testAccounts: {
-                development: credentials,
-            },
+            testAccount: credentials,
         });
         sinon
             .stub(IntegrationsPlatform, 'encryptData')
@@ -324,7 +298,7 @@ describe('oauth2', () => {
         .resolves({ successful: { ...oauth2Information }, failed: [] })
         .onSecondCall()
         .resolves({ successful: { refreshToken: 'test-refresh-token' }, failed: [] }))
-        .command(['oauth2', '--test-account', 'development', '--environment', 'staging'])
+        .command(['oauth2', '--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);
@@ -341,9 +315,7 @@ describe('oauth2', () => {
         .do(() => {
         getConfigurationsStub.returns({
             ...baseConfiguration,
-            testAccounts: {
-                development: credentials,
-            },
+            testAccount: credentials,
         });
         sinon
             .stub(IntegrationsPlatform, 'encryptData')
@@ -357,16 +329,16 @@ describe('oauth2', () => {
         .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', () => {
+        .command(['oauth2'])
+        .it('defaults to local 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
+        // Verify that updateToken was called with the default local 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)
+        (0, test_1.expect)(updateTokenCall.args[3]).to.equal('local'); // environment (default)
     });
 });