Re-worked login to get email, userId, claims directly from token. Switched to ES256 self signed tokens. Added codify edit command

Author: kevinwang5658

package-lock.json

@@ -29,6 +29,7 @@
     "ink-gradient": "^3.0.0",
     "ink-select-input": "^6.0.0",
     "jju": "^1.4.0",
+    "jose": "^6.1.0",
     "jotai": "^2.11.1",
     "js-yaml": "^4.1.0",
     "js-yaml-source-map": "^0.2.2",
@@ -42,8 +43,8 @@
     "semver": "^7.5.4",
     "socket.io": "^4.8.1",
     "supports-color": "^9.4.0",
-    "ws": "^8.18.3",
-    "uuid": "^10.0.0"
+    "uuid": "^10.0.0",
+    "ws": "^8.18.3"
   },
   "description": "Codify allows users to configure settings, install new packages, and automate their systems using code instead of the GUI. Get set up on a new laptop in one click, maintain a Codify file within your project so anyone can get started and never lose your cool apps or favourite settings again.",
   "devDependencies": {

package.json

@@ -12,7 +12,7 @@ export const DashboardApiClient = {
 
     const res = await fetch(
       `${API_BASE_URL}/api/v1/documents/${id}`,
-      { method: 'GET', headers: { 'Content-Type': 'application/json', 'authorization': login.accessToken } },
+      { method: 'GET', headers: { 'Content-Type': 'application/json', 'authorization': `Bearer ${login.accessToken}` } },
     );
 
     if (!res.ok) {
@@ -24,23 +24,25 @@ export const DashboardApiClient = {
     return json;
   },
 
-  async getDefaultDocumentId(): Promise<string> {
+  async getDefaultDocumentId(): Promise<null | string> {
     const login = LoginHelper.get()?.credentials;
     if (!login) {
       throw new Error('Not logged in');
     }
 
-    // const res = await fetch(
-    //   `${API_BASE_URL}/api/v1/documents/default/id`,
-    //   { method: 'GET', headers: { 'Content-Type': 'application/json', 'authorization': login.accessToken } },
-    // );
+    console.log('Token', login.accessToken);
 
-    // const json = await res.json();
-    // if (!res.ok) {
-    //   throw new Error(JSON.stringify(json, null, 2));
-    // }
+    const res = await fetch(
+      `${API_BASE_URL}/api/v1/documents/default/id`,
+      { method: 'GET', headers: { 'Content-Type': 'application/json', 'authorization': `Bearer ${login.accessToken}` } },
+    );
+
+    const json = await res.json();
+    if (!res.ok) {
+      throw new Error(JSON.stringify(json, null, 2));
+    }
 
-    return '1b80818e-5304-4158-80a3-82e17ff2c79e';
+    return json.defaultDocumentId;
   },
 
   async saveDocumentUpdate(id: string, contents: string): Promise<void> {

src/api/dashboard/index.ts

@@ -1,5 +1,7 @@
 import { BaseCommand } from '../common/base-command.js';
 import { ConnectOrchestrator } from '../orchestrators/connect.js';
+import { EditOrchestrator } from '../orchestrators/edit.js';
+import { LoginHelper } from '../connect/login-helper.js';
 
 export default class Edit extends BaseCommand {
   static description =
@@ -16,8 +18,10 @@ For more information, visit: https://docs.codifycli.com/commands/validate
   ]
 
   public async run(): Promise<void> {
-    const { flags } = await this.parse(Edit)
+    const { flags } = await this.parse(Edit);
+    const config = this.config;
+
+    await EditOrchestrator.run(config);
 
-    // await ConnectOrchestrator.run();
   }
 }

src/commands/edit.ts

@@ -6,5 +6,8 @@ export const config = {
     'https://dashboard.codifycli.com',
     'https://https://codify-dashboard.kevinwang5658.workers.dev',
     'http://localhost:3000'
-  ]
+  ],
+
+  dashboardUrl: 'https://dashboard.codifycli.com',
+  supabaseUrl: 'https://kdctbvqvqjfquplxhqrm.supabase.co',
 }

src/config.ts

@@ -9,7 +9,7 @@ const router = Router({
 router.post('/session', (req, res) => {
   const { clientId } = req.body;
   if (!clientId) {
-    throw new Error('connectionId is required');
+    throw new Error('clientId is required');
   }
 
   const socketServer = SocketServer.get();

src/connect/http-routes/handlers/index.ts

@@ -1,14 +1,20 @@
+import { createRemoteJWKSet, decodeJwt, jwtVerify } from 'jose';
 import * as fs from 'node:fs/promises';
 import * as os from 'node:os';
 import * as path from 'node:path';
+import { config } from '../config.js';
 
 interface Credentials {
   accessToken: string;
   email: string;
   userId: string;
-  expiry: string;
+  expiry: number;
 }
 
+const PROJECT_JWKS = createRemoteJWKSet(
+  new URL(`${config.supabaseUrl}/auth/v1/.well-known/jwks.json`)
+)
+
 export class LoginHelper {
   private static instance: LoginHelper;
 
@@ -23,6 +29,8 @@ export class LoginHelper {
     }
 
     const credentials = await LoginHelper.read();
+
+    console.log('My credentials', credentials);
     if (!credentials) {
       LoginHelper.instance = new LoginHelper(false);
       return LoginHelper.instance;
@@ -41,19 +49,34 @@ export class LoginHelper {
     return LoginHelper.instance;
   }
 
-  static async save(credentials: Credentials) {
+  static async save(accessToken: string) {
     const credentialsPath = path.join(os.homedir(), '.codify', 'credentials.json');
     console.log(`Saving credentials to ${credentialsPath}`);
-    await fs.writeFile(credentialsPath, JSON.stringify(credentials));
+    await fs.writeFile(credentialsPath, JSON.stringify({ accessToken }));
   }
 
   private static async read(): Promise<Credentials | undefined> {
     const credentialsPath = path.join(os.homedir(), '.codify', 'credentials.json');
     try {
       const credentialsStr = await fs.readFile(credentialsPath, 'utf8');
-      return JSON.parse(credentialsStr);
-    } catch {
+      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!,
+      }
+    } catch(e) {
+      console.error(e);
       return undefined;
     }
   }
+
+  private static async verifyProjectJWT(jwt: string) {
+    return jwtVerify(jwt, PROJECT_JWKS)
+  }
 }

src/connect/login-helper.ts

@@ -124,7 +124,7 @@ export class SocketServer {
   private handleClientConnected = (ws: WebSocket) => {
     const clientId = uuid();
     this.mainConnections.set(clientId, ws);
-    ws.send(JSON.stringify({ key: 'opened', data: { clientId: uuid } }))
+    ws.send(JSON.stringify({ key: 'opened', data: { clientId } }))
 
     ws.on('close', () => {
       this.mainConnections.delete(clientId);

src/connect/socket-server.ts

@@ -6,12 +6,20 @@ import open from 'open';
 
 import { config } from '../config.js';
 import router from '../connect/http-routes/router.js';
+import { LoginHelper } from '../connect/login-helper.js';
 import { SocketServer } from '../connect/socket-server.js';
+import { LoginOrchestrator } from './login.js';
 
 export class ConnectOrchestrator {
   static rootCommand: string;
 
-  static async run(oclifConfig: Config) {
+  static async run(oclifConfig: Config, openBrowser = true, onOpen?: (connectionCode: string) => void) {
+    const login = LoginHelper.get()?.isLoggedIn;
+    if (!login) {
+      await LoginOrchestrator.run();
+      await LoginHelper.load();
+    }
+
     this.rootCommand = oclifConfig.options.root;
 
     const connectionSecret = ConnectOrchestrator.tokenGenerate()
@@ -31,11 +39,15 @@ export class ConnectOrchestrator {
         throw error;
       }
 
-      open(`http://localhost:3000/connection/success?code=${connectionSecret}`)
-      console.log(`Open browser window to store code.
+      if (openBrowser) {
+        open(`http://localhost:3000/connection/success?code=${connectionSecret}`)
+        console.log(`Open browser window to store code.
 
 If unsuccessful manually enter the code:
 ${connectionSecret}`)
+      }
+
+      onOpen?.(connectionSecret);
     });
 
     // const wsManager = WsServerManager.init(server, connectionSecret)

src/orchestrators/connect.ts

@@ -0,0 +1,30 @@
+import { Config } from '@oclif/core';
+import { randomBytes } from 'node:crypto';
+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 { LoginOrchestrator } from './login.js';
+
+export class EditOrchestrator {
+  static rootCommand: string;
+
+  static async run(oclifConfig: Config) {
+    const login = LoginHelper.get()?.isLoggedIn;
+    if (!login) {
+      await LoginOrchestrator.run();
+      await LoginHelper.load();
+    }
+
+    const defaultDocumentId = await DashboardApiClient.getDefaultDocumentId();
+    const url = defaultDocumentId
+      ? `${config.dashboardUrl}/file/${defaultDocumentId}`
+      : config.dashboardUrl;
+
+    await ConnectOrchestrator.run(oclifConfig, false, (code) => {
+      open(`${url}?connection_code=${code}`);
+    });
+  }
+}