@contentstack/cli-utilities 1.5.0 → 1.5.2

package/lib/auth-handler.d.ts

@@ -33,6 +33,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

@@ -6,6 +6,7 @@ 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"));
@@ -371,6 +372,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -32,8 +32,8 @@
   "author": "contentstack",
   "license": "MIT",
   "dependencies": {
-    "@contentstack/management": "^1.8.0",
-    "@oclif/core": "^2.8.2",
+    "@contentstack/management": "~1.10.0",
+    "@oclif/core": "^2.9.3",
     "axios": "1.3.4",
     "chalk": "^4.0.0",
     "cli-cursor": "^3.1.0",
@@ -78,4 +78,4 @@
     "tslib": "^1.13.0",
     "typescript": "^4.9.3"
   }
-}
+}