@unito/integration-cli 0.62.8 → 0.62.10

package/dist/boilerplate/Dockerfile

@@ -10,7 +10,7 @@ WORKDIR /build
 
 COPY . .
 
-RUN --mount=type=secret,id=npmrc,target=.npmrc npm ci
+RUN --mount=type=secret,id=npmrc,target=.npmrc npm --no-audit --no-fund ci
 
 RUN npm install
 RUN npm run compile
@@ -30,7 +30,7 @@ COPY --from=build \
   /build/dist \
   .
 
-RUN --mount=type=secret,id=npmrc,target=.npmrc npm ci --omit=dev
+RUN --mount=type=secret,id=npmrc,target=.npmrc npm --no-audit --no-fund ci --omit=dev
 
 RUN npm install --omit=dev
 

package/dist/schemas/authorization.json

@@ -161,6 +161,11 @@
           "description": "The URL to obtain or refresh an access token.",
           "format": "uri-template"
         },
+        "legacyRedirectUrl": {
+          "type": "string",
+          "description": "The legacy redirect callback URL used for specific connectors where an existing app definition with a predefined redirect URL must be reused.",
+          "format": "uri-template"
+        },
         "grantType": {
           "type": "string",
           "description": "The type of grant of the OAuth 2 authorization.",

package/dist/src/commands/publish.js

@@ -3,7 +3,7 @@ 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 ngrok_1 = tslib_1.__importDefault(require("ngrok"));
+const ngrok_1 = tslib_1.__importDefault(require("@ngrok/ngrok"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const gradient = tslib_1.__importStar(require("gradient-string"));
 const json_colorizer_1 = tslib_1.__importDefault(require("json-colorizer"));
@@ -131,9 +131,23 @@ class Publish extends baseCommand_1.BaseCommand {
             ].join(' - ');
         }
         // Start ngrok & update the base url.
-        core_1.ux.action.start('Starting ngrok', undefined, { stdout: true });
-        updatedConfiguration.baseUrl = await ngrok_1.default.connect(9200);
-        core_1.ux.action.stop();
+        try {
+            core_1.ux.action.start('Starting ngrok');
+            const listener = await ngrok_1.default.forward({ addr: 9200, authtoken_from_env: true });
+            const url = listener.url();
+            if (url) {
+                updatedConfiguration.baseUrl = url;
+                core_1.ux.log(`Ngrok started at: ${url}`);
+            }
+            else {
+                throw new Error('Ngrok failed to start: URL is null');
+            }
+            core_1.ux.action.stop();
+        }
+        catch (error) {
+            core_1.ux.action.stop();
+            console.error('Failed to start ngrok:', error);
+        }
         // Update the registry.
         await this.updateRegistry(updatedConfiguration);
         // Launch the process.

package/dist/src/configurationTypes.d.ts

@@ -149,6 +149,10 @@ export interface Oauth2 {
      * The URL to obtain or refresh an access token.
      */
     tokenUrl: string;
+    /**
+     * The legacy redirect callback URL used for specific connectors where an existing app definition with a predefined redirect URL must be reused.
+     */
+    legacyRedirectUrl?: string;
     grantType?: GrantType;
     scopes: {
         /**

package/dist/src/services/oauth2.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const express_1 = tslib_1.__importDefault(require("express"));
 const cors_1 = tslib_1.__importDefault(require("cors"));
 const openUrl = tslib_1.__importStar(require("openurl"));
-const ngrok_1 = tslib_1.__importDefault(require("ngrok"));
+const ngrok_1 = tslib_1.__importDefault(require("@ngrok/ngrok"));
 const IntegrationsPlatformClient = tslib_1.__importStar(require("./integrationsPlatform"));
 const configurationTypes_1 = require("../configurationTypes");
 const template_1 = require("../resources/template");
@@ -263,7 +263,15 @@ class OAuth2Service {
     async startServer() {
         const app = (0, express_1.default)();
         const PORT = process.env.OAUTH2_PORT ?? 9002;
-        this.serverUrl = await ngrok_1.default.connect(Number(PORT));
+        const listener = await ngrok_1.default.forward({ addr: Number(PORT), authtoken_from_env: true });
+        const url = listener.url();
+        if (url) {
+            this.serverUrl = url;
+            console.log(`  Ngrok started at: ${url}`);
+        }
+        else {
+            throw new Error('Ngrok failed to start: URL is null');
+        }
         app.use((0, cors_1.default)({ credentials: true, origin: true }));
         app.use(express_1.default.json());
         app.get('/health', (_req, res) => {
@@ -281,7 +289,7 @@ class OAuth2Service {
     /* istanbul ignore next */
     async stopServer() {
         if (this.server) {
-            await ngrok_1.default.kill();
+            await ngrok_1.default.disconnect();
             this.server.close(() => {
                 console.log('  Server has stopped');
             });

package/dist/test/commands/publish.test.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const test_1 = require("@oclif/test");
 const sinon_1 = tslib_1.__importDefault(require("sinon"));
-const ngrok_1 = tslib_1.__importDefault(require("ngrok"));
+const ngrok_1 = tslib_1.__importDefault(require("@ngrok/ngrok"));
 const child_process_1 = tslib_1.__importDefault(require("child_process"));
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const GlobalConfiguration = tslib_1.__importStar(require("../../src/resources/globalConfiguration"));
@@ -22,7 +22,7 @@ describe('Publish', () => {
         sinon_1.default.stub(IntegrationsPlatform, 'setApiKey');
         sinon_1.default.stub(IntegrationsPlatform, 'publishIntegration');
         sinon_1.default.stub(IntegrationsPlatform, 'reencryptData').resolves({ encryptedData: 'newEncryptedSecret' });
-        sinon_1.default.stub(ngrok_1.default, 'connect');
+        sinon_1.default.stub(ngrok_1.default, 'forward');
         sinon_1.default.stub(child_process_1.default, 'spawn');
         sinon_1.default.stub(IntegrationsPlatform, 'getProfile').resolves({
             id: 1,

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.62.8",
+  "version": "0.62.10",
   "commands": {
     "activity": {
       "id": "activity",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unito/integration-cli",
-  "version": "0.62.8",
+  "version": "0.62.10",
   "description": "Integration CLI",
   "bin": {
     "integration-cli": "./bin/run"
@@ -36,9 +36,10 @@
     "!/bin/dev*"
   ],
   "dependencies": {
-    "@oclif/core": "3.x",
-    "@unito/integration-debugger": "0.28.4",
+    "@ngrok/ngrok": "^1.4.1",
     "@oazapfts/runtime": "1.x",
+    "@oclif/core": "3.x",
+    "@unito/integration-debugger": "0.28.5",
     "ajv": "8.x",
     "ajv-formats": "2.x",
     "better-ajv-errors": "1.x",
@@ -48,7 +49,6 @@
     "gradient-string": "2.x",
     "inquirer": "8.x",
     "json-colorizer": "2.x",
-    "ngrok": "5.0.0-beta.2",
     "openurl": "1.x",
     "tmp": "0.x"
   },