@contrail/cli 3.4.1 → 3.4.2

package/dist/auth/login.js

@@ -1,221 +1,221 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVersionFromPackageJson = exports.authUser = void 0;
-const tslib_1 = require("tslib");
-const amazon_cognito_identity_js_1 = require("amazon-cognito-identity-js");
-const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
-const sdk_1 = require("@contrail/sdk");
-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',
-};
-async function authUser() {
-    logger_1.default.debug('authorizing user...');
-    const config = await (0, config_1.getConfig)();
-    if (process.env.CONTRAIL_CLI_API_KEY) {
-        const apiKey = process.env.CONTRAIL_CLI_API_KEY;
-        const orgSlug = await getOrgSlug(config);
-        logger_1.default.debug('Using API key for authentication...');
-        return await authenticateWithApiKey(config, apiKey, orgSlug);
-    }
-    if (config &&
-        config.apiUserToken &&
-        config.apiRefreshToken &&
-        config.apiGateway &&
-        config.orgSlug) {
-        logger_1.default.debug('populating auth config from fs config...');
-        sdk_1.Auth.config = {
-            apiUserToken: config.apiUserToken,
-            apiRefreshToken: config.apiRefreshToken,
-            apiGateway: config.apiGateway,
-            orgSlug: config.orgSlug,
-        };
-        (0, sdk_1.setConfig)(sdk_1.Auth.config);
-        try {
-            return await refreshCurrentUserOrg();
-        }
-        catch (e) {
-            if (isNetworkConnectionError(e)) {
-                logger_1.default.error("Encountered a network connection issue. Please ensure you're connected to the internet and try again");
-                process.exit(1);
-            }
-            logger_1.default.info('Token expired. Requesting auth credentials...');
-        }
-    }
-    return await authenticateWithUsernamePassword(config);
-}
-exports.authUser = authUser;
-async function getOrgSlug(config) {
-    const orgSlug = config?.orgSlug || process.env.CONTRAIL_CLI_ORG_SLUG;
-    if (!orgSlug) {
-        const answers = await inquirer_1.default.prompt([
-            {
-                type: 'input',
-                name: 'orgSlug',
-                validate: (val) => !!val,
-                message: 'Org (slug)',
-            },
-        ]);
-        return answers.orgSlug;
-    }
-    return orgSlug;
-}
-async function authenticateWithApiKey(config, apiKey, orgSlug) {
-    const apiGateway = config?.apiGateway ?? CONFIGURATION.apiGateway;
-    sdk_1.Auth.config = {
-        apiUserToken: apiKey,
-        apiRefreshToken: null,
-        apiGateway,
-        orgSlug,
-    };
-    (0, sdk_1.setConfig)(sdk_1.Auth.config);
-    await (0, sdk_1.getCurrentUser)();
-    return returnAndStoreConfig(sdk_1.Auth.config);
-}
-async function authenticateWithUsernamePassword(config) {
-    const questions = [];
-    if (!process.env.CONTRAIL_CLI_EMAIL) {
-        questions.push({
-            type: 'input',
-            name: 'email',
-            validate: (val) => !!val,
-            message: 'Email',
-        });
-    }
-    if (!process.env.CONTRAIL_CLI_PASSWORD) {
-        questions.push({
-            type: 'password',
-            name: 'password',
-            validate: (val) => !!val,
-            message: 'Password',
-        });
-    }
-    const answers = await inquirer_1.default.prompt(questions);
-    const params = {
-        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 }),
-    };
-    if (!params.email || !params.password) {
-        throw new Error('Email and Password required');
-    }
-    const poolData = {
-        UserPoolId: CONFIGURATION.userPoolId,
-        ClientId: CONFIGURATION.clientId,
-    };
-    const userPool = new amazon_cognito_identity_js_1.CognitoUserPool(poolData);
-    const authData = {
-        Username: params.email,
-        Password: params.password,
-    };
-    const authDetails = new amazon_cognito_identity_js_1.AuthenticationDetails(authData);
-    const userData = {
-        Username: params.email,
-        Pool: userPool,
-    };
-    const cognitoUser = new amazon_cognito_identity_js_1.CognitoUser(userData);
-    return new Promise((resolve, reject) => {
-        cognitoUser.authenticateUser(authDetails, {
-            onSuccess: async (result) => {
-                const user = result;
-                const config = await setAuthContext(user, params);
-                resolve(config);
-            },
-            onFailure: (err) => {
-                reject(err);
-            },
-        });
-    });
-}
-async function setAuthContext(user, params) {
-    const apiGateway = params?.apiGateway ?? CONFIGURATION.apiGateway;
-    const { vibeAccessToken, vibeRefreshToken } = await getVibeAccessTokenFromCognitoAccessToken(user.idToken.jwtToken, apiGateway);
-    // Set Auth Config
-    sdk_1.Auth.config = {
-        apiUserToken: vibeAccessToken,
-        apiRefreshToken: vibeRefreshToken,
-        apiGateway,
-        orgSlug: params.orgSlug,
-    };
-    // SET SDK CONFIG
-    (0, sdk_1.setConfig)(sdk_1.Auth.config);
-    return refreshCurrentUserOrg();
-}
-async function refreshCurrentUserOrg() {
-    logger_1.default.debug('refreshing current user org...');
-    const currentUser = await (0, sdk_1.getCurrentUser)();
-    if (!currentUser) {
-        const config = await (0, config_1.getConfig)();
-        try {
-            const newVibeAccessToken = await requestRefreshedAccessToken(config.apiRefreshToken, config.apiGateway);
-            sdk_1.Auth.config = {
-                apiUserToken: newVibeAccessToken,
-                apiRefreshToken: config.apiRefreshToken,
-                apiGateway: config.apiGateway,
-                orgSlug: config.orgSlug,
-            };
-            console.log('fetched new access token from refresh token', newVibeAccessToken);
-        }
-        catch (e) {
-            throw Error('Could not get refresh token');
-        }
-    }
-    // TODO: To uncomment when telemetry backend is developed.
-    // const current_Version = getVersionFromPackageJson();
-    // await checkTelemetry(current_Version);
-    return returnAndStoreConfig(sdk_1.Auth.config);
-}
-async function getVibeAccessTokenFromCognitoAccessToken(cognitoAccessToken, apiGateway) {
-    const url = `${apiGateway}/auth/cognito/`;
-    const response = await fetch(url, {
-        method: 'POST',
-        headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({ accessToken: cognitoAccessToken }),
-    });
-    return await response.json().then((data) => {
-        return { vibeAccessToken: data.accessToken, vibeRefreshToken: data.refreshToken };
-    });
-}
-async function requestRefreshedAccessToken(vibeRefreshToken, apiGateway) {
-    const url = `${apiGateway}/auth/jwt_refresh/`;
-    const response = await fetch(url, {
-        method: 'POST',
-        headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({ refreshToken: vibeRefreshToken }),
-    });
-    return await response.json().then((data) => {
-        return data.accessToken;
-    });
-}
-function getVersionFromPackageJson() {
-    // Get the path to the package.json file
-    const packageJsonPath = path_1.default.resolve(process.cwd(), 'package.json');
-    // Read the package.json file
-    const packageJsonContent = fs_1.default.readFileSync(packageJsonPath, 'utf8');
-    // Parse the package.json content
-    const packageJson = JSON.parse(packageJsonContent);
-    // Return the version value
-    return packageJson.version;
-}
-exports.getVersionFromPackageJson = getVersionFromPackageJson;
-async function returnAndStoreConfig(config) {
-    const configCopy = Object.assign({}, config);
-    await (0, config_1.storeConfig)(configCopy);
-    return configCopy;
-}
-function isNetworkConnectionError(e) {
-    const cause = e?.cause;
-    return cause?.code === 'ENOTFOUND' || cause?.code === 'ECONNREFUSED';
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVersionFromPackageJson = exports.authUser = void 0;
+const tslib_1 = require("tslib");
+const amazon_cognito_identity_js_1 = require("amazon-cognito-identity-js");
+const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
+const sdk_1 = require("@contrail/sdk");
+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',
+};
+async function authUser() {
+    logger_1.default.debug('authorizing user...');
+    const config = await (0, config_1.getConfig)();
+    if (process.env.CONTRAIL_CLI_API_KEY) {
+        const apiKey = process.env.CONTRAIL_CLI_API_KEY;
+        const orgSlug = await getOrgSlug(config);
+        logger_1.default.debug('Using API key for authentication...');
+        return await authenticateWithApiKey(config, apiKey, orgSlug);
+    }
+    if (config &&
+        config.apiUserToken &&
+        config.apiRefreshToken &&
+        config.apiGateway &&
+        config.orgSlug) {
+        logger_1.default.debug('populating auth config from fs config...');
+        sdk_1.Auth.config = {
+            apiUserToken: config.apiUserToken,
+            apiRefreshToken: config.apiRefreshToken,
+            apiGateway: config.apiGateway,
+            orgSlug: config.orgSlug,
+        };
+        (0, sdk_1.setConfig)(sdk_1.Auth.config);
+        try {
+            return await refreshCurrentUserOrg();
+        }
+        catch (e) {
+            if (isNetworkConnectionError(e)) {
+                logger_1.default.error("Encountered a network connection issue. Please ensure you're connected to the internet and try again");
+                process.exit(1);
+            }
+            logger_1.default.info('Token expired. Requesting auth credentials...');
+        }
+    }
+    return await authenticateWithUsernamePassword(config);
+}
+exports.authUser = authUser;
+async function getOrgSlug(config) {
+    const orgSlug = config?.orgSlug || process.env.CONTRAIL_CLI_ORG_SLUG;
+    if (!orgSlug) {
+        const answers = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'orgSlug',
+                validate: (val) => !!val,
+                message: 'Org (slug)',
+            },
+        ]);
+        return answers.orgSlug;
+    }
+    return orgSlug;
+}
+async function authenticateWithApiKey(config, apiKey, orgSlug) {
+    const apiGateway = config?.apiGateway ?? CONFIGURATION.apiGateway;
+    sdk_1.Auth.config = {
+        apiUserToken: apiKey,
+        apiRefreshToken: null,
+        apiGateway,
+        orgSlug,
+    };
+    (0, sdk_1.setConfig)(sdk_1.Auth.config);
+    await (0, sdk_1.getCurrentUser)();
+    return returnAndStoreConfig(sdk_1.Auth.config);
+}
+async function authenticateWithUsernamePassword(config) {
+    const questions = [];
+    if (!process.env.CONTRAIL_CLI_EMAIL) {
+        questions.push({
+            type: 'input',
+            name: 'email',
+            validate: (val) => !!val,
+            message: 'Email',
+        });
+    }
+    if (!process.env.CONTRAIL_CLI_PASSWORD) {
+        questions.push({
+            type: 'password',
+            name: 'password',
+            validate: (val) => !!val,
+            message: 'Password',
+        });
+    }
+    const answers = await inquirer_1.default.prompt(questions);
+    const params = {
+        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 }),
+    };
+    if (!params.email || !params.password) {
+        throw new Error('Email and Password required');
+    }
+    const poolData = {
+        UserPoolId: CONFIGURATION.userPoolId,
+        ClientId: CONFIGURATION.clientId,
+    };
+    const userPool = new amazon_cognito_identity_js_1.CognitoUserPool(poolData);
+    const authData = {
+        Username: params.email,
+        Password: params.password,
+    };
+    const authDetails = new amazon_cognito_identity_js_1.AuthenticationDetails(authData);
+    const userData = {
+        Username: params.email,
+        Pool: userPool,
+    };
+    const cognitoUser = new amazon_cognito_identity_js_1.CognitoUser(userData);
+    return new Promise((resolve, reject) => {
+        cognitoUser.authenticateUser(authDetails, {
+            onSuccess: async (result) => {
+                const user = result;
+                const config = await setAuthContext(user, params);
+                resolve(config);
+            },
+            onFailure: (err) => {
+                reject(err);
+            },
+        });
+    });
+}
+async function setAuthContext(user, params) {
+    const apiGateway = params?.apiGateway ?? CONFIGURATION.apiGateway;
+    const { vibeAccessToken, vibeRefreshToken } = await getVibeAccessTokenFromCognitoAccessToken(user.idToken.jwtToken, apiGateway);
+    // Set Auth Config
+    sdk_1.Auth.config = {
+        apiUserToken: vibeAccessToken,
+        apiRefreshToken: vibeRefreshToken,
+        apiGateway,
+        orgSlug: params.orgSlug,
+    };
+    // SET SDK CONFIG
+    (0, sdk_1.setConfig)(sdk_1.Auth.config);
+    return refreshCurrentUserOrg();
+}
+async function refreshCurrentUserOrg() {
+    logger_1.default.debug('refreshing current user org...');
+    const currentUser = await (0, sdk_1.getCurrentUser)();
+    if (!currentUser) {
+        const config = await (0, config_1.getConfig)();
+        try {
+            const newVibeAccessToken = await requestRefreshedAccessToken(config.apiRefreshToken, config.apiGateway);
+            sdk_1.Auth.config = {
+                apiUserToken: newVibeAccessToken,
+                apiRefreshToken: config.apiRefreshToken,
+                apiGateway: config.apiGateway,
+                orgSlug: config.orgSlug,
+            };
+            console.log('fetched new access token from refresh token', newVibeAccessToken);
+        }
+        catch (e) {
+            throw Error('Could not get refresh token');
+        }
+    }
+    // TODO: To uncomment when telemetry backend is developed.
+    // const current_Version = getVersionFromPackageJson();
+    // await checkTelemetry(current_Version);
+    return returnAndStoreConfig(sdk_1.Auth.config);
+}
+async function getVibeAccessTokenFromCognitoAccessToken(cognitoAccessToken, apiGateway) {
+    const url = `${apiGateway}/auth/cognito/`;
+    const response = await fetch(url, {
+        method: 'POST',
+        headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ accessToken: cognitoAccessToken }),
+    });
+    return await response.json().then((data) => {
+        return { vibeAccessToken: data.accessToken, vibeRefreshToken: data.refreshToken };
+    });
+}
+async function requestRefreshedAccessToken(vibeRefreshToken, apiGateway) {
+    const url = `${apiGateway}/auth/jwt_refresh/`;
+    const response = await fetch(url, {
+        method: 'POST',
+        headers: {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ refreshToken: vibeRefreshToken }),
+    });
+    return await response.json().then((data) => {
+        return data.accessToken;
+    });
+}
+function getVersionFromPackageJson() {
+    // Get the path to the package.json file
+    const packageJsonPath = path_1.default.resolve(process.cwd(), 'package.json');
+    // Read the package.json file
+    const packageJsonContent = fs_1.default.readFileSync(packageJsonPath, 'utf8');
+    // Parse the package.json content
+    const packageJson = JSON.parse(packageJsonContent);
+    // Return the version value
+    return packageJson.version;
+}
+exports.getVersionFromPackageJson = getVersionFromPackageJson;
+async function returnAndStoreConfig(config) {
+    const configCopy = Object.assign({}, config);
+    await (0, config_1.storeConfig)(configCopy);
+    return configCopy;
+}
+function isNetworkConnectionError(e) {
+    const cause = e?.cause;
+    return cause?.code === 'ENOTFOUND' || cause?.code === 'ECONNREFUSED';
+}

