@contrail/cli 3.5.5-alpha.a73fd77 → 3.5.5-alpha.bd66bf6

package/README.md

@@ -17,7 +17,7 @@ $ npm install -g @contrail/cli
 $ contrail COMMAND
 running command...
 $ contrail (--version)
-@contrail/cli/3.5.5-alpha.a73fd77 linux-x64 node-v24.21.0
+@contrail/cli/3.5.5-alpha.bd66bf6 linux-x64 node-v24.22.1
 $ contrail --help [COMMAND]
 USAGE
   $ contrail COMMAND

package/dist/auth/login.js

@@ -9,10 +9,10 @@ const config_1 = require("../helpers/config/config");
 const logger_1 = tslib_1.__importDefault(require("../logger"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
-const CONFIGURATION = {
-    userPoolId: 'us-east-1_qIaNZdUfm',
-    clientId: process.env.CONTRAIL_COGNITO_CLIENT_ID || '7knkt34gfacbgd0ghnuspefdfg',
-    apiGateway: 'https://api.vibeiq.com/prod/api',
+const DEFAULT_API_GATEWAY = config_1.ENVIRONMENTS.prod;
+const COGNITO_CONFIGS = {
+    dev: { userPoolId: 'us-east-1_e2cA0nJWu', clientId: '209s9c62o165cqab0fu5ihjtu9' },
+    prod: { userPoolId: 'us-east-1_qIaNZdUfm', clientId: '7knkt34gfacbgd0ghnuspefdfg' },
 };
 async function authUser() {
     logger_1.default.debug('authorizing user...');
@@ -66,7 +66,7 @@ async function getOrgSlug(config) {
     return orgSlug;
 }
 async function authenticateWithApiKey(config, apiKey, orgSlug) {
-    const apiGateway = config?.apiGateway ?? CONFIGURATION.apiGateway;
+    const apiGateway = config?.apiGateway ?? DEFAULT_API_GATEWAY;
     sdk_1.Auth.config = {
         apiUserToken: apiKey,
         apiRefreshToken: null,
@@ -78,6 +78,10 @@ async function authenticateWithApiKey(config, apiKey, orgSlug) {
     return returnAndStoreConfig(sdk_1.Auth.config);
 }
 async function authenticateWithUsernamePassword(config) {
+    const apiGateway = config?.apiGateway ?? DEFAULT_API_GATEWAY;
+    const cognitoConfig = getCognitoConfig(apiGateway);
+    const environment = describeEnvironment(apiGateway);
+    logger_1.default.info(`Signing in to ${environment} — use your ${environment} VibeIQ credentials.`);
     const questions = [];
     if (!process.env.CONTRAIL_CLI_EMAIL) {
         questions.push({
@@ -100,14 +104,14 @@ async function authenticateWithUsernamePassword(config) {
         email: process.env.CONTRAIL_CLI_EMAIL || answers.email,
         password: process.env.CONTRAIL_CLI_PASSWORD || answers.password,
         orgSlug: await getOrgSlug(config),
-        ...(config?.apiGateway && { apiGateway: config.apiGateway }),
+        apiGateway,
     };
     if (!params.email || !params.password) {
         throw new Error('Email and Password required');
     }
     const poolData = {
-        UserPoolId: CONFIGURATION.userPoolId,
-        ClientId: CONFIGURATION.clientId,
+        UserPoolId: cognitoConfig.userPoolId,
+        ClientId: cognitoConfig.clientId,
     };
     const userPool = new amazon_cognito_identity_js_1.CognitoUserPool(poolData);
     const authData = {
@@ -123,9 +127,12 @@ async function authenticateWithUsernamePassword(config) {
     return new Promise((resolve, reject) => {
         cognitoUser.authenticateUser(authDetails, {
             onSuccess: async (result) => {
-                const user = result;
-                const config = await setAuthContext(user, params);
-                resolve(config);
+                try {
+                    resolve(await setAuthContext(result, params));
+                }
+                catch (e) {
+                    reject(e);
+                }
             },
             onFailure: (err) => {
                 reject(err);
@@ -134,7 +141,7 @@ async function authenticateWithUsernamePassword(config) {
     });
 }
 async function setAuthContext(user, params) {
-    const apiGateway = params?.apiGateway ?? CONFIGURATION.apiGateway;
+    const apiGateway = params.apiGateway;
     const { vibeAccessToken, vibeRefreshToken } = await getVibeAccessTokenFromCognitoAccessToken(user.idToken.jwtToken, apiGateway);
     // Set Auth Config
     sdk_1.Auth.config = {
@@ -171,6 +178,19 @@ async function refreshCurrentUserOrg() {
     // await checkTelemetry(current_Version);
     return returnAndStoreConfig(sdk_1.Auth.config);
 }
+function getCognitoConfig(apiGateway) {
+    const environment = findEnvironmentName(apiGateway);
+    if (!environment) {
+        throw new Error(`No Cognito user pool is known for ${new URL(apiGateway).host}. Email and password sign-in works for ${Object.keys(COGNITO_CONFIGS).join(' and ')}; use CONTRAIL_CLI_API_KEY for other environments.`);
+    }
+    return COGNITO_CONFIGS[environment];
+}
+function findEnvironmentName(apiGateway) {
+    return Object.keys(config_1.ENVIRONMENTS).find((name) => config_1.ENVIRONMENTS[name] === apiGateway);
+}
+function describeEnvironment(apiGateway) {
+    return findEnvironmentName(apiGateway) ?? new URL(apiGateway).host;
+}
 async function getVibeAccessTokenFromCognitoAccessToken(cognitoAccessToken, apiGateway) {
     const url = `${apiGateway}/auth/cognito/`;
     const response = await fetch(url, {
@@ -181,9 +201,11 @@ async function getVibeAccessTokenFromCognitoAccessToken(cognitoAccessToken, apiG
         },
         body: JSON.stringify({ accessToken: cognitoAccessToken }),
     });
-    return await response.json().then((data) => {
-        return { vibeAccessToken: data.accessToken, vibeRefreshToken: data.refreshToken };
-    });
+    if (!response.ok) {
+        throw new Error(`${describeEnvironment(apiGateway)} rejected the sign-in (${response.status}).`);
+    }
+    const data = await response.json();
+    return { vibeAccessToken: data.accessToken, vibeRefreshToken: data.refreshToken };
 }
 async function requestRefreshedAccessToken(vibeRefreshToken, apiGateway) {
     const url = `${apiGateway}/auth/jwt_refresh/`;

package/dist/auth/login.spec.js

@@ -1,6 +1,93 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const amazon_cognito_identity_js_1 = require("amazon-cognito-identity-js");
+const sdk_1 = require("@contrail/sdk");
+const config_1 = require("../helpers/config/config");
 const login_1 = require("./login");
+jest.mock('amazon-cognito-identity-js', () => ({
+    CognitoUserPool: jest.fn(),
+    AuthenticationDetails: jest.fn(),
+    CognitoUser: jest.fn().mockImplementation(() => ({
+        authenticateUser: (_details, callbacks) => callbacks.onSuccess({ idToken: { jwtToken: 'cognito-id-token' } }),
+    })),
+}));
+jest.mock('@contrail/sdk', () => ({
+    Auth: { config: {} },
+    getCurrentUser: jest.fn(),
+    setConfig: jest.fn(),
+}));
+jest.mock('../helpers/config/config', () => ({
+    ...jest.requireActual('../helpers/config/config'),
+    getConfig: jest.fn(),
+    storeConfig: jest.fn(),
+}));
+jest.mock('../logger', () => ({
+    __esModule: true,
+    default: { debug: jest.fn(), info: jest.fn() },
+}));
+const DEV_GATEWAY = 'https://api.dev.vibeiq.com/dev/api';
+function jsonResponse(status, body = {}) {
+    return new Response(JSON.stringify(body), { status });
+}
+describe('authUser with email and password', () => {
+    const originalFetch = global.fetch;
+    const originalEmail = process.env.CONTRAIL_CLI_EMAIL;
+    const originalPassword = process.env.CONTRAIL_CLI_PASSWORD;
+    let fetchMock;
+    beforeEach(() => {
+        jest.clearAllMocks();
+        process.env.CONTRAIL_CLI_EMAIL = 'dev@vibeiq.com';
+        process.env.CONTRAIL_CLI_PASSWORD = 'secret';
+        config_1.getConfig.mockResolvedValue({ apiGateway: DEV_GATEWAY, orgSlug: 'adam-zone-1' });
+        sdk_1.getCurrentUser.mockResolvedValue({ id: 'user-1' });
+        fetchMock = jest.fn();
+        global.fetch = fetchMock;
+    });
+    afterEach(() => {
+        global.fetch = originalFetch;
+        process.env.CONTRAIL_CLI_EMAIL = originalEmail;
+        process.env.CONTRAIL_CLI_PASSWORD = originalPassword;
+    });
+    it('should sign in through the dev pool when the config points at dev', async () => {
+        fetchMock.mockResolvedValueOnce(jsonResponse(200, { accessToken: 'vibe-access', refreshToken: 'vibe-refresh' }));
+        const context = await (0, login_1.authUser)();
+        expect(amazon_cognito_identity_js_1.CognitoUserPool).toHaveBeenCalledWith({
+            UserPoolId: 'us-east-1_e2cA0nJWu',
+            ClientId: '209s9c62o165cqab0fu5ihjtu9',
+        });
+        expect(context).toEqual({
+            apiUserToken: 'vibe-access',
+            apiRefreshToken: 'vibe-refresh',
+            apiGateway: DEV_GATEWAY,
+            orgSlug: 'adam-zone-1',
+        });
+    });
+    it('should sign in through the prod pool when the config points at prod', async () => {
+        config_1.getConfig.mockResolvedValue({
+            apiGateway: 'https://api.vibeiq.com/prod/api',
+            orgSlug: 'adam-zone-1',
+        });
+        fetchMock.mockResolvedValueOnce(jsonResponse(200, { accessToken: 'vibe-access', refreshToken: 'vibe-refresh' }));
+        await (0, login_1.authUser)();
+        expect(amazon_cognito_identity_js_1.CognitoUserPool).toHaveBeenCalledWith({
+            UserPoolId: 'us-east-1_qIaNZdUfm',
+            ClientId: '7knkt34gfacbgd0ghnuspefdfg',
+        });
+    });
+    it('should fail without saving tokens when no pool is known for the environment', async () => {
+        config_1.getConfig.mockResolvedValue({
+            apiGateway: 'http://localhost:3000/api',
+            orgSlug: 'adam-zone-1',
+        });
+        await expect((0, login_1.authUser)()).rejects.toThrow('No Cognito user pool is known for localhost:3000.');
+        expect(config_1.storeConfig).not.toHaveBeenCalled();
+    });
+    it('should fail without saving tokens when the environment rejects the sign-in', async () => {
+        fetchMock.mockResolvedValueOnce(jsonResponse(401, { message: 'Unauthorized' }));
+        await expect((0, login_1.authUser)()).rejects.toThrow('dev rejected the sign-in (401).');
+        expect(config_1.storeConfig).not.toHaveBeenCalled();
+    });
+});
 describe('getVersionFromPackageJson', () => {
     it('should return the version value from package.json', () => {
         const version = (0, login_1.getVersionFromPackageJson)();

package/dist/commands/app/upgrade.js

@@ -95,10 +95,6 @@ async function upgradeAndWait(appOrgToUpgrade, versionToUpgrade) {
             entityName: 'app-org',
             id: appOrgToUpgrade.id,
         });
-        if (appStillUpgrading.status === 'READY' && appStillUpgrading.lastInstallError) {
-            logger_1.default.info(`${chalk_1.default.red.bold('APP UPGRADE')} ${appStillUpgrading.lastInstallError}`);
-            return;
-        }
         if (appStillUpgrading.status === 'READY') {
             logger_1.default.info(`${chalk_1.default.green.bold('APP UPGRADE')} App Upgraded`);
             return;

package/dist/interfaces.d.ts

@@ -168,7 +168,6 @@ export interface AppOrg {
     appVersion?: AppVersion;
     apiKey?: AppApiKey;
     appConfig?: any;
-    lastInstallError?: string;
 }
 export interface Webhook {
     id?: string;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.5-alpha.a73fd77",
+  "version": "3.5.5-alpha.bd66bf6",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "3.5.5-alpha.a73fd77",
+  "version": "3.5.5-alpha.bd66bf6",
   "description": "VibeIQ's Contrail Platform CLI.",
   "bin": {
     "contrail-cli": "./bin/run",

package/dist/commands/app/upgrade.spec.d.ts

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

package/dist/commands/app/upgrade.spec.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const get = jest.fn();
-const update = jest.fn();
-const info = jest.fn();
-jest.mock('@contrail/sdk', () => ({
-    Auth: jest.fn(),
-    Entities: jest.fn(() => ({
-        get: (...args) => get(...args),
-        update: (...args) => update(...args),
-    })),
-}));
-jest.mock('../../common', () => ({ delay: () => Promise.resolve() }));
-jest.mock('../../logger', () => ({ info: (...args) => info(...args) }));
-const upgrade_1 = require("./upgrade");
-describe('upgradeAndWait', () => {
-    beforeEach(() => {
-        get.mockReset();
-        update.mockReset().mockResolvedValue({});
-        info.mockReset();
-    });
-    it('should report success once the app is ready', async () => {
-        get.mockResolvedValue({ status: 'READY' });
-        await (0, upgrade_1.upgradeAndWait)({ id: 'app-org-1' }, 'version-2');
-        expect(info).toHaveBeenLastCalledWith(expect.stringContaining('App Upgraded'));
-    });
-    it('should report why the upgrade was reverted instead of calling it upgraded', async () => {
-        get.mockResolvedValue({
-            status: 'READY',
-            lastInstallError: '1.0.1 could not finish installing (template write failed); reverted to 1.0.0',
-        });
-        await (0, upgrade_1.upgradeAndWait)({ id: 'app-org-1' }, 'version-2');
-        expect(info).toHaveBeenLastCalledWith(expect.stringContaining('reverted to 1.0.0'));
-        expect(info).not.toHaveBeenCalledWith(expect.stringContaining('App Upgraded'));
-    });
-});