@nestbox-ai/cli 1.0.25 → 1.0.27

package/src/commands/auth/login.ts

@@ -0,0 +1,184 @@
+import { Command } from 'commander';
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import open from 'open';
+import ora from 'ora';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { AuthApi, Configuration, OAuthLoginRequestDTOTypeEnum } from '@nestbox-ai/admin';
+import axios from 'axios';
+
+export function registerLoginCommand(program: Command): void {
+  program
+    .command('login <nestbox-domain>')
+    .description('Login using Google SSO')
+    .action(async (domain: string) => {
+      console.log('Login command triggered for domain:', domain);
+      const spinner = ora('Initiating Google login...').start();
+
+      try {
+        // Determine the protocol and construct the auth URL based on the provided domain
+        let authUrl;
+        if (domain.includes('localhost')) {
+          // Use HTTP for localhost and specific port
+          authUrl = `http://${domain}/cli/auth`;
+        } else {
+          // Use HTTPS for all other domains
+          authUrl = `https://${domain}/cli/auth`;
+        }
+
+        spinner.text = 'Opening browser for Google authentication...';
+
+        // Open the browser for authentication
+        await open(authUrl);
+        spinner.succeed('Browser opened for authentication');
+
+        // Prompt user to paste the combined token and API URL
+        const { combinedInput } = await inquirer.prompt<{ combinedInput: string }>([
+          {
+            type: 'input',
+            name: 'combinedInput',
+            message: 'After authenticating, please paste the data here:',
+            validate: (input) => input.trim().length > 0 || 'Input is required'
+          }
+        ]);
+
+        // Split the input by comma
+        const [accessToken, apiServerUrl] = combinedInput.split(',').map(item => item.trim());
+
+        if (!accessToken || !apiServerUrl) {
+          spinner.fail('Invalid input format. Expected: token,apiServerUrl');
+          return;
+        }
+
+        console.log(chalk.green('Credentials received. Extracting user information...'));
+
+        // Fetch user data from the token
+        let email = '';
+        let name = '';
+        let picture = '';
+        try {
+          // Try to decode JWT to get user data (email, name, picture, etc.)
+          const tokenParts = accessToken.split('.');
+          if (tokenParts.length === 3) {
+            // Base64 decode the payload part of JWT
+            const base64Payload = tokenParts[1].replace(/-/g, '+').replace(/_/g, '/');
+            const decodedPayload = Buffer.from(base64Payload, 'base64').toString('utf-8');
+            const tokenPayload = JSON.parse(decodedPayload);
+
+            // Extract user information
+            email = tokenPayload.email || '';
+            name = tokenPayload.name || '';
+            picture = tokenPayload.picture || '';
+          }
+        } catch (e) {
+          console.log(chalk.yellow('Could not decode token payload. Will prompt for email.'));
+        }
+
+        // If email couldn't be extracted from token, prompt user
+        if (!email) {
+          const response = await inquirer.prompt<{ email: string }>([
+            {
+              type: 'input',
+              name: 'email',
+              message: 'Enter your email address:',
+              validate: (input) => /\S+@\S+\.\S+/.test(input) || 'Please enter a valid email'
+            }
+          ]);
+          email = response.email;
+        }
+
+        spinner.start('Verifying access token...');
+
+        if (apiServerUrl && email && accessToken) {
+          // Verify the access token
+          const configuration = new Configuration({
+            basePath: apiServerUrl,
+            accessToken: accessToken,
+          });
+          const authApi = new AuthApi(configuration);
+          try {
+            const response = await authApi.authControllerOAuthLogin({
+              providerId: accessToken,
+              type: OAuthLoginRequestDTOTypeEnum.Google,
+              email,
+              profilePictureUrl: picture || '',
+            });
+            const authResponse = response.data;
+
+            // Save credentials to file
+            try {
+              // Create directory structure
+              const configDir = path.join(os.homedir(), '.config', '.nestbox');
+              if (!fs.existsSync(configDir)) {
+                fs.mkdirSync(configDir, { recursive: true });
+              }
+
+              // Create the file path
+              const fileName = `${email.replace('@', '_at_')}_${domain}.json`;
+              const filePath = path.join(configDir, fileName);
+
+              // Create credentials object
+              const credentials = {
+                domain,
+                email,
+                token: authResponse.token,
+                accessToken, // Save the original accessToken
+                apiServerUrl,
+                name,
+                picture,
+                timestamp: new Date().toISOString()
+              };
+
+              // Write to file
+              fs.writeFileSync(filePath, JSON.stringify(credentials, null, 2));
+
+              spinner.succeed('Authentication successful');
+              console.log(chalk.green(`Successfully logged in as ${email}`));
+              console.log(chalk.blue(`Credentials saved to: ${filePath}`));
+            } catch (fileError) {
+              spinner.warn('Authentication successful, but failed to save credentials file');
+              console.error(chalk.yellow('File error:'), fileError instanceof Error ? fileError.message : 'Unknown error');
+
+            }
+          } catch (authError) {
+            spinner.fail('Failed to verify access token');
+            if (axios.isAxiosError(authError) && authError.response) {
+              if (authError.response.data.message === "user.not_found") {
+                console.error(chalk.red('Authentication Error:'), "You need to register your email with the Nestbox platform");
+                const { openSignup } = await inquirer.prompt<{ openSignup: boolean }>([
+                  {
+                    type: 'confirm',
+                    name: 'openSignup',
+                    message: 'Would you like to open the signup page to register?',
+                    default: true
+                  }
+                ]);
+          
+                if (openSignup) {
+                  // Construct signup URL with the same protocol logic as login
+                  let signupUrl;
+                  if (domain.includes('localhost')) {
+                    signupUrl = `http://${domain}`;
+                  } else {
+                    signupUrl = `https://${domain}`;
+                  }
+                  
+                  console.log(chalk.blue(`Opening signup page: ${signupUrl}`));
+                  await open(signupUrl);
+              }
+            }
+            } else {
+              console.error(chalk.red('Authentication Error:'), authError instanceof Error ? authError.message : 'Unknown error');
+            }
+          }
+        } else {
+          spinner.fail('Missing required information for authentication');
+        }
+      } catch (error) {
+        spinner.fail('Authentication failed');
+        console.error(chalk.red('Error:'), error instanceof Error ? error.message : 'Unknown error');
+      }
+    });
+}

