@promptcellar/pc 0.2.0 → 0.3.0

package/bin/pc.js

@@ -13,11 +13,12 @@ import { update } from '../src/commands/update.js';
 program
   .name('pc')
   .description('PromptCellar CLI - sync prompts between your terminal and the cloud')
-  .version('0.1.0');
+  .version('0.3.0');
 
 program
   .command('login')
-  .description('Authenticate with PromptCellar')
+  .description('Authenticate with PromptCellar via browser')
+  .option('-u, --url <url>', 'API URL (for self-hosted instances)')
   .action(login);
 
 program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@promptcellar/pc",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "CLI for PromptCellar - sync prompts between your terminal and the cloud",
   "type": "module",
   "main": "src/index.js",
@@ -40,6 +40,7 @@
     "ora": "^8.0.0",
     "inquirer": "^9.2.0",
     "socket.io-client": "^4.6.0",
-    "node-fetch": "^3.3.0"
+    "node-fetch": "^3.3.0",
+    "open": "^10.0.0"
   }
 }

package/src/commands/login.js

@@ -1,56 +1,127 @@
-import inquirer from 'inquirer';
 import ora from 'ora';
 import chalk from 'chalk';
-import { setApiKey, setApiUrl, isLoggedIn } from '../lib/config.js';
-import { testConnection } from '../lib/api.js';
+import open from 'open';
+import { setApiKey, setApiUrl, isLoggedIn, getApiUrl } from '../lib/config.js';
 
-export async function login() {
-  if (isLoggedIn()) {
-    const { overwrite } = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'overwrite',
-      message: 'Already logged in. Replace existing credentials?',
-      default: false
-    }]);
-
-    if (!overwrite) {
-      console.log('Login cancelled.');
-      return;
-    }
+const DEFAULT_API_URL = 'https://prompts.weldedanvil.com';
+
+async function initiateDeviceAuth(apiUrl) {
+  const response = await fetch(`${apiUrl}/auth/device`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ device_name: getDeviceName() })
+  });
+
+  if (!response.ok) {
+    throw new Error('Failed to initiate device authentication');
   }
 
-  const answers = await inquirer.prompt([
-    {
-      type: 'input',
-      name: 'apiKey',
-      message: 'Enter your PromptCellar API key:',
-      validate: (input) => {
-        if (!input.trim()) return 'API key is required';
-        if (!input.startsWith('pk_')) return 'Invalid API key format (should start with pk_)';
-        return true;
-      }
-    },
-    {
-      type: 'input',
-      name: 'apiUrl',
-      message: 'API URL (press enter for default):',
-      default: 'https://prompts.weldedanvil.com'
+  return response.json();
+}
+
+async function pollForApproval(apiUrl, deviceCode, interval, expiresIn) {
+  const startTime = Date.now();
+  const expiresAt = startTime + (expiresIn * 1000);
+
+  while (Date.now() < expiresAt) {
+    await sleep(interval * 1000);
+
+    const response = await fetch(`${apiUrl}/auth/device/poll`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ device_code: deviceCode })
+    });
+
+    const data = await response.json();
+
+    if (response.ok && data.access_token) {
+      return data;
+    }
+
+    if (data.error === 'authorization_pending') {
+      continue;
+    }
+
+    if (data.error === 'expired_token') {
+      throw new Error('Authorization request expired. Please try again.');
     }
-  ]);
 
-  const spinner = ora('Testing connection...').start();
+    if (data.error === 'access_denied') {
+      throw new Error('Authorization denied.');
+    }
+  }
+
+  throw new Error('Authorization request timed out. Please try again.');
+}
 
-  setApiKey(answers.apiKey.trim());
-  setApiUrl(answers.apiUrl.trim());
+function getDeviceName() {
+  const os = process.platform;
+  const hostname = process.env.HOSTNAME || process.env.COMPUTERNAME || 'Unknown';
 
-  const result = await testConnection();
+  const osNames = {
+    darwin: 'macOS',
+    linux: 'Linux',
+    win32: 'Windows'
+  };
+
+  return `${osNames[os] || os} - ${hostname}`;
+}
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+export async function login(options) {
+  const apiUrl = options?.url || DEFAULT_API_URL;
+
+  if (isLoggedIn()) {
+    console.log(chalk.yellow('Already logged in.'));
+    console.log('Run ' + chalk.cyan('pc logout') + ' first to switch accounts.\n');
+    return;
+  }
+
+  console.log(chalk.bold('\nPromptCellar CLI Login\n'));
+
+  const spinner = ora('Initiating login...').start();
+
+  try {
+    // Step 1: Request device code
+    const authData = await initiateDeviceAuth(apiUrl);
+    spinner.stop();
+
+    // Step 2: Show code and open browser
+    console.log(chalk.bold('Your verification code:\n'));
+    console.log(chalk.cyan.bold(`    ${authData.user_code}\n`));
+    console.log('Opening your browser to authorize this device...\n');
+    console.log(chalk.dim(`If the browser doesn't open, visit: ${authData.verification_url}\n`));
+
+    // Open browser with the code pre-filled
+    const verifyUrl = `${authData.verification_url}?code=${authData.user_code}`;
+    await open(verifyUrl).catch(() => {
+      // Browser failed to open, user will have to do it manually
+    });
+
+    // Step 3: Poll for approval
+    spinner.start('Waiting for authorization...');
+
+    const result = await pollForApproval(
+      apiUrl,
+      authData.device_code,
+      authData.interval,
+      authData.expires_in
+    );
+
+    // Step 4: Save credentials
+    setApiKey(result.access_token);
+    setApiUrl(apiUrl);
 
-  if (result.success) {
     spinner.succeed(chalk.green('Logged in successfully!'));
-    console.log('\nRun ' + chalk.cyan('pc setup') + ' to configure auto-capture for your CLI tools.');
-  } else {
-    spinner.fail(chalk.red('Connection failed: ' + result.error));
-    console.log('Check your API key and try again.');
+    console.log(`\nWelcome, ${chalk.cyan(result.user_email)}!`);
+    console.log('\nRun ' + chalk.cyan('pc setup') + ' to configure auto-capture for your CLI tools.\n');
+
+  } catch (error) {
+    spinner.fail(chalk.red('Login failed: ' + error.message));
+    console.log('\nPlease try again or visit ' + chalk.cyan(apiUrl) + ' to sign up.\n');
   }
 }