package/dist/auth/login.spec.d.ts

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

package/dist/auth/login.spec.js

@@ -1,10 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const login_1 = require("./login");
-describe('getVersionFromPackageJson', () => {
-    it('should return the version value from package.json', () => {
-        const version = (0, login_1.getVersionFromPackageJson)();
-        expect(version).toBeDefined();
-        expect(typeof version).toBe('string');
-    });
-});
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const login_1 = require("./login");
+describe('getVersionFromPackageJson', () => {
+    it('should return the version value from package.json', () => {
+        const version = (0, login_1.getVersionFromPackageJson)();
+        expect(version).toBeDefined();
+        expect(typeof version).toBe('string');
+    });
+});

package/dist/baseFlags.d.ts

@@ -1,10 +1,10 @@
-export declare const LogLevelFlag: {
-    logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-};
-export declare const AlwaysConfirmEnvFlag: {
-    alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-};
-export declare const baseFlags: {
-    alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-    logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-};
+export declare const LogLevelFlag: {
+    logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+};
+export declare const AlwaysConfirmEnvFlag: {
+    alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+};
+export declare const baseFlags: {
+    alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+};

package/dist/baseFlags.js

@@ -1,25 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.baseFlags = exports.AlwaysConfirmEnvFlag = exports.LogLevelFlag = void 0;
-const core_1 = require("@oclif/core");
-exports.LogLevelFlag = {
-    logLevel: core_1.Flags.string({
-        description: 'The Log Level',
-        required: false,
-        char: 'l',
-        options: ['error', 'warn', 'info', 'debug'],
-    }),
-};
-exports.AlwaysConfirmEnvFlag = {
-    alwaysConfirmEnv: core_1.Flags.string({
-        description: 'The Environment variables',
-        required: false,
-        char: 'e',
-        default: 'true',
-        options: ['true', 'false'],
-    }),
-};
-exports.baseFlags = {
-    ...exports.LogLevelFlag,
-    ...exports.AlwaysConfirmEnvFlag,
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.baseFlags = exports.AlwaysConfirmEnvFlag = exports.LogLevelFlag = void 0;
+const core_1 = require("@oclif/core");
+exports.LogLevelFlag = {
+    logLevel: core_1.Flags.string({
+        description: 'The Log Level',
+        required: false,
+        char: 'l',
+        options: ['error', 'warn', 'info', 'debug'],
+    }),
+};
+exports.AlwaysConfirmEnvFlag = {
+    alwaysConfirmEnv: core_1.Flags.string({
+        description: 'The Environment variables',
+        required: false,
+        char: 'e',
+        default: 'true',
+        options: ['true', 'false'],
+    }),
+};
+exports.baseFlags = {
+    ...exports.LogLevelFlag,
+    ...exports.AlwaysConfirmEnvFlag,
+};

package/dist/basecommand.d.ts

@@ -1,15 +1,15 @@
-import { Command } from '@oclif/core';
-export declare abstract class BaseCommand extends Command {
-    static description: string;
-    skipValidateEnv: boolean;
-    skipConfirmEnv: boolean;
-    static baseFlags: {
-        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-    };
-    protected flags: any;
-    protected args: any;
-    init(): Promise<void>;
-    setLogLevel(logLevel: string, config?: any): void;
-    private confirmEnv;
-}
+import { Command } from '@oclif/core';
+export declare abstract class BaseCommand extends Command {
+    static description: string;
+    skipValidateEnv: boolean;
+    skipConfirmEnv: boolean;
+    static baseFlags: {
+        alwaysConfirmEnv: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        logLevel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+    };
+    protected flags: any;
+    protected args: any;
+    init(): Promise<void>;
+    setLogLevel(logLevel: string, config?: any): void;
+    private confirmEnv;
+}