Added install beta script. Fixed urls to point to dashboard.codifycli.com. Fixed logins if another process is already using the port. Fixed logins not saving credentials if .codify folder doesn't exist.

Author: kevinwang5658

README.md

@@ -18,7 +18,7 @@ $ npm install -g codify
 $ codify COMMAND
 running command...
 $ codify (--version)
-codify/0.9.0 darwin-arm64 node-v20.19.5
+codify/1.0.0 darwin-arm64 node-v22.19.0
 $ codify --help [COMMAND]
 USAGE
   $ codify COMMAND

package.json

@@ -141,7 +141,7 @@
     "start:dev": "./bin/dev.js",
     "start:vm": "npm run build && npm run pack:macos && npm run start:vm"
   },
-  "version": "0.9.0",
+  "version": "1.0.0",
   "bugs": "https://github.com/kevinwang5658/codify/issues",
   "keywords": [
     "oclif"

scripts/install-beta.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+set -e;
+# Always clean up tmp dir even if install fails
+trap 'rm -rf $TEMP_DIR' EXIT
+
+if [ $(uname -s) != "Darwin" ]; then
+  echo "Only macOS systems are currently supported"
+  exit 1;
+fi;
+
+ARCH=$(uname -m)
+TEMP_DIR=$(mktemp -d -t "codify")
+
+echo "Downloading beta installer...";
+curl -L -o "$TEMP_DIR/codify-installer.pkg" "https://api.codifycli.com/v2/cli/releases/beta/$ARCH/installer";
+echo "Downloaded Codify beta installer";
+
+printf "\nRunning installer... (sudo may be required)\n";
+sudo installer -pkg "$TEMP_DIR/codify-installer.pkg" -target /;
+
+CYAN='\033[0;36m'
+END_ESCAPE='\033[0m'
+
+printf "${CYAN}\n🎉 %s 🎉\n%s${END_ESCAPE}\n" "Successfully installed Codify beta. Type codify --help for a list of commands." "Visit the documentation at https://docs.codifycli.com for more info."
+
+exit 0;

src/commands/login.ts

@@ -1,3 +1,5 @@
+import chalk from 'chalk';
+
 import { BaseCommand } from '../common/base-command.js';
 import { LoginOrchestrator } from '../orchestrators/login.js';
 
@@ -19,7 +21,8 @@ For more information, visit: https://docs.codifycli.com/commands/validate
     const { flags } = await this.parse(Login)
 
     await LoginOrchestrator.run();
+    console.log(chalk.green('\nSuccessfully logged in!'))
 
-    process.exit(0)
+    process.exit(0);
   }
 }

src/connect/login-helper.ts

@@ -3,6 +3,7 @@ import * as fs from 'node:fs/promises';
 import * as os from 'node:os';
 import * as path from 'node:path';
 import { config } from '../config.js';
+import chalk from 'chalk';
 
 interface Credentials {
   accessToken: string;
@@ -49,7 +50,9 @@ export class LoginHelper {
 
   static async save(accessToken: string) {
     const credentialsPath = path.join(os.homedir(), '.codify', 'credentials.json');
-    console.log(`Saving credentials to ${credentialsPath}`);
+    console.log(chalk.green(`Saving credentials to ${credentialsPath}`));
+
+    await fs.mkdir(path.dirname(credentialsPath), { recursive: true });
     await fs.writeFile(credentialsPath, JSON.stringify({ accessToken }));
   }
 

src/orchestrators/connect.ts

@@ -40,7 +40,7 @@ export class ConnectOrchestrator {
       }
 
       if (openBrowser) {
-        open(`http://localhost:3000/connection/success?code=${connectionSecret}`)
+        open(`${config.dashboardUrl}/connection/success?code=${connectionSecret}`)
         console.log(`Open browser window to store code.
 
 If unsuccessful manually enter the code:

src/orchestrators/login.ts

@@ -1,3 +1,4 @@
+import chalk from 'chalk';
 import cors from 'cors';
 import express, { json } from 'express';
 import open from 'open';
@@ -14,7 +15,7 @@ const schema = {
     }
   },
   additionalProperties: false,
-  required: ['accessToken', 'email', 'userId', 'expiry'],
+  required: ['accessToken'],
 }
 
 interface Credentials {
@@ -29,27 +30,49 @@ export class LoginOrchestrator {
     const app = express();
 
     app.use(cors({ origin: config.corsAllowedOrigins }))
-    app.use(json())
+    app.use(json());
 
-    const [, server] = await Promise.all([
-      new Promise<void>((resolve) => {
+    const server = app.listen(config.loginServerPort, (error) => {
+      if (error) {
+        console.error(chalk.red('Something went wrong. Only a single instance of codify login can be run at the same time. Please terminate the other process and try again.'));
+        process.exit(1);
+      }
+
+      console.log(
+`Opening CLI auth page...
+Manually open it here: ${config.dashboardUrl}/auth/cli`
+      )
+      open(`${config.dashboardUrl}/auth/cli`);
+    })
+
+    await Promise.race([
+      new Promise<void>((resolve, reject) => {
         app.post('/', async (req, res) => {
-          const body = req.body as Credentials;
+          try {
+            const body = req.body as Credentials;
 
-          // if (!ajv.validate(schema, body)) {
-          //   console.error('Received invalid credentials', body)
-          //   return res.status(400).send({ message: ajv.errorsText() })
-          // }
+            if (!ajv.validate(schema, body)) {
+              console.error(chalk.red('Received invalid credentials. Please submit a support ticket'))
+              return res.status(400).send({ message: ajv.errorsText() })
+            }
 
-          await LoginHelper.save(body.accessToken);
-          res.sendStatus(200);
+            console.log(chalk.green('\nSuccessfully received sign-in credentials...'))
 
-          resolve();
+            await LoginHelper.save(body.accessToken);
+            res.sendStatus(200);
+
+            resolve();
+          } catch (error) {
+            console.error(error);
+            reject(error);
+          }
         });
       }),
-      app.listen(config.loginServerPort, () => {
-        console.log('Opening CLI auth page...')
-        open('http://localhost:3000/auth/cli');
+      new Promise<void>((resolve) => {
+        setTimeout(() => {
+          console.error(chalk.red('Did not receive sign-in credentials in 5 minutes, please re-run the command'));
+          resolve();
+        }, 5 * 60 * 1000);
       })
     ])