package/src/commands/auth/logout.ts

@@ -0,0 +1,110 @@
+import { Command } from 'commander';
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import { getAuthToken, listCredentials, removeCredentials } from '../../utils/auth';
+
+export function registerLogoutCommand(program: Command): void {
+  program
+    .command('logout [nestbox-domain]')
+    .description('Logout from Nestbox platform')
+    .action(async (domain?: string) => {
+      try {
+        const authToken = getAuthToken(domain);
+        if (!authToken) {
+          console.log(chalk.yellow('No authentication token found. Please log in first.'));
+          return;
+        }
+
+        // Function to remove all credential files for a domain
+        const removeCredentialFiles = (domain: string) => {
+          try {
+            const configDir = path.join(os.homedir(), '.config', '.nestbox');
+            if (!fs.existsSync(configDir)) {
+              return false;
+            }
+
+            // Sanitize domain for file matching
+            // Replace characters that are problematic in filenames
+            const sanitizedDomain = domain.replace(/:/g, '_');
+
+            // Get all files in the directory
+            const files = fs.readdirSync(configDir);
+
+            // Find and remove all files that match the domain
+            let removedCount = 0;
+            for (const file of files) {
+              // Check if the file matches any of the possible domain formats
+              if (
+                file.endsWith(`_${domain}.json`) ||
+                file.endsWith(`_${sanitizedDomain}.json`)
+              ) {
+                fs.unlinkSync(path.join(configDir, file));
+                removedCount++;
+              }
+            }
+
+            return removedCount > 0;
+          } catch (error) {
+            console.warn(chalk.yellow(`Warning: Could not remove credential files. ${error instanceof Error ? error.message : ''}`));
+            return false;
+          }
+        };
+
+        if (domain) {
+          // Logout from specific domain
+          // Remove credentials using utility function 
+          const removed = removeCredentials(domain);
+
+          // Also remove all credential files for this domain
+          const filesRemoved = removeCredentialFiles(domain);
+
+          if (removed || filesRemoved) {
+            console.log(chalk.green(`Successfully logged out from ${domain}`));
+          } else {
+            console.log(chalk.yellow(`No credentials found for ${domain}`));
+          }
+        } else {
+          // Ask which domain to logout from
+          const credentials = listCredentials();
+
+          if (credentials.length === 0) {
+            console.log(chalk.yellow('No credentials found'));
+            return;
+          }
+
+          // Group credentials by domain
+          const domains = Array.from(new Set(credentials.map(cred => cred.domain)));
+          const domainChoices = domains.map(domain => {
+            const accounts = credentials.filter(cred => cred.domain === domain);
+            return `${domain} (${accounts.length} account${accounts.length > 1 ? 's' : ''})`;
+          });
+
+          const { selected } = await inquirer.prompt<{ selected: string }>([
+            {
+              type: 'list',
+              name: 'selected',
+              message: 'Select domain to logout from:',
+              choices: domainChoices,
+            }
+          ]);
+
+          // Extract domain from the selected choice
+          const selectedDomain = selected.split(' ')[0];
+
+          // Remove credentials using utility function
+          removeCredentials(selectedDomain);
+
+          // Also remove all credential files for this domain
+          removeCredentialFiles(selectedDomain);
+
+          console.log(chalk.green(`Successfully logged out from ${selectedDomain}`));
+        }
+      } catch (error) {
+        const err = error as Error;
+        console.error(chalk.red('Error:'), err.message);
+      }
+    });
+}

