feat: Added CLI logins without the browser

Author: kevinwang5658

src/api/dashboard/index.ts

@@ -12,7 +12,10 @@ export const DashboardApiClient = {
 
     const res = await fetch(
       `${config.dashboardUrl}/api/v1/documents/${id}`,
-      { method: 'GET', headers: { 'Content-Type': 'application/json', 'authorization': `Bearer ${login.accessToken}` } },
+      {
+        method: 'GET',
+        headers: { 'Content-Type': 'application/json', 'authorization': `Bearer ${login.accessToken}` }
+      },
     );
 
     if (!res.ok) {
@@ -32,7 +35,10 @@ export const DashboardApiClient = {
 
     const res = await fetch(
       `${config.dashboardUrl}/api/v1/documents/default/id`,
-      { method: 'GET', headers: { 'Content-Type': 'application/json', 'authorization': `Bearer ${login.accessToken}` } },
+      {
+        method: 'GET',
+        headers: { 'Content-Type': 'application/json', 'authorization': `Bearer ${login.accessToken}` }
+      },
     );
 
     if (!res.ok) {
@@ -50,12 +56,30 @@ export const DashboardApiClient = {
     return json.defaultDocumentId;
   },
 
+  async login(email: string, password: string): Promise<string> {
+    const res = await fetch(
+      `${config.dashboardUrl}/api/v1/auth/cli`,
+      {
+        method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({
+          email,
+          password,
+        })
+      },
+    );
+
+    if (!res.ok) {
+      const message = await res.text();
+      throw new Error(message);
+    }
+
+    const json = await res.json();
+    return json.accessToken;
+  },
+
   async saveDocumentUpdate(id: string, contents: string): Promise<void> {
     const login = LoginHelper.get()?.credentials;
     if (!login) {
       throw new Error('Not logged in');
     }
-
-
   }
 }

src/commands/login.ts

@@ -1,26 +1,33 @@
+import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
 import { BaseCommand } from '../common/base-command.js';
 import { LoginOrchestrator } from '../orchestrators/login.js';
 
 export default class Login extends BaseCommand {
   static description =
-    `Logins to Codify cloud account
+    `Logins to Codify cloud account. 
+    
+By default opens a browser window to login. If username and password are provided, it will attempt to login via CLI.
     
 For more information, visit: https://docs.codifycli.com/commands/login
 `
 
-  static flags = {}
+  static baseFlags = {
+    username: Flags.string({ char: 'u', description: 'Username to login with.' }),
+    password: Flags.string({ char: 'p',  description: 'Password to login with.' }),
+  }
 
   static examples = [
     '<%= config.bin %> <%= command.id %>',
-    '<%= config.bin %> <%= command.id %> --path=../../import.codify.jsonc',
+    '<%= config.bin %> <%= command.id %> --username=user@example.com --password=secret',
+    '<%= config.bin %> <%= command.id %> -p user@example.com -p secret',
   ]
 
   public async run(): Promise<void> {
     const { flags } = await this.parse(Login)
 
-    await LoginOrchestrator.run();
+    await LoginOrchestrator.run({ username: flags.username, password: flags.password });
     console.log(chalk.green('\nSuccessfully logged in!'))
 
     process.exit(0);

src/orchestrators/login.ts

@@ -3,6 +3,7 @@ import cors from 'cors';
 import express, { json } from 'express';
 import open from 'open';
 
+import { DashboardApiClient } from '../api/dashboard/index.js';
 import { config } from '../config.js';
 import { LoginHelper } from '../connect/login-helper.js';
 import { ajv } from '../utils/ajv.js';
@@ -25,8 +26,38 @@ interface Credentials {
   expiry: string;
 }
 
+export interface LoginArgs {
+  username?: string;
+  password?: string;
+}
+
+
 export class LoginOrchestrator {
-  static async run() {
+  static async run(args?: LoginArgs) {
+    if (args?.username && !args?.password) {
+      console.error(chalk.red('Password is required when providing a username'));
+      process.exit(1);
+    }
+
+    if (args?.password && !args?.username) {
+      console.error(chalk.red('Username is required when providing a password'));
+      process.exit(1);
+    }
+
+    if (args?.username && args?.password) {
+      return this.loginWithCredentials(args.username, args.password);
+    }
+
+    return this.loginViaBrowser();
+  }
+
+  private static async loginWithCredentials(username: string, password: string) {
+    const accessToken = await DashboardApiClient.login(username, password);
+    await LoginHelper.save(accessToken);
+  }
+
+  private static async loginViaBrowser() {
+
     const app = express();
 
     app.use(cors({ origin: config.corsAllowedOrigins }))
@@ -39,7 +70,7 @@ export class LoginOrchestrator {
       }
 
       console.log(
-`Opening CLI auth page...
+        `Opening CLI auth page...
 Manually open it here: ${config.dashboardUrl}/auth/cli`
       )
       open(`${config.dashboardUrl}/auth/cli`);