@contrail/cli 3.5.5-alpha.960e382 → 3.5.5-alpha.a4cf3d0

package/README.md

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

package/dist/auth/login.js

@@ -9,11 +9,7 @@ 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;
 async function authUser() {
     logger_1.default.debug('authorizing user...');
     const config = await (0, config_1.getConfig)();
@@ -66,7 +62,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 +74,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 = await fetchCognitoConfig(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 +100,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 +123,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 +137,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 +174,19 @@ async function refreshCurrentUserOrg() {
     // await checkTelemetry(current_Version);
     return returnAndStoreConfig(sdk_1.Auth.config);
 }
+async function fetchCognitoConfig(apiGateway) {
+    const response = await fetch(`${apiGateway}/auth/cognito/config`, {
+        headers: { Accept: 'application/json' },
+    });
+    if (!response.ok) {
+        throw new Error(`${describeEnvironment(apiGateway)} did not return its sign-in configuration (${response.status}).`);
+    }
+    return await response.json();
+}
+function describeEnvironment(apiGateway) {
+    return (Object.keys(config_1.ENVIRONMENTS).find((name) => config_1.ENVIRONMENTS[name] === apiGateway) ??
+        new URL(apiGateway).host);
+}
 async function getVibeAccessTokenFromCognitoAccessToken(cognitoAccessToken, apiGateway) {
     const url = `${apiGateway}/auth/cognito/`;
     const response = await fetch(url, {
@@ -181,9 +197,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,88 @@
 "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';
+const DEV_COGNITO_CONFIG = {
+    region: 'us-east-1',
+    userPoolId: 'us-east-1_e2cA0nJWu',
+    clientId: '209s9c62o165cqab0fu5ihjtu9',
+};
+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 pool the configured environment reports', async () => {
+        fetchMock
+            .mockResolvedValueOnce(jsonResponse(200, DEV_COGNITO_CONFIG))
+            .mockResolvedValueOnce(jsonResponse(200, { accessToken: 'vibe-access', refreshToken: 'vibe-refresh' }));
+        const context = await (0, login_1.authUser)();
+        expect(fetchMock.mock.calls[0][0]).toBe(`${DEV_GATEWAY}/auth/cognito/config`);
+        expect(amazon_cognito_identity_js_1.CognitoUserPool).toHaveBeenCalledWith({
+            UserPoolId: DEV_COGNITO_CONFIG.userPoolId,
+            ClientId: DEV_COGNITO_CONFIG.clientId,
+        });
+        expect(context).toEqual({
+            apiUserToken: 'vibe-access',
+            apiRefreshToken: 'vibe-refresh',
+            apiGateway: DEV_GATEWAY,
+            orgSlug: 'adam-zone-1',
+        });
+    });
+    it('should fail without saving tokens when the environment has no sign-in configuration', async () => {
+        fetchMock.mockResolvedValueOnce(jsonResponse(404));
+        await expect((0, login_1.authUser)()).rejects.toThrow('dev did not return its sign-in configuration (404).');
+        expect(config_1.storeConfig).not.toHaveBeenCalled();
+    });
+    it('should fail without saving tokens when the environment rejects the sign-in', async () => {
+        fetchMock
+            .mockResolvedValueOnce(jsonResponse(200, DEV_COGNITO_CONFIG))
+            .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/feature-flags/import.d.ts

@@ -34,5 +34,9 @@ export declare function uploadFeatureFlagsIfPermitted(dir: string): Promise<void
  *
  * Failures are collected and rethrown so an import never reports success while the org is
  * missing flags.
+ *
+ * A file that lists no flags at all is skipped rather than applied: reconciling against an
+ * empty list would disable every flag in the target org, which is almost never what a copy
+ * is meant to do. Flags that should be off in the target have to be disabled by hand.
  */
 export declare function uploadFeatureFlags(dir: string): Promise<void>;

package/dist/commands/feature-flags/import.js

@@ -107,6 +107,10 @@ exports.uploadFeatureFlagsIfPermitted = uploadFeatureFlagsIfPermitted;
  *
  * Failures are collected and rethrown so an import never reports success while the org is
  * missing flags.
+ *
+ * A file that lists no flags at all is skipped rather than applied: reconciling against an
+ * empty list would disable every flag in the target org, which is almost never what a copy
+ * is meant to do. Flags that should be off in the target have to be disabled by hand.
  */
 async function uploadFeatureFlags(dir) {
     const filePath = path.join(dir, export_1.FEATURE_FLAGS_FILE);
@@ -114,11 +118,16 @@ async function uploadFeatureFlags(dir) {
         logger_1.default.info(`${chalk_1.default.yellow.bold('FEATURE FLAGS')} No feature flags found in ${dir}. Skipping.`);
         return;
     }
-    const data = (0, file_helpers_1.loadData)(filePath);
+    const data = (0, file_helpers_1.loadData)(filePath) ?? [];
     if (!Array.isArray(data)) {
         throw new Error(`${filePath} must contain a YAML list of feature flags`);
     }
     const featureNamesToEnable = new Set(data.map(toFeatureName).filter(Boolean));
+    if (featureNamesToEnable.size === 0) {
+        logger_1.default.info(`${chalk_1.default.yellow.bold('FEATURE FLAGS')} ${filePath} lists no feature flags. Skipping, so ` +
+            'the flags currently enabled in this org are left as they are.');
+        return;
+    }
     const existingFlags = (await (0, feature_flags_1.getFeatureFlags)()) ?? [];
     const enabledFeatureNames = new Set(existingFlags.map((flag) => flag?.featureName));
     const toCreate = [...featureNamesToEnable].filter((name) => !enabledFeatureNames.has(name));

package/dist/commands/feature-flags/import.spec.js

@@ -58,6 +58,26 @@ describe('uploadFeatureFlags', () => {
         expect(mocked(feature_flags_1.getFeatureFlags)).not.toHaveBeenCalled();
         expect(mocked(feature_flags_1.createFeatureFlag)).not.toHaveBeenCalled();
     });
+    it('skips an export that lists no flags instead of disabling everything in the target org', async () => {
+        mocked(file_helpers_1.loadData).mockReturnValue([]);
+        mocked(feature_flags_1.getFeatureFlags).mockResolvedValue([
+            { id: '1', featureName: 'SHOWROOM' },
+            { id: '2', featureName: 'DEV_TABS' },
+        ]);
+        const infoSpy = jest.spyOn(logger_1.default, 'info').mockImplementation(() => undefined);
+        await (0, import_1.uploadFeatureFlags)('export-dir');
+        expect(mocked(feature_flags_1.deleteFeatureFlag)).not.toHaveBeenCalled();
+        expect(mocked(feature_flags_1.createFeatureFlag)).not.toHaveBeenCalled();
+        expect(infoSpy).toHaveBeenCalledWith(expect.stringContaining('lists no feature flags'));
+        infoSpy.mockRestore();
+    });
+    it('treats a blank feature-flags.yml the same as an empty list', async () => {
+        mocked(file_helpers_1.loadData).mockReturnValue(undefined);
+        mocked(feature_flags_1.getFeatureFlags).mockResolvedValue([{ id: '1', featureName: 'SHOWROOM' }]);
+        await (0, import_1.uploadFeatureFlags)('export-dir');
+        expect(mocked(feature_flags_1.getFeatureFlags)).not.toHaveBeenCalled();
+        expect(mocked(feature_flags_1.deleteFeatureFlag)).not.toHaveBeenCalled();
+    });
     it('enables every flag from the export that the target org is missing', async () => {
         mocked(file_helpers_1.loadData).mockReturnValue([{ featureName: 'SHOWROOM' }, { featureName: 'PROMOTE' }]);
         mocked(feature_flags_1.getFeatureFlags).mockResolvedValue([{ id: '1', featureName: 'SHOWROOM' }]);

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.5.5-alpha.960e382",
+  "version": "3.5.5-alpha.a4cf3d0",
   "commands": {
     "app:create": {
       "id": "app:create",

package/package.json

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