Fixed login behavior for connect and edit. Added log out command

Author: kevinwang5658

src/commands/login.ts

@@ -5,9 +5,9 @@ import { LoginOrchestrator } from '../orchestrators/login.js';
 
 export default class Login extends BaseCommand {
   static description =
-    `Validate a codify.jsonc/codify.json/codify.yaml file.
+    `Logins to codify cloud account
     
-For more information, visit: https://docs.codifycli.com/commands/validate
+For more information, visit: https://docs.codifycli.com/commands/login
 `
 
   static flags = {}

src/commands/logout.ts

@@ -0,0 +1,27 @@
+import chalk from 'chalk';
+
+import { BaseCommand } from '../common/base-command.js';
+import { LoginOrchestrator } from '../orchestrators/login.js';
+import { LoginHelper } from '../connect/login-helper.js';
+
+export default class Login extends BaseCommand {
+  static description =
+    `Logout of codify cloud account
+    
+For more information, visit: https://docs.codifycli.com/commands/logout
+`
+
+  static flags = {}
+
+  static examples = [
+    '<%= config.bin %> <%= command.id %>',
+    '<%= config.bin %> <%= command.id %> --path=../../import.codify.jsonc',
+  ]
+
+  public async run(): Promise<void> {
+    await LoginHelper.logout();
+    console.log(chalk.green('\nSuccessfully logged out.'))
+
+    process.exit(0);
+  }
+}

src/connect/login-helper.ts

@@ -54,6 +54,16 @@ export class LoginHelper {
 
     await fs.mkdir(path.dirname(credentialsPath), { recursive: true });
     await fs.writeFile(credentialsPath, JSON.stringify({ accessToken }));
+
+    this.instance.isLoggedIn = true;
+    this.instance.credentials = LoginHelper.decodeToken(accessToken);
+  }
+
+  static async logout() {
+    try {
+      const credentialsPath = path.join(os.homedir(), '.codify', 'credentials.json');
+      await fs.rm(credentialsPath);
+    } catch {}
   }
 
   private static async read(): Promise<Credentials | undefined> {
@@ -63,14 +73,7 @@ export class LoginHelper {
       const { accessToken } = JSON.parse(credentialsStr);
 
       await LoginHelper.verifyProjectJWT(accessToken);
-      const decoded = decodeJwt(accessToken);
-
-      return {
-        accessToken,
-        email: decoded.email as string,
-        userId: decoded.sub!,
-        expiry: decoded.exp!,
-      }
+      return LoginHelper.decodeToken(accessToken);
     } catch {
       return undefined;
     }
@@ -79,4 +82,15 @@ export class LoginHelper {
   private static async verifyProjectJWT(jwt: string) {
     return jwtVerify(jwt, PROJECT_JWKS)
   }
+
+  private static decodeToken(jwt: string): Credentials {
+    const decoded = decodeJwt(jwt);
+
+    return {
+      accessToken: jwt,
+      email: decoded.email as string,
+      userId: decoded.sub!,
+      expiry: decoded.exp!,
+    }
+  }
 }

src/orchestrators/connect.ts

@@ -16,8 +16,8 @@ export class ConnectOrchestrator {
   static async run(oclifConfig: Config, openBrowser = true, onOpen?: (connectionCode: string) => void) {
     const login = LoginHelper.get()?.isLoggedIn;
     if (!login) {
+      console.log('User is not logged in. Attempting to log in...')
       await LoginOrchestrator.run();
-      await LoginHelper.load();
     }
 
     this.rootCommand = oclifConfig.options.root;

src/orchestrators/edit.ts

@@ -4,8 +4,8 @@ import open from 'open';
 
 import { DashboardApiClient } from '../api/dashboard/index.js';
 import { config } from '../config.js';
-import { ConnectOrchestrator } from './connect.js';
 import { LoginHelper } from '../connect/login-helper.js';
+import { ConnectOrchestrator } from './connect.js';
 import { LoginOrchestrator } from './login.js';
 
 export class EditOrchestrator {
@@ -14,8 +14,8 @@ export class EditOrchestrator {
   static async run(oclifConfig: Config) {
     const login = LoginHelper.get()?.isLoggedIn;
     if (!login) {
+      console.log('User is not logged in. Attempting to log in...')
       await LoginOrchestrator.run();
-      await LoginHelper.load();
     }
 
     const defaultDocumentId = await DashboardApiClient.getDefaultDocumentId();