@contentstack/cli-utilities 1.5.1 → 1.5.3

package/lib/auth-handler.d.ts

@@ -22,8 +22,10 @@ declare class AuthHandler {
     private authorisationTypeOAUTHValue;
     private authorisationTypeAUTHValue;
     private allAuthConfigItems;
+    private logger;
     set host(contentStackHost: any);
     constructor();
+    initLog(): void;
     setOAuthBaseURL(): Promise<void>;
     oauth(): Promise<object>;
     createHTTPServer(): Promise<object>;
@@ -33,6 +35,13 @@ declare class AuthHandler {
     unsetConfigData(type?: string): Promise<void>;
     refreshToken(): Promise<object>;
     getUserDetails(data: any): Promise<object>;
+    oauthLogout(): Promise<object>;
+    /**
+     * Fetches all authorizations for the Oauth App, returns authorizationUid for current user.
+     * @returns authorizationUid for the current user
+     */
+    getOauthAppAuthorization(): Promise<string | undefined>;
+    revokeOauthAppAuthorization(authorizationId: any): Promise<object>;
     isAuthenticated(): boolean;
     getAuthorisationType(): Promise<any>;
     isAuthorisationTypeBasic(): Promise<boolean>;

package/lib/auth-handler.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const cli_ux_1 = tslib_1.__importDefault(require("./cli-ux"));
-const logger_1 = tslib_1.__importDefault(require("./logger"));
 const http_client_1 = tslib_1.__importDefault(require("./http-client"));
 const config_handler_1 = tslib_1.__importDefault(require("./config-handler"));
 const ContentstackManagementSDK = tslib_1.__importStar(require("@contentstack/management"));
+const message_handler_1 = tslib_1.__importDefault(require("./message-handler"));
 const http = require('http');
 const url = require('url');
 const open_1 = tslib_1.__importDefault(require("open"));
+const logger_1 = require("./logger");
 const crypto = require('crypto');
 /**
  * @class
@@ -55,6 +56,9 @@ class AuthHandler {
             ],
         };
     }
+    initLog() {
+        this.logger = new logger_1.LoggerService(process.cwd(), 'cli-log');
+    }
     async setOAuthBaseURL() {
         if (config_handler_1.default.get('region')['uiHost']) {
             this.OAuthBaseURL = config_handler_1.default.get('region')['uiHost'] || '';
@@ -70,6 +74,7 @@ class AuthHandler {
      */
     async oauth() {
         return new Promise((resolve, reject) => {
+            this.initLog();
             this.createHTTPServer()
                 .then(() => {
                 this.openOAuthURL()
@@ -78,12 +83,12 @@ class AuthHandler {
                     resolve({});
                 })
                     .catch((error) => {
-                    logger_1.default.error('OAuth login failed', error.message);
+                    this.logger.error('OAuth login failed', error.message);
                     reject(error);
                 });
             })
                 .catch((error) => {
-                logger_1.default.error('OAuth login failed', error.message);
+                this.logger.error('OAuth login failed', error.message);
                 reject(error);
             });
         });
@@ -371,6 +376,56 @@ class AuthHandler {
             }
         });
     }
