@bharatpanigrahi/onw-cli 1.1.0 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bharatpanigrahi/onw-cli",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "A CLI tool for Claude AI",
   "main": "src/index.js",
   "files": [
@@ -25,6 +25,7 @@
     "@clack/prompts": "^1.1.0",
     "@prisma/client": "^6.19.2",
     "ai": "^6.0.141",
+    "better-auth": "^1.5.6",
     "boxen": "^8.0.1",
     "chalk": "^5.6.2",
     "commandor": "^0.1.3",

package/src/cli/commands/auth/login.js

@@ -1,4 +1,4 @@
-import { cancel, confirm, intro, isCancel, outro } from "@clack/prompts";
+import { cancel, confirm, intro, isCancel, outro, text } from "@clack/prompts";
 import { logger } from "better-auth";
 import { createAuthClient } from "better-auth/client";
 import { deviceAuthorizationClient } from "better-auth/client/plugins";
@@ -12,21 +12,23 @@ import path from "path";
 import yoctoSpinner from "yocto-spinner";
 import * as z from "zod/v4";
 import { fetchUserFromAPI } from "../../../lib/api-client.js";
-import dotenv from "dotenv";
 import {
   clearStoredToken,
   getStoredToken,
   isTokenExpired,
   requireAuth,
   storeToken,
+  getStoredClientId,
+  storeClientId,
+  clearStoredClientId,
 } from "../../../lib/token.js";
 
-dotenv.config();
+// dotenv.config();
 
-const URL = process.env.BASE_URL;
-const CLIENT_ID = process.env.GITHUB_CLIENT_ID;
+const URL = "https://claude-code-topaz.vercel.app";
 export const CONFIG_DIR = path.join(os.homedir(), ".better-auth");
 export const TOKEN_FILE = path.join(CONFIG_DIR, "token.json");
+export const CLIENT_ID_FILE = path.join(CONFIG_DIR, "client-id.txt");
 
 export async function loginAction(opts) {
   const options = z.object({
@@ -35,9 +37,50 @@ export async function loginAction(opts) {
   });
 
   const serverUrl = options.serverUrl || URL;
-  const clientId = options.clientId || CLIENT_ID;
+  let clientId = options.clientId;
 
-  intro(chalk.bold("🔐 Auth CLI Login"));
+  // If not provided as an option, try to get from stored local config
+  if (!clientId) {
+    clientId = await getStoredClientId();
+  }
+
+  // If still no client ID, prompt the user to enter it
+  if (!clientId) {
+    intro(chalk.bold("🔐 Auth CLI Login"));
+    console.log(
+      chalk.cyan(
+        "\n📋 GitHub Client ID not found. Please enter it to proceed.\n",
+      ),
+    );
+
+    clientId = await text({
+      message: "Enter your GitHub Client ID:",
+      placeholder: "e.g., Ov23liXXXXXXXXXXXXX",
+      validate: (value) => {
+        if (!value || value.trim().length === 0) {
+          return "Client ID cannot be empty";
+        }
+        return undefined;
+      },
+    });
+
+    if (isCancel(clientId)) {
+      cancel("Login cancelled.");
+      process.exit(0);
+    }
+
+    // Store the client ID for future use
+    const stored = await storeClientId(clientId);
+    if (stored) {
+      console.log(
+        chalk.green(
+          `✓ Client ID saved locally at: ${chalk.gray(CLIENT_ID_FILE)}`,
+        ),
+      );
+    }
+  } else {
+    intro(chalk.bold("🔐 Auth CLI Login"));
+  }
 
   // TODO: CHANGE THIS WITH TOKEN MANAGEMENT UTILS
   const existingToken = await getStoredToken();
@@ -230,9 +273,9 @@ export async function logoutAction() {
     process.exit(0);
   }
 
-  const cleared = await clearStoredToken();
+  const clearedToken = await clearStoredToken();
 
-  if (cleared) {
+  if (clearedToken) {
     outro(chalk.green("Successfully logged out!"));
   } else {
     console.log(
@@ -262,6 +305,44 @@ export async function whoamiAction(opts) {
   }
 }
 
+export async function updateClientIdAction() {
+  intro(chalk.bold("🔄 Update GitHub Client ID"));
+
+  const currentClientId = await getStoredClientId();
+
+  if (currentClientId) {
+    console.log(
+      chalk.gray(
+        `\nCurrent Client ID: ${currentClientId.slice(0, 10)}...${currentClientId.slice(-5)}\n`,
+      ),
+    );
+  }
+
+  const newClientId = await text({
+    message: "Enter your new GitHub Client ID:",
+    placeholder: "e.g., Ov23liXXXXXXXXXXXXX",
+    validate: (value) => {
+      if (!value || value.trim().length === 0) {
+        return "Client ID cannot be empty";
+      }
+      return undefined;
+    },
+  });
+
+  if (isCancel(newClientId)) {
+    cancel("Update cancelled.");
+    process.exit(0);
+  }
+
+  const stored = await storeClientId(newClientId);
+  if (stored) {
+    outro(chalk.green(`✓ GitHub Client ID updated and saved locally!\n`));
+  } else {
+    console.log(chalk.red("Failed to update Client ID."));
+    process.exit(1);
+  }
+}
+
 export const login = new Command("login")
   .description("Login to your account")
   .option("--server-url <url>", "URL of the authentication server")
@@ -276,3 +357,7 @@ export const whoami = new Command("whoami")
   .description("Display information about the current user")
   .option("--server-url <url>", "URL of the authentication server")
   .action(whoamiAction);
+
+export const updateClientId = new Command("update-client-id")
+  .description("Update your GitHub Client ID")
+  .action(updateClientIdAction);

package/src/cli/main.js

@@ -1,10 +1,10 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 // import dotenv from "dotenv";
 import chalk from "chalk";
 import figlet from "figlet";
 import { Command } from "commander";
-import { login, logout, whoami } from "./commands/auth/login.js";
+import { login, logout, whoami, updateClientId } from "./commands/auth/login.js";
 import { wakeUp } from "./commands/ai/wakeUp.js";
 
 // dotenv.config();
@@ -30,6 +30,7 @@ async function main() {
     .addCommand(login)
     .addCommand(logout)
     .addCommand(whoami)
+    .addCommand(updateClientId)
     .addCommand(wakeUp);
 
   program.action(() => {

package/src/lib/token.js

@@ -1,6 +1,10 @@
 import chalk from "chalk";
 import fs from "node:fs/promises";
-import { CONFIG_DIR, TOKEN_FILE } from "../cli/commands/auth/login.js";
+import {
+  CONFIG_DIR,
+  TOKEN_FILE,
+  CLIENT_ID_FILE,
+} from "../cli/commands/auth/login.js";
 
 export async function getStoredToken() {
   try {
@@ -83,3 +87,50 @@ export async function requireAuth() {
 
   return token;
 }
+
+/**
+ * Get stored GitHub Client ID from local machine
+ * @returns {Promise<string|null>} The stored client ID or null if not found
+ */
+export async function getStoredClientId() {
+  try {
+    const data = await fs.readFile(CLIENT_ID_FILE, "utf-8");
+    return data.trim();
+  } catch (error) {
+    // File doesn't exist or can't be read
+    return null;
+  }
+}
+
+/**
+ * Store GitHub Client ID locally
+ * @param {string} clientId - The GitHub client ID to store
+ * @returns {Promise<boolean>} True if stored successfully
+ */
+export async function storeClientId(clientId) {
+  try {
+    // Ensure the config directory exists
+    await fs.mkdir(CONFIG_DIR, { recursive: true });
+
+    // Store client ID as plain text
+    await fs.writeFile(CLIENT_ID_FILE, clientId, "utf-8");
+    return true;
+  } catch (error) {
+    console.error(chalk.red("Failed to store client ID: "), error?.message);
+    return false;
+  }
+}
+
+/**
+ * Clear stored GitHub Client ID
+ * @returns {Promise<boolean>} True if cleared successfully
+ */
+export async function clearStoredClientId() {
+  try {
+    await fs.unlink(CLIENT_ID_FILE);
+    return true;
+  } catch (error) {
+    // File doesn't exist or can't be deleted
+    return false;
+  }
+}