@contentstack/cli-utilities 1.9.0 → 1.11.0

package/lib/auth-handler.d.ts

@@ -3,9 +3,7 @@
  * Auth handler
  */
 declare class AuthHandler {
-    private developerHubUrl;
     private _host;
-    private codeVerifier;
     private OAuthBaseURL;
     private OAuthAppId;
     private OAuthClientId;
@@ -24,32 +22,32 @@ declare class AuthHandler {
     private authorisationTypeAUTHValue;
     private allAuthConfigItems;
     private logger;
+    private oauthHandler;
+    private managementAPIClient;
+    private isRefreshingToken;
     set host(contentStackHost: any);
     constructor();
     initLog(): void;
     setOAuthBaseURL(): Promise<void>;
-    setDeveloperHubURL(): void;
-    oauth(): Promise<object>;
-    createHTTPServer(): Promise<object>;
-    openOAuthURL(): Promise<object>;
-    getAccessToken(code: string): Promise<object>;
+    initSDK(): Promise<void>;
+    oauth(): Promise<void>;
+    createHTTPServer(): Promise<void>;
+    openOAuthURL(): Promise<void>;
+    getAccessToken(code: string): Promise<void>;
     setConfigData(type: string, userData?: any): Promise<object>;
-    unsetConfigData(type?: string): Promise<void>;
+    setOAuthConfigData(userData: any, type: string): void;
+    setBasicAuthConfigData(userData: any): void;
+    unsetConfigData(type?: string): 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>;
     isAuthorisationTypeOAuth(): Promise<boolean>;
     checkExpiryAndRefresh: (force?: boolean) => Promise<void | object>;
     compareOAuthExpiry(force?: boolean): Promise<void | object>;
+    restoreOAuthConfig(): void;
 }
 declare const _default: AuthHandler;
 export default _default;

package/lib/auth-handler.js

@@ -2,16 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const cli_ux_1 = tslib_1.__importDefault(require("./cli-ux"));
-const http_client_1 = tslib_1.__importDefault(require("./http-client"));
 const config_handler_1 = tslib_1.__importDefault(require("./config-handler"));
 const dotenv_1 = tslib_1.__importDefault(require("dotenv"));
-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 http_1 = tslib_1.__importDefault(require("http"));
+const url_1 = tslib_1.__importDefault(require("url"));
 const logger_1 = require("./logger");
-const crypto = require('crypto');
+const contentstack_management_sdk_1 = tslib_1.__importDefault(require("./contentstack-management-sdk"));
+const helpers_1 = require("./helpers");
 dotenv_1.default.config();
 /**
  * @class
@@ -22,12 +20,12 @@ class AuthHandler {
         this._host = contentStackHost;
     }
     constructor() {
+        this.isRefreshingToken = false; // Flag to track if a refresh operation is in progress
         this.checkExpiryAndRefresh = (force = false) => this.compareOAuthExpiry(force);
-        this.codeVerifier = crypto.randomBytes(32).toString('hex');
         this.OAuthAppId = process.env.OAUTH_APP_ID || '6400aa06db64de001a31c8a9';
         this.OAuthClientId = process.env.OAUTH_CLIENT_ID || 'Ie0FEfTzlfAHL4xM';
         this.OAuthRedirectURL = process.env.OAUTH_APP_REDIRECT_URL || 'http://localhost:8184';
-        this.OAuthScope = '';
+        this.OAuthScope = [];
         this.OAuthResponseType = 'code';
         this.authTokenKeyName = 'authtoken';
         this.authEmailKeyName = 'email';
@@ -69,16 +67,16 @@ class AuthHandler {
             throw new Error('Invalid ui-host URL while authenticating. Please set your region correctly using the command - csdx config:set:region');
         }
     }
-    setDeveloperHubURL() {
-        if (this.developerHubUrl) {
-            return; // Return if already set
-        }
-        if (config_handler_1.default.get('region')['developerHubUrl']) {
-            this.developerHubUrl = config_handler_1.default.get('region')['developerHubUrl'] || '';
-        }
-        else {
-            throw new Error('Invalid developerHubUrl URL while authenticating. Please set your region correctly using the command - csdx config:set:region');
-        }
+    async initSDK() {
+        this.managementAPIClient = await (0, contentstack_management_sdk_1.default)({ host: this._host });
+        this.oauthHandler = this.managementAPIClient.oauth({
+            appId: this.OAuthAppId,
+            clientId: this.OAuthClientId,
+            redirectUri: this.OAuthRedirectURL,
+            scope: this.OAuthScope,
+            responseType: this.OAuthResponseType,
+        });
+        this.restoreOAuthConfig();
     }
     /*
      *
@@ -86,355 +84,216 @@ class AuthHandler {
      * @returns {Promise} Promise object returns {} on success
      */
     async oauth() {
-        return new Promise((resolve, reject) => {
+        try {
             this.initLog();
-            this.createHTTPServer()
-                .then(() => {
-                this.openOAuthURL()
-                    .then(() => {
-                    //set timeout for authorization
-                    resolve({});
-                })
-                    .catch((error) => {
-                    this.logger.error('OAuth login failed', error.message);
-                    reject(error);
-                });
-            })
-                .catch((error) => {
-                this.logger.error('OAuth login failed', error.message);
-                reject(error);
-            });
-        });
+            await this.initSDK();
+            await this.createHTTPServer();
+            await this.openOAuthURL();
+        }
+        catch (error) {
+            this.logger.error('OAuth login failed', error.message);
+            throw error;
+        }
     }
     async createHTTPServer() {
-        return new Promise((resolve, reject) => {
-            try {
-                const server = http.createServer((req, res) => {
-                    const reqURL = req.url;
-                    const queryObject = url.parse(reqURL, true).query;
-                    if (queryObject.code) {
-                        cli_ux_1.default.print('Auth code successfully fetched.');
-                        this.getAccessToken(queryObject.code)
-                            .then(async () => {
-                            await this.setOAuthBaseURL();
-                            cli_ux_1.default.print('Access token fetched using auth code successfully.');
-                            cli_ux_1.default.print(`You can review the access permissions on the page - ${this.OAuthBaseURL}/#!/marketplace/authorized-apps`);
-                            res.writeHead(200, { 'Content-Type': 'text/html' });
-                            res.end(`<style>
-                body {
-                  font-family: Arial, sans-serif;
-                  text-align: center;
-                  margin-top: 100px;
+        try {
+            const server = http_1.default.createServer(async (req, res) => {
+                const queryObject = url_1.default.parse(req.url, true).query;
+                if (!queryObject.code) {
+                    cli_ux_1.default.error('Error occoured while login with OAuth, please login with command - csdx auth:login --oauth');
+                    return sendErrorResponse(res);
                 }
-              
-                p {
-                  color: #475161;
-                  margin-bottom: 20px;
+                cli_ux_1.default.print('Auth code successfully fetched.');
+                try {
+                    await this.getAccessToken(queryObject.code);
+                    await this.setOAuthBaseURL();
+                    cli_ux_1.default.print('Access token fetched using auth code successfully.');
+                    cli_ux_1.default.print(`You can review the access permissions on the page - ${this.OAuthBaseURL}/#!/marketplace/authorized-apps`);
+                    sendSuccessResponse(res);
+                    stopServer();
                 }
-                p button {
-                  background-color: #6c5ce7;
-                  color: #fff;
-                  border: 1px solid transparent;
-                  border-radius: 4px;
-                  font-weight: 600;
-                  line-height: 100%;
-                  text-align: center;
-                  min-height: 2rem;
-                  padding: 0.3125rem 1rem;
+                catch (error) {
+                    cli_ux_1.default.error('Error occoured while login with OAuth, please login with command - csdx auth:login --oauth');
+                    cli_ux_1.default.error(error);
+                    sendErrorResponse(res);
+                    stopServer();
                 }
-              </style>
-              <h1 style="color: #6c5ce7">Successfully authorized!</h1>
-              <p style="color: #475161; font-size: 16px; font-weight: 600">You can close this window now.</p>
-              <p>
-                You can review the access permissions on the
-                <a
-                  style="color: #6c5ce7; text-decoration: none"
-                  href="${this.OAuthBaseURL}/#!/marketplace/authorized-apps"
-                  target="_blank"
-                  >Authorized Apps page</a
-                >.
-              </p>`);
-                            stopServer();
-                        })
-                            .catch((error) => {
-                            cli_ux_1.default.error('Error occoured while login with OAuth, please login with command - csdx auth:login --oauth');
-                            cli_ux_1.default.error(error);
-                            res.writeHead(200, { 'Content-Type': 'text/html' });
-                            res.end(`<h1>Sorry!</h1><h2>Something went wrong, please login with command - csdx auth:login --oauth(</h2>`);
-                            stopServer();
-                        });
-                    }
-                    else {
-                        cli_ux_1.default.error('Error occoured while login with OAuth, please login with command - csdx auth:login --oauth');
-                        res.writeHead(200, { 'Content-Type': 'text/html' });
-                        res.end(`<h1>Sorry!</h1><h2>Something went wrong, please login with command - csdx auth:login --oauth(</h2>`);
-                        stopServer();
-                    }
-                });
-                const stopServer = () => {
-                    server.close();
-                    process.exit();
-                };
-                server.listen(8184, () => {
-                    cli_ux_1.default.print('Waiting for the authorization server to respond...');
-                    resolve({ true: true });
-                });
-            }
-            catch (error) {
-                cli_ux_1.default.error(error);
-                reject(error);
-            }
-        });
+            });
+            const sendSuccessResponse = (res) => {
+                const successHtml = `
+          <style>
+            body { font-family: Arial, sans-serif; text-align: center; margin-top: 100px; }
+            p { color: #475161; margin-bottom: 20px; }
+            p button { background-color: #6c5ce7; color: #fff; border: 1px solid transparent; border-radius: 4px; font-weight: 600; line-height: 100%; text-align: center; min-height: 2rem; padding: 0.3125rem 1rem; }
+          </style>
+          <h1 style="color: #6c5ce7">Successfully authorized!</h1>
+          <p style="color: #475161; font-size: 16px; font-weight: 600">You can close this window now.</p>
+          <p>
+            You can review the access permissions on the
+            <a style="color: #6c5ce7; text-decoration: none" href="${this.OAuthBaseURL}/#!/marketplace/authorized-apps" target="_blank">Authorized Apps page</a>.
+          </p>`;
+                res.writeHead(200, { 'Content-Type': 'text/html' });
+                res.end(successHtml);
+            };
+            const sendErrorResponse = (res) => {
+                const errorHtml = `
+          <h1>Sorry!</h1><h2>Something went wrong, please login with command.</h2>`;
+                res.writeHead(200, { 'Content-Type': 'text/html' });
+                res.end(errorHtml);
+            };
+            const stopServer = () => {
+                server.close();
+                process.exit();
+            };
+            server.listen(8184, () => {
+                cli_ux_1.default.print('Waiting for the authorization server to respond...');
+                return { true: true };
+            });
+            // Listen for errors
+            server.on('error', (err) => {
+                cli_ux_1.default.error('Server encountered an error:', (0, helpers_1.formatError)(err));
+            });
+        }
+        catch (error) {
+            cli_ux_1.default.error(error);
+            throw error;
+        }
     }
     async openOAuthURL() {
-        return new Promise(async (resolve, reject) => {
-            try {
-                const digest = crypto.createHash('sha256').update(this.codeVerifier).digest();
-                const codeChallenge = digest.toString('base64').replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
-                await this.setOAuthBaseURL();
-                let url = `${this.OAuthBaseURL}/#!/apps/${this.OAuthAppId}/authorize?response_type=${this.OAuthResponseType}&client_id=${this.OAuthClientId}&redirect_uri=${this.OAuthRedirectURL}&code_challenge=${codeChallenge}&code_challenge_method=S256`;
-                if (this.OAuthScope) {
-                    url += `&scope=${encodeURIComponent(this.OAuthScope)}`;
-                }
-                cli_ux_1.default.print('This will automatically start the browser and open the below URL, if it does not, you can copy and paste the below URL in the browser without terminating this command.', { color: 'yellow' });
-                cli_ux_1.default.print(url, { color: 'green' });
-                resolve((0, open_1.default)(url));
-            }
-            catch (error) {
-                reject(error);
-            }
-        });
+        try {
+            const url = await this.oauthHandler.authorize();
+            cli_ux_1.default.print('This will automatically start the browser and open the below URL, if it does not, you can copy and paste the below URL in the browser without terminating this command.', { color: 'yellow' });
+            cli_ux_1.default.print(url, { color: 'green' });
+            await (0, open_1.default)(url);
+        }
+        catch (error) {
+            throw error;
+        }
     }
     async getAccessToken(code) {
-        return new Promise((resolve, reject) => {
-            const headers = { 'Content-Type': 'application/x-www-form-urlencoded' };
-            const payload = {
-                grant_type: 'authorization_code',
-                client_id: this.OAuthClientId,
-                code_verifier: this.codeVerifier,
-                redirect_uri: this.OAuthRedirectURL,
-                code: code,
-            };
-            this.setDeveloperHubURL();
-            const httpClient = new http_client_1.default().headers(headers).asFormParams();
-            httpClient
-                .post(`${this.developerHubUrl}/apps/token`, payload)
-                .then(({ data }) => {
-                return this.getUserDetails(data);
-            })
-                .then((data) => {
-                if (data['access_token'] && data['refresh_token']) {
-                    return this.setConfigData('oauth', data);
-                }
-                else {
-                    reject('Invalid request');
-                }
-            })
-                .then(resolve)
-                .catch((error) => {
-                cli_ux_1.default.error('An error occoured while fetching the access token, run the command - csdx auth:login --oauth');
-                cli_ux_1.default.error(error);
-                reject(error);
-            });
-        });
+        try {
+            const data = await this.oauthHandler.exchangeCodeForToken(code);
+            const userData = await this.getUserDetails(data);
+            if (userData['access_token'] && userData['refresh_token']) {
+                await this.setConfigData('oauth', userData);
+            }
+            else {
+                throw new Error('Invalid request');
+            }
+        }
+        catch (error) {
+            cli_ux_1.default.error('An error occurred while fetching the access token, run the command - csdx auth:login --oauth');
+            cli_ux_1.default.error(error);
+            throw error;
+        }
     }
     async setConfigData(type, userData = {}) {
-        return new Promise(async (resolve, reject) => {
-            //Delete the old configstore auth data
-            this.unsetConfigData(type)
-                .then(() => {
-                switch (type) {
-                    case 'oauth':
-                        if (userData.access_token && userData.refresh_token) {
-                            //Set the new OAuth tokens info
-                            config_handler_1.default.set(this.oauthAccessTokenKeyName, userData.access_token);
-                            config_handler_1.default.set(this.oauthRefreshTokenKeyName, userData.refresh_token);
-                            config_handler_1.default.set(this.authEmailKeyName, userData.email);
-                            config_handler_1.default.set(this.oauthDateTimeKeyName, new Date());
-                            config_handler_1.default.set(this.oauthUserUidKeyName, userData.user_uid);
-                            config_handler_1.default.set(this.oauthOrgUidKeyName, userData.organization_uid);
-                            config_handler_1.default.set(this.authorisationTypeKeyName, this.authorisationTypeOAUTHValue);
-                            resolve(userData);
-                        }
-                        else {
-                            reject('Invalid request');
-                        }
-                        break;
-                    case 'refreshToken':
-                        if (userData.access_token && userData.refresh_token) {
-                            //Set the new OAuth tokens info
-                            config_handler_1.default.set(this.oauthAccessTokenKeyName, userData.access_token);
-                            config_handler_1.default.set(this.oauthRefreshTokenKeyName, userData.refresh_token);
-                            config_handler_1.default.set(this.oauthDateTimeKeyName, new Date());
-                            resolve(userData);
-                        }
-                        else {
-                            reject('Invalid request');
-                        }
-                        break;
-                    case 'basicAuth':
-                        if (userData.authtoken && userData.email) {
-                            //Set the new auth tokens info
-                            config_handler_1.default.set(this.authTokenKeyName, userData.authtoken);
-                            config_handler_1.default.set(this.authEmailKeyName, userData.email);
-                            config_handler_1.default.set(this.authorisationTypeKeyName, this.authorisationTypeAUTHValue);
-                            resolve(userData);
-                        }
-                        else {
-                            reject('Invalid request');
-                        }
-                        break;
-                    case 'logout':
-                        resolve(userData);
-                        break;
-                    default:
-                        reject('Invalid request');
-                        break;
-                }
-            })
-                .catch((error) => {
-                reject(error);
-            });
-        });
-    }
-    async unsetConfigData(type = 'default') {
-        return new Promise(async (resolve, reject) => {
-            //Delete the old auth tokens info
-            let removeItems = this.allAuthConfigItems.default;
-            if (type === 'refreshToken') {
-                removeItems = this.allAuthConfigItems.refreshToken;
+        try {
+            this.unsetConfigData(type);
+            switch (type) {
+                case 'oauth':
+                case 'refreshToken':
+                    if (userData.access_token && userData.refresh_token) {
+                        this.setOAuthConfigData(userData, type);
+                        return userData;
+                    }
+                    else {
+                        throw new Error('Invalid request');
+                    }
+                case 'basicAuth':
+                    if (userData.authtoken && userData.email) {
+                        this.setBasicAuthConfigData(userData);
+                        return userData;
+                    }
+                    else {
+                        throw new Error('Invalid request');
+                    }
+                case 'logout':
+                    return userData;
+                default:
+                    throw new Error('Invalid request');
             }
-            removeItems.forEach((element) => {
-                config_handler_1.default.delete(element);
-            });
-            resolve();
-        });
+        }
+        catch (error) {
+            throw error;
+        }
+    }
+    setOAuthConfigData(userData, type) {
+        config_handler_1.default.set(this.oauthAccessTokenKeyName, userData.access_token);
+        config_handler_1.default.set(this.oauthRefreshTokenKeyName, userData.refresh_token);
+        config_handler_1.default.set(this.oauthDateTimeKeyName, new Date());
+        if (type === 'oauth') {
+            config_handler_1.default.set(this.authEmailKeyName, userData.email);
+            config_handler_1.default.set(this.oauthUserUidKeyName, userData.user_uid);
+            config_handler_1.default.set(this.oauthOrgUidKeyName, userData.organization_uid);
+            config_handler_1.default.set(this.authorisationTypeKeyName, this.authorisationTypeOAUTHValue);
+        }
+    }
+    setBasicAuthConfigData(userData) {
+        config_handler_1.default.set(this.authTokenKeyName, userData.authtoken);
+        config_handler_1.default.set(this.authEmailKeyName, userData.email);
+        config_handler_1.default.set(this.authorisationTypeKeyName, this.authorisationTypeAUTHValue);
+    }
+    unsetConfigData(type = 'default') {
+        const removeItems = type === 'refreshToken' ? this.allAuthConfigItems.refreshToken : this.allAuthConfigItems.default;
+        removeItems.forEach((element) => config_handler_1.default.delete(element));
     }
     async refreshToken() {
-        return new Promise((resolve, reject) => {
+        try {
+            if (!this.oauthHandler) {
+                await this.initSDK(); // Initialize oauthHandler if not already initialized
+            }
             const configOauthRefreshToken = config_handler_1.default.get(this.oauthRefreshTokenKeyName);
             const configAuthorisationType = config_handler_1.default.get(this.authorisationTypeKeyName);
-            if (configAuthorisationType === this.authorisationTypeOAUTHValue && configOauthRefreshToken) {
-                const headers = { 'Content-Type': 'application/x-www-form-urlencoded' };
-                const payload = {
-                    grant_type: 'refresh_token',
-                    client_id: this.OAuthClientId,
-                    redirect_uri: this.OAuthRedirectURL,
-                    refresh_token: configOauthRefreshToken,
-                };
-                this.setDeveloperHubURL();
-                const httpClient = new http_client_1.default().headers(headers).asFormParams();
-                httpClient
-                    .post(`${this.developerHubUrl}/apps/token`, payload)
-                    .then(({ data }) => {
-                    if (data.error || (data.statusCode != 200 && data.message)) {
-                        let errorMessage = '';
-                        if (data.message) {
-                            if (data.message[0]) {
-                                errorMessage = data.message[0];
-                            }
-                            else {
-                                errorMessage = data.message;
-                            }
-                        }
-                        else {
-                            errorMessage = data.error;
-                        }
-                        reject(errorMessage);
-                    }
-                    else {
-                        if (data['access_token'] && data['refresh_token']) {
-                            return this.setConfigData('refreshToken', data);
-                        }
-                        else {
-                            reject('Invalid request');
-                        }
-                    }
-                })
-                    .then(resolve)
-                    .catch((error) => {
-                    cli_ux_1.default.error('An error occoured while refreshing the token');
-                    cli_ux_1.default.error(error);
-                    reject(error);
-                });
+            if (configAuthorisationType !== this.authorisationTypeOAUTHValue || !configOauthRefreshToken) {
+                cli_ux_1.default.error('Invalid refresh token, run the command- csdx auth:login --oauth');
+                throw new Error('Invalid refresh token');
+            }
+            const data = await this.oauthHandler.refreshAccessToken(configOauthRefreshToken);
+            if (data['access_token'] && data['refresh_token']) {
+                await this.setConfigData('refreshToken', data);
+                return data; // Returning the data from the refresh token operation
             }
             else {
-                cli_ux_1.default.error('Invalid/Empty refresh token, run the command- csdx auth:login --oauth');
-                reject('Invalid/Empty refresh token');
+                throw new Error('Invalid request');
             }
-        });
+        }
+        catch (error) {
+            cli_ux_1.default.error('An error occurred while refreshing the token');
+            cli_ux_1.default.error(error);
+            throw error; // Throwing the error to be handled by the caller
+        }
     }
     async getUserDetails(data) {
-        return new Promise((resolve, reject) => {
-            const accessToken = data.access_token;
-            if (accessToken) {
-                const param = {
-                    host: this._host,
-                    authorization: `Bearer ${accessToken}`,
-                };
-                const managementAPIClient = ContentstackManagementSDK.client(param);
-                managementAPIClient
-                    .getUser()
-                    .then((user) => {
-                    data.email = (user === null || user === void 0 ? void 0 : user.email) || '';
-                    resolve(data);
-                })
-                    .catch((error) => {
-                    reject(error);
-                });
+        if (data.access_token) {
+            try {
+                const user = await this.managementAPIClient.getUser();
+                data.email = (user === null || user === void 0 ? void 0 : user.email) || '';
+                return data;
             }
-            else {
-                cli_ux_1.default.error('Invalid/Empty access token, run the command - csdx auth:login --oauth');
-                reject('Invalid/Empty access token');
+            catch (error) {
+                cli_ux_1.default.error('Error fetching user details.');
+                cli_ux_1.default.error(error);
+                throw error;
             }
-        });
+        }
+        else {
+            cli_ux_1.default.error('Invalid/Empty access token.');
+            throw new Error('Invalid/Empty access token');
+        }
     }
     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);
-        this.setDeveloperHubURL();
-        return httpClient.get(`${this.developerHubUrl}/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'));
+        try {
+            if (!this.oauthHandler) {
+                await this.initSDK();
             }
-        });
-    }
-    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);
-            this.setDeveloperHubURL();
-            return httpClient
-                .delete(`${this.developerHubUrl}/manifests/${this.OAuthAppId}/authorizations/${authorizationId}`)
-                .then(({ data }) => {
-                return data;
-            });
+            const response = await this.oauthHandler.logout();
+            return response || {};
+        }
+        catch (error) {
+            cli_ux_1.default.error('An error occurred while logging out');
+            cli_ux_1.default.error(error);
+            throw error;
         }
     }
     isAuthenticated() {
@@ -451,6 +310,11 @@ class AuthHandler {
         return config_handler_1.default.get(this.authorisationTypeKeyName) === this.authorisationTypeOAUTHValue ? true : false;
     }
     async compareOAuthExpiry(force = false) {
+        // Avoid recursive refresh operations
+        if (this.isRefreshingToken) {
+            cli_ux_1.default.print('Refresh operation already in progress');
+            return Promise.resolve();
+        }
         const oauthDateTime = config_handler_1.default.get(this.oauthDateTimeKeyName);
         const authorisationType = config_handler_1.default.get(this.authorisationTypeKeyName);
         if (oauthDateTime && authorisationType === this.authorisationTypeOAUTHValue) {
@@ -468,13 +332,44 @@ class AuthHandler {
                 }
                 else {
                     cli_ux_1.default.print('Token expired, refreshing the token');
-                    return this.refreshToken();
+                    // Set the flag before refreshing the token
+                    this.isRefreshingToken = true;
+                    try {
+                        await this.refreshToken();
+                    }
+                    catch (error) {
+                        cli_ux_1.default.error('Error refreshing token');
+                        throw error;
+                    }
+                    finally {
+                        // Reset the flag after refresh operation is completed
+                        this.isRefreshingToken = false;
+                    }
+                    return Promise.resolve();
                 }
             }
         }
         else {
             cli_ux_1.default.print('No OAuth set');
-            return this.unsetConfigData();
+            this.unsetConfigData();
+        }
+    }
+    restoreOAuthConfig() {
+        const oauthAccessToken = config_handler_1.default.get(this.oauthAccessTokenKeyName);
+        const oauthRefreshToken = config_handler_1.default.get(this.oauthRefreshTokenKeyName);
+        const oauthDateTime = config_handler_1.default.get(this.oauthDateTimeKeyName);
+        const oauthUserUid = config_handler_1.default.get(this.oauthUserUidKeyName);
+        const oauthOrgUid = config_handler_1.default.get(this.oauthOrgUidKeyName);
+        if (oauthAccessToken && !this.oauthHandler.getAccessToken())
+            this.oauthHandler.setAccessToken(oauthAccessToken);
+        if (oauthRefreshToken && !this.oauthHandler.getRefreshToken())
+            this.oauthHandler.setRefreshToken(oauthRefreshToken);
+        if (oauthUserUid && !this.oauthHandler.getUserUID())
+            this.oauthHandler.setUserUID(oauthUserUid);
+        if (oauthOrgUid && !this.oauthHandler.getOrganizationUID())
+            this.oauthHandler.setOrganizationUID(oauthOrgUid);
+        if (oauthDateTime && !this.oauthHandler.getTokenExpiryTime()) {
+            this.oauthHandler.setTokenExpiryTime(oauthDateTime);
         }
     }
 }

package/lib/cli-table.d.ts

@@ -0,0 +1,38 @@
+import { Header } from 'tty-table';
+import { FlagInput } from '.';
+export interface TableFlags {
+    extended?: boolean;
+    columns?: string;
+    csv?: boolean;
+    filter?: string;
+    'no-header'?: boolean;
+    'no-truncate'?: boolean;
+    output?: 'csv' | 'json' | 'yaml';
+    sort?: string;
+}
+/** Type for table headers */
+export type TableHeader = Header;
+/** Type for table columns mapping */
+export type TableColumn = {
+    [key: string]: {
+        minWidth?: number;
+        maxWidth?: number;
+        alias?: string;
+        align?: 'left' | 'center' | 'right';
+    };
+};
+export type TableData<T extends Record<string, unknown>> = T[];
+/** Options for CLI Table rendering */
+export type TableOptions = {
+    truncate?: boolean;
+    borderStyle?: 'solid' | 'dashed' | 'none';
+    paddingBottom?: number;
+    showHeader?: boolean;
+    align?: 'left' | 'center' | 'right';
+    enableHeaderTitle?: boolean;
+};
+export default class CLITable {
+    /** Returns CLI table flags */
+    static getTableFlags(columns?: string[]): FlagInput<TableFlags>;
+    static render(headers: TableHeader[], data: Record<string, unknown>[], flags: TableFlags, options?: TableOptions): void;
+}

package/lib/cli-table.js

@@ -0,0 +1,110 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const tty_table_1 = tslib_1.__importDefault(require("tty-table"));
+const yaml = tslib_1.__importStar(require("js-yaml"));
+const papaparse_1 = require("papaparse");
+const core_1 = require("@oclif/core");
+const _1 = require(".");
+class CLITable {
+    /** Returns CLI table flags */
+    static getTableFlags(columns = ['columns', 'sort', 'filter', 'csv', 'no-truncate']) {
+        const flags = {
+            columns: core_1.Flags.string({
+                description: 'Specify columns to display, comma-separated.',
+                helpGroup: 'TABLE',
+            }),
+            sort: core_1.Flags.string({
+                description: 'Sort the table by a column. Use "-" for descending.',
+                helpGroup: 'TABLE',
+            }),
+            filter: core_1.Flags.string({
+                description: 'Filter rows by a column value (e.g., name=foo).',
+                helpGroup: 'TABLE',
+            }),
+            csv: core_1.Flags.boolean({
+                description: 'Output results in CSV format.',
+                helpGroup: 'TABLE',
+            }),
+            'no-truncate': core_1.Flags.boolean({
+                description: 'Prevent truncation of long text in columns.',
+                helpGroup: 'TABLE',
+            }),
+            'no-header': core_1.Flags.boolean({
+                description: 'Hide table headers in output.',
+                helpGroup: 'TABLE',
+            }),
+            output: core_1.Flags.string({
+                options: ['csv', 'json', 'yaml'],
+                description: 'Specify output format: csv, json, or yaml.',
+                helpGroup: 'TABLE',
+            }),
+        };
+        // Return only requested flags
+        return Object.entries(flags)
+            .filter(([key]) => columns.includes(key))
+            .reduce((acc, [key, value]) => {
+            acc[key] = value;
+            return acc;
+        }, {});
+    }
+    static render(headers, data, flags, options) {
+        let tableData = [...data];
+        if (flags) {
+            // **Filter Data**
+            if (flags.filter) {
+                const [key, value] = flags.filter.split('=');
+                tableData = tableData.filter((row) => { var _a; return (_a = row[key]) === null || _a === void 0 ? void 0 : _a.toString().toLowerCase().includes(value.toLowerCase()); });
+            }
+            // **Select Specific Columns**
+            if (flags.columns) {
+                const selectedColumns = flags.columns.split(',');
+                headers = headers.filter((header) => selectedColumns.includes(header.value));
+                tableData = tableData.map((row) => selectedColumns.reduce((acc, key) => {
+                    if (row[key] !== undefined) {
+                        acc[key] = row[key];
+                    }
+                    return acc;
+                }, {}));
+            }
+            // **Sort Data**
+            if (flags.sort) {
+                const sortKey = flags.sort.replace('-', '');
+                const descending = flags.sort.startsWith('-');
+                tableData.sort((a, b) => {
+                    if (a[sortKey] < b[sortKey])
+                        return descending ? 1 : -1;
+                    if (a[sortKey] > b[sortKey])
+                        return descending ? -1 : 1;
+                    return 0;
+                });
+            }
+            // **Format Output**
+            if (flags.output) {
+                switch (flags.output) {
+                    case 'json':
+                        console.log(JSON.stringify(tableData, null, 2));
+                        return;
+                    case 'yaml':
+                        console.log(yaml.dump(tableData));
+                        return;
+                    case 'csv':
+                        console.log((0, papaparse_1.parse)(tableData));
+                        return;
+                }
+            }
+            if (flags.csv) {
+                console.log((0, papaparse_1.parse)(tableData));
+            }
+        }
+        // **Render Table**
+        const config = {
+            truncate: !(flags === null || flags === void 0 ? void 0 : flags['no-header']),
+            borderStyle: 'solid',
+            paddingBottom: 0,
+            showHeader: !(flags === null || flags === void 0 ? void 0 : flags['no-header']),
+        };
+        _1.cliux.print((0, tty_table_1.default)(headers, tableData, config).render());
+    }
+}
+exports.default = CLITable;

package/lib/cli-ux.d.ts

@@ -1,6 +1,6 @@
-import { Table } from '@oclif/core/lib/cli-ux';
 import { Args, Flags, Command } from '@oclif/core';
 import { Ora } from 'ora';
+import { TableFlags, TableHeader, TableData, TableOptions } from './cli-table';
 import { PrintOptions, InquirePayload, CliUXPromptOptions } from './interfaces';
 /**
  * CLI Interface
@@ -8,16 +8,15 @@ import { PrintOptions, InquirePayload, CliUXPromptOptions } from './interfaces';
 declare class CLIInterface {
     private loading;
     constructor();
-    get uxTable(): typeof Table.table;
     init(context: any): void;
     registerSearchPlugin(): void;
     print(message: string, opts?: PrintOptions): void;
     success(message: string): void;
     error(message: string, ...params: any): void;
     loader(message?: string): void;
-    table(data: Record<string, unknown>[], columns: Table.table.Columns<Record<string, unknown>>, options?: Table.table.Options): void;
+    table<T extends Record<string, unknown>>(headers: TableHeader[], data: TableData<T>, flags?: TableFlags, options?: TableOptions): void;
     inquire<T>(inquirePayload: InquirePayload | Array<InquirePayload>): Promise<T>;
-    prompt(name: string, options?: CliUXPromptOptions): Promise<any>;
+    prompt(message: string, options?: CliUXPromptOptions): Promise<any>;
     confirm(message?: string): Promise<boolean>;
     progress(options?: any): any;
     loaderV2(message?: string, spinner?: any): Ora | void;

package/lib/cli-ux.js

@@ -9,6 +9,8 @@ Object.defineProperty(exports, "Args", { enumerable: true, get: function () { re
 Object.defineProperty(exports, "Flags", { enumerable: true, get: function () { return core_1.Flags; } });
 Object.defineProperty(exports, "Command", { enumerable: true, get: function () { return core_1.Command; } });
 const ora_1 = tslib_1.__importDefault(require("ora"));
+const cli_progress_1 = tslib_1.__importDefault(require("cli-progress"));
+const cli_table_1 = tslib_1.__importDefault(require("./cli-table"));
 const message_handler_1 = tslib_1.__importDefault(require("./message-handler"));
 inquirer_1.default.registerPrompt('table', require('./inquirer-table-prompt'));
 /**
@@ -18,9 +20,6 @@ class CLIInterface {
     constructor() {
         this.loading = false;
     }
-    get uxTable() {
-        return core_1.ux.table;
-    }
     init(context) { }
     registerSearchPlugin() {
         inquirer_1.default.registerPrompt('search-list', require('inquirer-search-list'));
@@ -33,16 +32,16 @@ class CLIInterface {
                 chalkFn = chalkFn[opts.color];
             if (opts.bold)
                 chalkFn = chalkFn.bold;
-            core_1.ux.log(chalkFn(message_handler_1.default.parse(message)));
+            core_1.ux.stdout(chalkFn(message_handler_1.default.parse(message)));
             return;
         }
-        core_1.ux.log(message_handler_1.default.parse(message));
+        core_1.ux.stdout(message_handler_1.default.parse(message));
     }
     success(message) {
-        core_1.ux.log(chalk_1.default.green(message_handler_1.default.parse(message)));
+        core_1.ux.stdout(chalk_1.default.green(message_handler_1.default.parse(message)));
     }
     error(message, ...params) {
-        core_1.ux.log(chalk_1.default.red(message_handler_1.default.parse(message) + (params && params.length > 0 ? ': ' : '')), ...params);
+        core_1.ux.stdout(chalk_1.default.red(message_handler_1.default.parse(message) + (params && params.length > 0 ? ': ' : '')), ...params);
     }
     loader(message = '') {
         if (!this.loading) {
@@ -53,10 +52,8 @@ class CLIInterface {
         }
         this.loading = !this.loading;
     }
-    table(data, columns, options) {
-        core_1.ux.log('\n');
-        core_1.ux.table(data, columns, options);
-        core_1.ux.log('\n');
+    table(headers, data, flags, options) {
+        cli_table_1.default.render(headers, data, flags, options);
     }
     async inquire(inquirePayload) {
         if (Array.isArray(inquirePayload)) {
@@ -68,14 +65,22 @@ class CLIInterface {
             return result[inquirePayload.name];
         }
     }
-    prompt(name, options) {
-        return core_1.ux.prompt(name, options);
+    async prompt(message, options) {
+        return await this.inquire({
+            type: 'input',
+            name: 'prompt',
+            message,
+        });
     }
-    confirm(message) {
-        return core_1.ux.confirm(message);
+    async confirm(message) {
+        return await this.inquire({
+            type: 'confirm',
+            name: 'prompt',
+            message,
+        });
     }
     progress(options) {
-        return core_1.ux.progress(options);
+        return new cli_progress_1.default.SingleBar(options);
     }
     loaderV2(message = '', spinner) {
         if (!spinner) {

package/lib/index.d.ts

@@ -17,8 +17,9 @@ export * from './interfaces';
 export * from './date-time';
 export * from './add-locale';
 export * from './path-validator';
+export { default as CLITable, TableFlags, TableHeader, TableOptions, TableData } from './cli-table';
 export { App, AppData, Installation, marketplaceSDKClient, MarketplaceSDKInitiator, marketplaceSDKInitiator, ContentstackMarketplaceClient, ContentstackMarketplaceConfig, };
-export { Args, CommandHelp, Config, Errors, Flags, loadHelpClass, Help, HelpBase, HelpSection, HelpSectionRenderer, HelpSectionKeyValueTable, Hook, Interfaces, Parser, Plugin, run, toStandardizedId, toConfiguredId, settings, Settings, flush, ux, execute, stderr, stdout, } from '@oclif/core';
+export { Args, CommandHelp, Config, Errors, Flags, loadHelpClass, Help, HelpBase, HelpSection, HelpSectionRenderer, HelpSectionKeyValueTable, Hook, Interfaces, Parser, Plugin, run, toStandardizedId, toConfiguredId, settings, Settings, flush, ux, execute, } from '@oclif/core';
 export { FlagInput, ArgInput, FlagDefinition } from '@oclif/core/lib/interfaces/parser';
 export { default as TablePrompt } from './inquirer-table-prompt';
 export { Logger };

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.authenticationHandler = exports.Logger = exports.TablePrompt = exports.stdout = exports.stderr = exports.execute = exports.ux = exports.flush = exports.settings = exports.toConfiguredId = exports.toStandardizedId = 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.marketplaceSDKInitiator = exports.MarketplaceSDKInitiator = exports.marketplaceSDKClient = 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;
+exports.authenticationHandler = exports.Logger = exports.TablePrompt = exports.execute = exports.ux = exports.flush = exports.settings = exports.toConfiguredId = exports.toStandardizedId = 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.marketplaceSDKInitiator = exports.MarketplaceSDKInitiator = exports.marketplaceSDKClient = exports.CLITable = 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");
 const logger_1 = tslib_1.__importDefault(require("./logger"));
 exports.Logger = logger_1.default;
@@ -38,6 +38,8 @@ tslib_1.__exportStar(require("./interfaces"), exports);
 tslib_1.__exportStar(require("./date-time"), exports);
 tslib_1.__exportStar(require("./add-locale"), exports);
 tslib_1.__exportStar(require("./path-validator"), exports);
+var cli_table_1 = require("./cli-table");
+Object.defineProperty(exports, "CLITable", { enumerable: true, get: function () { return tslib_1.__importDefault(cli_table_1).default; } });
 // NOTE Exporting all @oclif/core modules: So that all the module can be acessed through cli-utility
 var core_1 = require("@oclif/core");
 Object.defineProperty(exports, "Args", { enumerable: true, get: function () { return core_1.Args; } });
@@ -58,8 +60,6 @@ Object.defineProperty(exports, "settings", { enumerable: true, get: function ()
 Object.defineProperty(exports, "flush", { enumerable: true, get: function () { return core_1.flush; } });
 Object.defineProperty(exports, "ux", { enumerable: true, get: function () { return core_1.ux; } });
 Object.defineProperty(exports, "execute", { enumerable: true, get: function () { return core_1.execute; } });
-Object.defineProperty(exports, "stderr", { enumerable: true, get: function () { return core_1.stderr; } });
-Object.defineProperty(exports, "stdout", { enumerable: true, get: function () { return core_1.stdout; } });
 var inquirer_table_prompt_1 = require("./inquirer-table-prompt");
 Object.defineProperty(exports, "TablePrompt", { enumerable: true, get: function () { return tslib_1.__importDefault(inquirer_table_prompt_1).default; } });
 var authentication_handler_1 = require("./authentication-handler");

package/lib/interfaces/index.d.ts

@@ -1,4 +1,10 @@
-import { IPromptOptions } from '@oclif/core/lib/cli-ux';
+export interface IPromptOptions {
+    prompt?: string;
+    type?: 'normal' | 'mask' | 'hide' | 'single';
+    timeout?: number;
+    required?: boolean;
+    default?: string;
+}
 export interface PrintOptions {
     bold?: boolean;
     color?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -32,12 +32,13 @@
   "author": "contentstack",
   "license": "MIT",
   "dependencies": {
-    "@contentstack/management": "~1.18.4",
+    "@contentstack/management": "~1.20.1",
     "@contentstack/marketplace-sdk": "^1.2.5",
-    "@oclif/core": "^3.27.0",
+    "@oclif/core": "^4.2.7",
     "axios": "^1.8.2",
     "chalk": "^4.1.2",
     "cli-cursor": "^3.1.0",
+    "cli-progress": "^3.12.0",
     "cli-table": "^0.3.11",
     "conf": "^10.2.0",
     "dotenv": "^16.4.7",
@@ -45,14 +46,17 @@
     "inquirer": "8.2.6",
     "inquirer-search-checkbox": "^1.0.0",
     "inquirer-search-list": "^1.2.6",
+    "js-yaml": "^4.1.0",
     "klona": "^2.0.6",
     "lodash": "^4.17.21",
     "mkdirp": "^1.0.4",
     "open": "^8.4.2",
     "ora": "^5.4.1",
+    "papaparse": "^5.5.2",
     "recheck": "~4.4.5",
     "rxjs": "^6.6.7",
     "traverse": "^0.6.11",
+    "tty-table": "^4.2.3",
     "unique-string": "^2.0.0",
     "uuid": "^9.0.1",
     "winston": "^3.17.0",
@@ -68,7 +72,7 @@
     "@types/traverse": "^0.6.37",
     "chai": "^4.5.0",
     "eslint": "^8.57.1",
-    "eslint-config-oclif": "^4.0.0",
+    "eslint-config-oclif": "^6.0.15",
     "eslint-config-oclif-typescript": "^3.1.14",
     "fancy-test": "^2.0.42",
     "mocha": "10.8.2",