+    async oauthLogout() {
+        const authorization = await this.getOauthAppAuthorization() || "";
+        const response = await this.revokeOauthAppAuthorization(authorization);
+        return response || {};
+    }
+    /**
+     * Fetches all authorizations for the Oauth App, returns authorizationUid for current user.
+     * @returns authorizationUid for the current user
+     */
+    async getOauthAppAuthorization() {
+        const headers = {
+            authorization: `Bearer ${config_handler_1.default.get(this.oauthAccessTokenKeyName)}`,
+            organization_uid: config_handler_1.default.get(this.oauthOrgUidKeyName),
+            'Content-type': 'application/json'
+        };
+        const httpClient = new http_client_1.default().headers(headers);
+        await this.setOAuthBaseURL();
+        return httpClient
+            .get(`${this.OAuthBaseURL}/apps-api/manifests/${this.OAuthAppId}/authorizations`)
+            .then(({ data }) => {
+            var _a, _b;
+            if (((_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+                const userUid = config_handler_1.default.get(this.oauthUserUidKeyName);
+                const currentUserAuthorization = ((_b = data === null || data === void 0 ? void 0 : data.data) === null || _b === void 0 ? void 0 : _b.filter(element => element.user.uid === userUid)) || [];
+                if (currentUserAuthorization.length === 0) {
+                    throw new Error(message_handler_1.default.parse("CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS_USER"));
+                }
+                return currentUserAuthorization[0].authorization_uid; // filter authorizations by current logged in user
+            }
+            else {
+                throw new Error(message_handler_1.default.parse("CLI_AUTH_LOGOUT_NO_AUTHORIZATIONS"));
+            }
+        });
+    }
+    async revokeOauthAppAuthorization(authorizationId) {
+        if (authorizationId.length > 1) {
+            const headers = {
+                authorization: `Bearer ${config_handler_1.default.get(this.oauthAccessTokenKeyName)}`,
+                organization_uid: config_handler_1.default.get(this.oauthOrgUidKeyName),
+                'Content-type': 'application/json'
+            };
+            const httpClient = new http_client_1.default().headers(headers);
+            await this.setOAuthBaseURL();
+            return httpClient
+                .delete(`${this.OAuthBaseURL}/apps-api/manifests/${this.OAuthAppId}/authorizations/${authorizationId}`)
+                .then(({ data }) => {
+                return data;
+            });
+        }
+    }
     isAuthenticated() {
         const authorizationType = config_handler_1.default.get(this.authorisationTypeKeyName);
         return (authorizationType === this.authorisationTypeOAUTHValue || authorizationType === this.authorisationTypeAUTHValue);

package/lib/config-handler.d.ts

@@ -13,7 +13,7 @@ declare class Config {
     private getEncryptedConfig;
     private getDecryptedConfig;
     get(key: any): string | any;
-    set(key: any, value: any): Promise<Conf<Record<string, unknown>>>;
+    set(key: any, value: any): Conf<Record<string, unknown>>;
     delete(key: any): Conf<Record<string, unknown>>;
     clear(): void;
 }

package/lib/config-handler.js

@@ -19,6 +19,7 @@ const uniqueString = require('unique-string');
 const oldConfigDirectory = xdgBasedir.config || path.join(os.tmpdir(), uniqueString());
 const pathPrefix = path.join('configstore', `${CONFIG_NAME}.json`);
 const oldConfigPath = path.join(oldConfigDirectory, pathPrefix);
+const cwd = process.env.CS_CLI_CONFIG_PATH;
 class Config {
     constructor() {
         this.init();
@@ -73,7 +74,7 @@ class Config {
     }
     getObfuscationKey() {
         const obfuscationKeyName = 'obfuscation_key';
-        const encConfig = new conf_1.default({ configName: ENC_CONFIG_NAME });
+        const encConfig = new conf_1.default({ configName: ENC_CONFIG_NAME, cwd });
         let obfuscationKey = encConfig === null || encConfig === void 0 ? void 0 : encConfig.get(obfuscationKeyName);
         if (!obfuscationKey) {
             encConfig.set(obfuscationKeyName, (0, uuid_1.v4)());
@@ -97,7 +98,7 @@ class Config {
             try {
                 // NOTE reading current code base encrypted file if exist
                 const encryptionKey = this.getObfuscationKey();
-                this.config = new conf_1.default({ configName: CONFIG_NAME, encryptionKey });
+                this.config = new conf_1.default({ configName: CONFIG_NAME, encryptionKey, cwd });
                 if ((_a = Object.keys(configData || {})) === null || _a === void 0 ? void 0 : _a.length) {
                     this.config.set(configData); // NOTE set config data if passed any
                 }
@@ -110,7 +111,7 @@ class Config {
                     this.getEncryptedConfig(oldConfigData, true);
                 }
                 catch (_error) {
-                    _1.cliux.print(chalk_1.default.red("Error: Config file is corrupted"));
+                    _1.cliux.print(chalk_1.default.red('Error: Config file is corrupted'));
                     _1.cliux.print(_error);
                     process.exit(1);
                 }
@@ -136,7 +137,7 @@ class Config {
     getDecryptedConfig(configData) {
         var _a;
         try {
-            this.config = new conf_1.default({ configName: CONFIG_NAME });
+            this.config = new conf_1.default({ configName: CONFIG_NAME, cwd });
             if ((_a = Object.keys(configData || {})) === null || _a === void 0 ? void 0 : _a.length) {
                 this.config.set(configData); // NOTE set config data if passed any
             }
@@ -145,7 +146,7 @@ class Config {
             // console.trace(error.message)
             try {
                 const encryptionKey = this.getObfuscationKey();
-                let config = new conf_1.default({ configName: CONFIG_NAME, encryptionKey });
+                let config = new conf_1.default({ configName: CONFIG_NAME, encryptionKey, cwd });
                 const oldConfigData = this.getConfigDataAndUnlinkConfigFile(config);
                 this.getDecryptedConfig(oldConfigData); // NOTE NOTE reinitialize the config with old data and new decrypted file
             }
@@ -158,7 +159,7 @@ class Config {
                 }
                 catch (__error) {
                     // console.trace(error.message)
-                    _1.cliux.print(chalk_1.default.red("Error: Config file is corrupted"));
+                    _1.cliux.print(chalk_1.default.red('Error: Config file is corrupted'));
                     _1.cliux.print(_error);
                     process.exit(1);
                 }
@@ -170,7 +171,7 @@ class Config {
         var _a;
         return (_a = this.config) === null || _a === void 0 ? void 0 : _a.get(key);
     }
-    async set(key, value) {
+    set(key, value) {
         var _a;
         (_a = this.config) === null || _a === void 0 ? void 0 : _a.set(key, value);
         return this.config;

package/lib/fs-utility/core.js

@@ -216,8 +216,8 @@ class FsUtility {
             if (this.fileExt === 'json') {
                 this.writableStream.write('}');
             }
-            this.closeFile(closeIndexer);
         }
+        this.closeFile(closeIndexer);
     }
     /**
      * @method closeFile

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export { default as logger } from './logger';
+export { LoggerService } from './logger';
 export { default as cliux } from './cli-ux';
 export { default as CLIError } from './cli-error';
 export { default as messageHandler } from './message-handler';

package/lib/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TablePrompt = exports.stdout = exports.stderr = exports.execute = exports.ux = exports.flush = exports.settings = exports.toConfiguredId = exports.toStandardizedId = exports.tsPath = exports.toCached = exports.run = exports.Plugin = exports.Parser = exports.Interfaces = exports.HelpBase = exports.Help = exports.loadHelpClass = exports.Flags = exports.Errors = exports.Config = exports.CommandHelp = exports.Args = exports.Command = exports.flags = exports.args = exports.NodeCrypto = exports.printFlagDeprecation = exports.managementSDKInitiator = exports.managementSDKClient = exports.configHandler = exports.authHandler = exports.messageHandler = exports.CLIError = exports.cliux = exports.logger = void 0;
+exports.TablePrompt = exports.stdout = exports.stderr = exports.execute = exports.ux = exports.flush = exports.settings = exports.toConfiguredId = exports.toStandardizedId = exports.tsPath = exports.toCached = exports.run = exports.Plugin = exports.Parser = exports.Interfaces = exports.HelpBase = exports.Help = exports.loadHelpClass = exports.Flags = exports.Errors = exports.Config = exports.CommandHelp = exports.Args = exports.Command = exports.flags = exports.args = exports.NodeCrypto = exports.printFlagDeprecation = exports.managementSDKInitiator = exports.managementSDKClient = exports.configHandler = exports.authHandler = exports.messageHandler = exports.CLIError = exports.cliux = exports.LoggerService = void 0;
 const tslib_1 = require("tslib");
 var logger_1 = require("./logger");
-Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return tslib_1.__importDefault(logger_1).default; } });
+Object.defineProperty(exports, "LoggerService", { enumerable: true, get: function () { return logger_1.LoggerService; } });
 var cli_ux_1 = require("./cli-ux");
 Object.defineProperty(exports, "cliux", { enumerable: true, get: function () { return tslib_1.__importDefault(cli_ux_1).default; } });
 var cli_error_1 = require("./cli-error");

package/lib/logger.d.ts

@@ -1,10 +1,10 @@
 import winston from 'winston';
-declare class LoggerService {
+export declare class LoggerService {
     name: string;
     data: object | null;
     logger: winston.Logger;
     static dateFormat(): string;
-    constructor(name: string);
+    constructor(pathToLog: string, name: string);
     init(context: any): void;
     set loggerName(name: string);
     setLogData(data: object): void;
@@ -13,5 +13,3 @@ declare class LoggerService {
     error(message: string, param?: any): Promise<any>;
     warn(message: string, param?: any): Promise<any>;
 }
-declare const _default: LoggerService;
-export default _default;

package/lib/logger.js

@@ -1,20 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoggerService = void 0;
 const tslib_1 = require("tslib");
 const winston_1 = tslib_1.__importDefault(require("winston"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const message_handler_1 = tslib_1.__importDefault(require("./message-handler"));
 class LoggerService {
     static dateFormat() {
         return new Date(Date.now()).toUTCString();
     }
-    constructor(name) {
+    constructor(pathToLog, name) {
         this.data = null;
         this.name = null;
         const logger = winston_1.default.createLogger({
             transports: [
                 // new winston.transports.Console(),
                 new winston_1.default.transports.File({
-                    filename: `./logs/${name}.log`,
+                    filename: path_1.default.resolve(process.env.CS_CLI_LOG_PATH || `${pathToLog}/logs`, `${name}.log`),
                 }),
             ],
             format: winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.printf((info) => {
@@ -27,14 +29,14 @@ class LoggerService {
                 }
                 // parse message
                 info.message = message_handler_1.default.parse(info.message);
-                let message = `${LoggerService.dateFormat()}:${name}:${info.level}:${info.message}`;
+                let message = `${LoggerService.dateFormat()} : ${name}: ${info.level} : ${info.message}`;
                 message = info.obj ? message + `:${stringifiedParam}` : message;
                 message = this.data ? message + `:${JSON.stringify(this.data)}` : message;
                 return message;
             })),
-            // level: (config.get('logger.level') as string) || 'error',
-            level: 'error',
-            silent: true
+            // // level: (config.get('logger.level') as string) || 'error',
+            // level: 'error',
+            // silent: true
             // silent: config.get('logger.enabled') && process.env.CLI_ENV !== 'TEST' ? false : false,
         });
         this.logger = logger;
@@ -89,4 +91,4 @@ class LoggerService {
         }
     }
 }
-exports.default = new LoggerService('cli');
+exports.LoggerService = LoggerService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -32,7 +32,7 @@
   "author": "contentstack",
   "license": "MIT",
   "dependencies": {
-    "@contentstack/management": "~1.10.0",
+    "@contentstack/management": "~1.10.2",
     "@oclif/core": "^2.9.3",
     "axios": "1.3.4",
     "chalk": "^4.0.0",