Resolved logout issue for oauth

Author: netrajpatel

packages/contentstack-auth/src/commands/auth/logout.ts

@@ -7,7 +7,6 @@ import {
   flags,
   authHandler as oauthHandler,
   managementSDKClient,
-  isAuthenticated,
 } from '@contentstack/cli-utilities';
 
 import { authHandler } from '../../utils';
@@ -50,14 +49,19 @@ export default class LogoutCommand extends Command {
     try {
       const managementAPIClient = await managementSDKClient({ host: this.cmaHost, skipTokenValidity: true });
       authHandler.client = managementAPIClient;
-      if (isAuthenticated()) {
+      if ((await oauthHandler.isAuthenticated()) && (await oauthHandler.isAuthorisationTypeBasic())) {
         if (confirm === true) {
           cliux.loader('CLI_AUTH_LOGOUT_LOADER_START');
           await authHandler.logout(configHandler.get('authtoken'));
           cliux.loader('');
           logger.info('successfully logged out');
           cliux.success('CLI_AUTH_LOGOUT_SUCCESS');
         }
+      } else {
+        cliux.loader('CLI_AUTH_LOGOUT_LOADER_START');
+        cliux.loader('');
+        logger.info('successfully logged out');
+        cliux.success('CLI_AUTH_LOGOUT_SUCCESS');
       }
     } catch (error) {
       let errorMessage = '';

packages/contentstack-utilities/src/auth-handler.ts

@@ -384,6 +384,18 @@ class AuthHandler {
     );
   }
 
+  async getAuthorisationType(): Promise<any> {
+    return configHandler.get(this.authorisationTypeKeyName) ? configHandler.get(this.authorisationTypeKeyName) : false;
+  }
+
+  async isAuthorisationTypeBasic(): Promise<boolean> {
+    return configHandler.get(this.authorisationTypeKeyName) === this.authorisationTypeAUTHValue ? true : false;
+  }
+
+  async isAuthorisationTypeOAuth(): Promise<boolean> {
+    return configHandler.get(this.authorisationTypeKeyName) === this.authorisationTypeOAUTHValue ? true : false;
+  }
+
   checkExpiryAndRefresh = (force: boolean = false) => this.compareOAuthExpiry(force);
 
   async compareOAuthExpiry(force: boolean = false) {

packages/contentstack-utilities/types/auth-handler.d.ts

@@ -37,6 +37,9 @@ declare class AuthHandler {
   isAuthenticated(): Promise<boolean>;
   checkExpiryAndRefresh: (force?: boolean) => Promise<void | object>;
   compareOAuthExpiry(force?: boolean): Promise<void | object>;
+  getAuthorisationType(): Promise<boolean>;
+  isAuthorisationTypeBasic(): Promise<boolean>;
+  isAuthorisationTypeOAuth(): Promise<boolean>;
 }
 declare const _default: AuthHandler;
 export default _default;