package/src/commands/auth.ts

@@ -1,291 +1,12 @@
-import { Command } from 'commander';
-import chalk from 'chalk';
-import inquirer from 'inquirer';
-import open from 'open';
-import ora from 'ora';
-import fs from 'fs';
-import os from 'os';
-import path from 'path';
-import { getAuthToken, listCredentials, removeCredentials } from '../utils/auth';
-import { AuthApi, Configuration, OAuthLoginRequestDTOTypeEnum } from '@nestbox-ai/admin';
-import axios from 'axios';
-
+import { Command } from "commander";
+import { registerLoginCommand } from "./auth/login";
+import { registerLogoutCommand } from "./auth/logout";
 
+/**
+ * Register all auth-related commands
+ */
 export function registerAuthCommands(program: Command): void {
-  // Login command
-  program
-    .command('login <nestbox-domain>')
-    .description('Login using Google SSO')
-    .action(async (domain: string) => {
-      console.log('Login command triggered for domain:', domain);
-      const spinner = ora('Initiating Google login...').start();
-
-      try {
-        // Determine the protocol and construct the auth URL based on the provided domain
-        let authUrl;
-        if (domain.includes('localhost')) {
-          // Use HTTP for localhost and specific port
-          authUrl = `http://${domain}/cli/auth`;
-        } else {
-          // Use HTTPS for all other domains
-          authUrl = `https://${domain}/cli/auth`;
-        }
-
-        spinner.text = 'Opening browser for Google authentication...';
-
-        // Open the browser for authentication
-        await open(authUrl);
-        spinner.succeed('Browser opened for authentication');
-
-        // Prompt user to paste the combined token and API URL
-        const { combinedInput } = await inquirer.prompt<{ combinedInput: string }>([
-          {
-            type: 'input',
-            name: 'combinedInput',
-            message: 'After authenticating, please paste the data here:',
-            validate: (input) => input.trim().length > 0 || 'Input is required'
-          }
-        ]);
-
-        // Split the input by comma
-        const [accessToken, apiServerUrl] = combinedInput.split(',').map(item => item.trim());
-
-        if (!accessToken || !apiServerUrl) {
-          spinner.fail('Invalid input format. Expected: token,apiServerUrl');
-          return;
-        }
-
-        console.log(chalk.green('Credentials received. Extracting user information...'));
-
-        // Fetch user data from the token
-        let email = '';
-        let name = '';
-        let picture = '';
-        try {
-          // Try to decode JWT to get user data (email, name, picture, etc.)
-          const tokenParts = accessToken.split('.');
-          if (tokenParts.length === 3) {
-            // Base64 decode the payload part of JWT
-            const base64Payload = tokenParts[1].replace(/-/g, '+').replace(/_/g, '/');
-            const decodedPayload = Buffer.from(base64Payload, 'base64').toString('utf-8');
-            const tokenPayload = JSON.parse(decodedPayload);
-
-            // Extract user information
-            email = tokenPayload.email || '';
-            name = tokenPayload.name || '';
-            picture = tokenPayload.picture || '';
-          }
-        } catch (e) {
-          console.log(chalk.yellow('Could not decode token payload. Will prompt for email.'));
-        }
-
-        // If email couldn't be extracted from token, prompt user
-        if (!email) {
-          const response = await inquirer.prompt<{ email: string }>([
-            {
-              type: 'input',
-              name: 'email',
-              message: 'Enter your email address:',
-              validate: (input) => /\S+@\S+\.\S+/.test(input) || 'Please enter a valid email'
-            }
-          ]);
-          email = response.email;
-        }
-
-        spinner.start('Verifying access token...');
-
-        if (apiServerUrl && email && accessToken) {
-          // Verify the access token
-          const configuration = new Configuration({
-            basePath: apiServerUrl,
-            accessToken: accessToken,
-          });
-          const authApi = new AuthApi(configuration);
-          try {
-            const response = await authApi.authControllerOAuthLogin({
-              providerId: accessToken,
-              type: OAuthLoginRequestDTOTypeEnum.Google,
-              email,
-              profilePictureUrl: picture || '',
-            });
-            const authResponse = response.data;
-
-            // Save credentials to file
-            try {
-              // Create directory structure
-              const configDir = path.join(os.homedir(), '.config', '.nestbox');
-              if (!fs.existsSync(configDir)) {
-                fs.mkdirSync(configDir, { recursive: true });
-              }
-
-              // Create the file path
-              const fileName = `${email.replace('@', '_at_')}_${domain}.json`;
-              const filePath = path.join(configDir, fileName);
-
-              // Create credentials object
-              const credentials = {
-                domain,
-                email,
-                token: authResponse.token,
-                accessToken, // Save the original accessToken
-                apiServerUrl,
-                name,
-                picture,
-                timestamp: new Date().toISOString()
-              };
-
-              // Write to file
-              fs.writeFileSync(filePath, JSON.stringify(credentials, null, 2));
-
-              spinner.succeed('Authentication successful');
-              console.log(chalk.green(`Successfully logged in as ${email}`));
-              console.log(chalk.blue(`Credentials saved to: ${filePath}`));
-            } catch (fileError) {
-              spinner.warn('Authentication successful, but failed to save credentials file');
-              console.error(chalk.yellow('File error:'), fileError instanceof Error ? fileError.message : 'Unknown error');
-
-            }
-          } catch (authError) {
-            spinner.fail('Failed to verify access token');
-            if (axios.isAxiosError(authError) && authError.response) {
-              if (authError.response.data.message === "user.not_found") {
-                console.error(chalk.red('Authentication Error:'), "You need to register your email with the Nestbox platform");
-                const { openSignup } = await inquirer.prompt<{ openSignup: boolean }>([
-                  {
-                    type: 'confirm',
-                    name: 'openSignup',
-                    message: 'Would you like to open the signup page to register?',
-                    default: true
-                  }
-                ]);
-          
-                if (openSignup) {
-                  // Construct signup URL with the same protocol logic as login
-                  let signupUrl;
-                  if (domain.includes('localhost')) {
-                    signupUrl = `http://${domain}`;
-                  } else {
-                    signupUrl = `https://${domain}`;
-                  }
-                  
-                  console.log(chalk.blue(`Opening signup page: ${signupUrl}`));
-                  await open(signupUrl);
-              }
-            }
-            } else {
-              console.error(chalk.red('Authentication Error:'), authError instanceof Error ? authError.message : 'Unknown error');
-            }
-          }
-        } else {
-          spinner.fail('Missing required information for authentication');
-        }
-      } catch (error) {
-        spinner.fail('Authentication failed');
-        console.error(chalk.red('Error:'), error instanceof Error ? error.message : 'Unknown error');
-      }
-    });
-
-
-
-  // Logout command
-  program
-    .command('logout [nestbox-domain]')
-    .description('Logout from Nestbox platform')
-    .action(async (domain?: string) => {
-      try {
-        const authToken = getAuthToken(domain);
-        if (!authToken) {
-          console.log(chalk.yellow('No authentication token found. Please log in first.'));
-          return;
-        }
-
-        // Function to remove all credential files for a domain
-        const removeCredentialFiles = (domain: string) => {
-          try {
-            const configDir = path.join(os.homedir(), '.config', '.nestbox');
-            if (!fs.existsSync(configDir)) {
-              return false;
-            }
-
-            // Sanitize domain for file matching
-            // Replace characters that are problematic in filenames
-            const sanitizedDomain = domain.replace(/:/g, '_');
-
-            // Get all files in the directory
-            const files = fs.readdirSync(configDir);
-
-            // Find and remove all files that match the domain
-            let removedCount = 0;
-            for (const file of files) {
-              // Check if the file matches any of the possible domain formats
-              if (
-                file.endsWith(`_${domain}.json`) ||
-                file.endsWith(`_${sanitizedDomain}.json`)
-              ) {
-                fs.unlinkSync(path.join(configDir, file));
-                removedCount++;
-              }
-            }
-
-            return removedCount > 0;
-          } catch (error) {
-            console.warn(chalk.yellow(`Warning: Could not remove credential files. ${error instanceof Error ? error.message : ''}`));
-            return false;
-          }
-        };
-
-        if (domain) {
-          // Logout from specific domain
-          // Remove credentials using utility function 
-          const removed = removeCredentials(domain);
-
-          // Also remove all credential files for this domain
-          const filesRemoved = removeCredentialFiles(domain);
-
-          if (removed || filesRemoved) {
-            console.log(chalk.green(`Successfully logged out from ${domain}`));
-          } else {
-            console.log(chalk.yellow(`No credentials found for ${domain}`));
-          }
-        } else {
-          // Ask which domain to logout from
-          const credentials = listCredentials();
-
-          if (credentials.length === 0) {
-            console.log(chalk.yellow('No credentials found'));
-            return;
-          }
-
-          // Group credentials by domain
-          const domains = Array.from(new Set(credentials.map(cred => cred.domain)));
-          const domainChoices = domains.map(domain => {
-            const accounts = credentials.filter(cred => cred.domain === domain);
-            return `${domain} (${accounts.length} account${accounts.length > 1 ? 's' : ''})`;
-          });
-
-          const { selected } = await inquirer.prompt<{ selected: string }>([
-            {
-              type: 'list',
-              name: 'selected',
-              message: 'Select domain to logout from:',
-              choices: domainChoices,
-            }
-          ]);
-
-          // Extract domain from the selected choice
-          const selectedDomain = selected.split(' ')[0];
-
-          // Remove credentials using utility function
-          removeCredentials(selectedDomain);
-
-          // Also remove all credential files for this domain
-          removeCredentialFiles(selectedDomain);
-
-          console.log(chalk.green(`Successfully logged out from ${selectedDomain}`));
-        }
-      } catch (error) {
-        const err = error as Error;
-        console.error(chalk.red('Error:'), err.message);
-      }
-    });
+  // Register auth commands directly on the program (not as subcommands)
+  registerLoginCommand(program);
+  registerLogoutCommand(program);
 }

