d-drive-cli 1.1.0 → 1.1.2

package/README.md

@@ -4,32 +4,10 @@ Command-line tool for D-Drive cloud storage.
 
 ## Installation
 
-### Option 1: NPM (Coming Soon)
 ```bash
 npm install -g d-drive-cli
 ```
 
-### Option 2: Local Installation (Current)
-```bash
-# Clone the repository
-git clone https://github.com/jasonzli-DEV/D-Drive.git
-cd D-Drive/cli
-
-# Build and install globally
-npm install
-npm run build
-npm install -g .
-
-# Verify installation
-d-drive --version
-```
-
-### Option 3: Direct from Repository
-```bash
-# Install directly from GitHub (once published)
-npm install -g jasonzli-DEV/D-Drive/cli
-```
-
 ## Configuration
 
 First, configure your API key:

package/dist/commands/config.js

@@ -20,21 +20,26 @@ async function configCommand(options) {
     if (options.key) {
         const spinner = (0, ora_1.default)('Validating API key...').start();
         try {
-            // Test the API key by calling the /auth/me endpoint
+            // Normalize and test the API key by calling the /auth/me endpoint
             const config = (0, config_1.getConfig)();
             const apiUrl = options.url || config.apiUrl || 'http://localhost:5000/api';
-            const response = await axios_1.default.get(`${apiUrl}/auth/me`, {
+            // Accept keys entered with or without the `dd_` prefix, and strip any accidental "Bearer " prefix
+            const rawKey = options.key.replace(/^Bearer\s+/i, '').trim();
+            const normalizedKey = rawKey.startsWith('dd_') ? rawKey : `dd_${rawKey}`;
+            // Validate API key by calling a protected endpoint that accepts API keys (authenticate middleware)
+            const validateUrl = apiUrl.replace(/\/$/, '') + '/api-keys';
+            const response = await axios_1.default.get(validateUrl, {
                 headers: {
-                    Authorization: `Bearer ${options.key}`,
+                    Authorization: `Bearer ${normalizedKey}`,
                 },
                 timeout: 10000,
             });
-            if (response.status === 200 && response.data) {
-                (0, config_1.setConfig)('apiKey', options.key);
+            if (response.status === 200) {
+                (0, config_1.setConfig)('apiKey', normalizedKey);
                 if (options.url) {
                     (0, config_1.setConfig)('apiUrl', options.url);
                 }
-                spinner.succeed(chalk_1.default.green(`✓ API key validated and saved! Authenticated as: ${response.data.user?.discordUsername || 'User'}`));
+                spinner.succeed(chalk_1.default.green('✓ API key validated and saved!'));
             }
             else {
                 spinner.fail(chalk_1.default.red('✗ Invalid API key'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "d-drive-cli",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "D-Drive CLI tool for developers",
   "main": "dist/index.js",
   "bin": {

package/src/commands/config.ts

@@ -23,23 +23,28 @@ export async function configCommand(options: ConfigOptions) {
     const spinner = ora('Validating API key...').start();
     
     try {
-      // Test the API key by calling the /auth/me endpoint
+      // Normalize and test the API key by calling the /auth/me endpoint
       const config = getConfig();
       const apiUrl = options.url || config.apiUrl || 'http://localhost:5000/api';
-      
-      const response = await axios.get(`${apiUrl}/auth/me`, {
+
+      // Accept keys entered with or without the `dd_` prefix, and strip any accidental "Bearer " prefix
+      const rawKey = options.key.replace(/^Bearer\s+/i, '').trim();
+      const normalizedKey = rawKey.startsWith('dd_') ? rawKey : `dd_${rawKey}`;
+
+      // Validate API key by calling a protected endpoint that accepts API keys (authenticate middleware)
+      const validateUrl = apiUrl.replace(/\/$/, '') + '/api-keys';
+      const response = await axios.get(validateUrl, {
         headers: {
-          Authorization: `Bearer ${options.key}`,
+          Authorization: `Bearer ${normalizedKey}`,
         },
         timeout: 10000,
       });
-
-      if (response.status === 200 && response.data) {
-        setConfig('apiKey', options.key);
+      if (response.status === 200) {
+        setConfig('apiKey', normalizedKey);
         if (options.url) {
           setConfig('apiUrl', options.url);
         }
-        spinner.succeed(chalk.green(`✓ API key validated and saved! Authenticated as: ${response.data.user?.discordUsername || 'User'}`));
+        spinner.succeed(chalk.green('✓ API key validated and saved!'));
       } else {
         spinner.fail(chalk.red('✗ Invalid API key'));
         process.exit(1);