@unito/integration-cli 0.62.5 → 0.62.7

package/dist/boilerplate/package-lock.json

@@ -492,17 +492,32 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.0.tgz",
-      "integrity": "sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz",
+      "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
+        "@eslint/core": "^0.10.0",
         "levn": "^0.4.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
+    "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz",
+      "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@humanfs/core": {
       "version": "0.19.0",
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.0.tgz",
@@ -1264,10 +1279,11 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",

package/dist/src/commands/oauth2.js

@@ -77,47 +77,50 @@ class Oauth2 extends core_1.Command {
         const testAccount = flags['test-account'];
         const testAccountCredentials = configuration.testAccounts?.[testAccount];
         const testAccountsToRefresh = new Set([testAccount]);
+        // Figure out if we want to refresh other test account at the same time (like if they currently have the same values)
+        for (const [account, accountCredentials] of Object.entries(configuration.testAccounts ?? {})) {
+            if (!testAccountsToRefresh.has(account) &&
+                accountCredentials?.accessToken === testAccountCredentials?.accessToken &&
+                accountCredentials?.refreshToken === testAccountCredentials?.refreshToken) {
+                testAccountsToRefresh.add(account);
+            }
+        }
+        let decryptionResult;
+        if (testAccountCredentials) {
+            decryptionResult = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, testAccountCredentials);
+        }
         let credentials;
         if (!testAccountCredentials?.accessToken || flags.reauth) {
-            core_1.ux.log(`Starting Oauth2 flow for test account: ${testAccount}`);
+            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`);
+            core_1.ux.log(`OAuth2 flow... Done`);
         }
         else {
             if (!testAccountCredentials?.refreshToken) {
                 core_1.ux.log(chalk_1.default.redBright('No refresh token found, nothing to do.'));
                 return;
             }
-            // Figure out if we want to refresh other test account at the same time (like if they currently have the same values)
-            for (const [account, accountCredentials] of Object.entries(configuration.testAccounts ?? {})) {
-                if (!testAccountsToRefresh.has(account) &&
-                    accountCredentials?.accessToken === testAccountCredentials.accessToken &&
-                    accountCredentials?.refreshToken === testAccountCredentials.refreshToken) {
-                    testAccountsToRefresh.add(account);
-                }
-            }
-            const decryptionResult = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, testAccountCredentials);
-            const refreshToken = decryptionResult.successful.refreshToken;
+            const refreshToken = decryptionResult?.successful.refreshToken;
             core_1.ux.action.start(`Refreshing test account ${testAccount}`, 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;
-            }
+            // If provider response doesn't contain a new refresh token, use the existing one
+            credentials.refreshToken = credentials.refreshToken ?? refreshToken;
+            core_1.ux.action.stop();
+        }
+        if (decryptionResult) {
             if (decryptionResult.successful.accessToken) {
                 credentials.accessToken = (await IntegrationsPlatform.encryptData(configuration.name, credentials.accessToken, false)).encryptedData;
             }
-            if (decryptionResult.successful.refreshToken) {
+            if (decryptionResult.successful.refreshToken && credentials.refreshToken) {
                 credentials.refreshToken = (await IntegrationsPlatform.encryptData(configuration.name, credentials.refreshToken, false)).encryptedData;
             }
-            core_1.ux.action.stop();
         }
+        // Save credentials for all test accounts needing refresh
         for (const account of testAccountsToRefresh) {
             core_1.ux.action.start(`Saving credentials for account: ${account}`, undefined, { stdout: true });
             await (0, configuration_1.writeTestAccount)(configuration, environment, customConfigPath, credentials, account);
             core_1.ux.action.stop();
         }
-        return;
     }
 }
 exports.default = Oauth2;

package/dist/src/commands/publish.js

@@ -165,15 +165,16 @@ class Publish extends baseCommand_1.BaseCommand {
         }
         if (integration) {
             core_1.ux.action.start('Integration found. Updating', undefined, { stdout: true });
+            const configurationPayload = {
+                ...integrationConfiguration,
+            };
             if (integration.archivedAt) {
                 core_1.ux.action.start(`Integration previously archived on ${integration.archivedAt}. Un-archiving`, undefined, {
                     stdout: true,
                 });
+                configurationPayload.archived = false;
             }
-            updated = await IntegrationsPlatform.updateIntegration(integration.id, {
-                ...integrationConfiguration,
-                archived: false,
-            });
+            updated = await IntegrationsPlatform.updateIntegration(integration.id, configurationPayload);
         }
         else {
             core_1.ux.action.start('Integration not found. Creating', undefined, { stdout: true });

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.62.5",
+  "version": "0.62.7",
   "commands": {
     "activity": {
       "id": "activity",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unito/integration-cli",
-  "version": "0.62.5",
+  "version": "0.62.7",
   "description": "Integration CLI",
   "bin": {
     "integration-cli": "./bin/run"
@@ -44,7 +44,7 @@
     "better-ajv-errors": "1.x",
     "chalk": "4.x",
     "cors": "2.x",
-    "express": "5.0.0-beta.3",
+    "express": "5.0.1",
     "gradient-string": "2.x",
     "inquirer": "8.x",
     "json-colorizer": "2.x",