Fixed login bugs.

- Resolve promise when logged in
- Fixed login manager bug
Added useful log message for connect

Author: kevinwang5658

src/commands/edit.ts

@@ -0,0 +1,23 @@
+import { BaseCommand } from '../common/base-command.js';
+import { ConnectOrchestrator } from '../orchestrators/connect.js';
+
+export default class Edit extends BaseCommand {
+  static description =
+    `Edit a codify.jsonc/codify.json/codify.yaml file.
+    
+For more information, visit: https://docs.codifycli.com/commands/validate
+`
+
+  static flags = {}
+
+  static examples = [
+    '<%= config.bin %> <%= command.id %>',
+    '<%= config.bin %> <%= command.id %> --path=../../import.codify.jsonc',
+  ]
+
+  public async run(): Promise<void> {
+    const { flags } = await this.parse(Edit)
+
+    await ConnectOrchestrator.run();
+  }
+}

src/connect/login-helper.ts

@@ -49,9 +49,8 @@ export class LoginHelper {
 
   private static async read(): Promise<Credentials | undefined> {
     const credentialsPath = path.join(os.homedir(), '.codify', 'credentials.json');
-    const credentialsStr = await fs.readFile(credentialsPath, 'utf8');
-
     try {
+      const credentialsStr = await fs.readFile(credentialsPath, 'utf8');
       return JSON.parse(credentialsStr);
     } catch {
       return undefined;

src/orchestrators/connect.ts

@@ -2,7 +2,6 @@ import cors from 'cors';
 import express, { json } from 'express';
 import { randomBytes } from 'node:crypto';
 import open from 'open';
-import { WebSocket } from 'ws';
 
 import { config } from '../config.js';
 import HttpRouteHandler from '../connect/http-route-handler.js';
@@ -20,6 +19,10 @@ export class ConnectOrchestrator {
 
     const server = app.listen(config.connectServerPort, () => {
       open(`http://localhost:3000/connection/success?code=${connectionSecret}`)
+      console.log(`Open browser window to store code.
+
+If unsuccessful manually enter the code:
+${connectionSecret}`)
     });
 
     const wsManager = WsServerManager.init(server, connectionSecret)

src/orchestrators/login.ts

@@ -1,13 +1,10 @@
 import cors from 'cors';
 import express, { json } from 'express';
-import * as fs from 'node:fs/promises';
-import * as os from 'node:os';
-import path from 'node:path';
 import open from 'open';
 
 import { config } from '../config.js';
-import { ajv } from '../utils/ajv.js';
 import { LoginHelper } from '../connect/login-helper.js';
+import { ajv } from '../utils/ajv.js';
 
 const schema = {
   type: 'object',
@@ -22,7 +19,7 @@ const schema = {
       type: 'string',
     },
     expiry: {
-      type: 'string',
+      type: 'number',
     }
   },
   additionalProperties: false,
@@ -37,25 +34,33 @@ interface Credentials {
 }
 
 export class LoginOrchestrator {
-  static async run(){
+  static async run() {
     const app = express();
 
     app.use(cors({ origin: config.corsAllowedOrigins }))
     app.use(json())
 
-    app.post('/', async (req, res) => {
-      const body = req.body as Credentials;
-      if (!ajv.validate(schema, body)) {
-        return res.status(400).send({ message: ajv.errorsText() })
-      }
+    const [, server] = await Promise.all([
+      new Promise<void>((resolve) => {
+        app.post('/', async (req, res) => {
+          const body = req.body as Credentials;
+
+          if (!ajv.validate(schema, body)) {
+            return res.status(400).send({ message: ajv.errorsText() })
+          }
+
+          await LoginHelper.save(body);
+          res.sendStatus(200);
 
-      await LoginHelper.save(body);
-      return res.sendStatus(200);
-    });
+          resolve();
+        });
+      }),
+      app.listen(config.loginServerPort, () => {
+        console.log('Opening CLI auth page...')
+        open('http://localhost:3000/auth/cli');
+      })
+    ])
 
-    app.listen(config.loginServerPort, () => {
-      console.log('Opening CLI auth page...')
-      open('http://localhost:3000/auth/cli');
-    })
+    server.close(() => {});
   }
 }