package/src/commands/project/add.ts

@@ -0,0 +1,47 @@
+import { Command } from "commander";
+import chalk from "chalk";
+import { readNestboxConfig, writeNestboxConfig } from "./config";
+import { createApis } from "./apiUtils";
+
+export function registerAddCommand(projectCommand: Command): void {
+  projectCommand
+    .command('add <project-name> [alias]')
+    .description('Add a project with optional alias')
+    .action((projectName: string, alias?: string) => {
+      try {
+        const apis = createApis();
+        
+        const config = readNestboxConfig();
+        config.projects = config.projects || {};
+
+        // Check if the project already exists
+        if (config.projects[projectName]) {
+          console.error(chalk.red(`Project '${projectName}' already exists.`));
+          return;
+        }
+        // Check if the alias already exists
+        if (alias && config.projects[alias]) {
+          console.error(chalk.red(`Alias '${alias}' already exists.`));
+          return;
+        }
+
+        if (alias) {
+          config.projects[alias] = projectName;
+          console.log(chalk.green(`Added project '${projectName}' with alias '${alias}'`));
+        } else {
+          config.projects[projectName] = projectName;
+          console.log(chalk.green(`Added project '${projectName}'`));
+        }
+
+        // If this is the first project, set it as default
+        if (!config.projects.default) {
+          config.projects.default = projectName;
+          console.log(chalk.green(`Set '${projectName}' as the default project`));
+        }
+
+        writeNestboxConfig(config);
+      } catch (error) {
+        console.error(chalk.red('Error adding project:'), error instanceof Error ? error.message : 'Unknown error');
+      }
+    });
+}

package/src/commands/project/apiUtils.ts

@@ -0,0 +1,20 @@
+import { Configuration, ProjectsApi } from "@nestbox-ai/admin";
+import { setupAuthAndConfig, type AuthResult } from "../../utils/api";
+
+export interface ApiInstances {
+  projectsApi: ProjectsApi;
+}
+
+/**
+ * Create API instances with current authentication using setupAuthAndConfig
+ */
+export function createApis(): ApiInstances {
+  const authResult = setupAuthAndConfig();
+  if (!authResult) {
+    throw new Error('No authentication token found. Please log in first.');
+  }
+
+  return {
+    projectsApi: new ProjectsApi(authResult.configuration),
+  };
+}