faces-cli 1.5.8 → 1.5.9

package/dist/commands/auth/whoami.js

@@ -1,24 +1,90 @@
 import { BaseCommand } from '../../base.js';
-import { FacesAPIError } from '../../client.js';
+import { FacesClient, FacesAPIError } from '../../client.js';
+import { resolveBaseUrl, resolveToken, resolveApiKey } from '../../config.js';
 export default class AuthWhoami extends BaseCommand {
-    static description = 'Print current user profile';
+    static description = 'Print current user profile and auth diagnostic';
     static flags = {
         ...BaseCommand.baseFlags,
     };
     async run() {
         const { flags } = await this.parse(AuthWhoami);
-        const client = this.makeClient(flags);
-        let data;
+        const baseUrl = resolveBaseUrl(flags['base-url']);
+        const token = resolveToken(flags.token);
+        const apiKey = resolveApiKey(flags['api-key']);
+        const json = this.jsonEnabled();
+        const diag = {
+            base_url: baseUrl,
+            jwt_configured: Boolean(token),
+            api_key_configured: Boolean(apiKey),
+            api_key_prefix: apiKey ? apiKey.slice(0, 12) + '...' : null,
+        };
+        // Try API key first (priority), then JWT
+        const credential = apiKey || token;
+        const method = apiKey ? 'api_key' : token ? 'jwt' : null;
+        if (!credential) {
+            diag.authenticated = false;
+            diag.auth_method = null;
+            diag.error = 'No credentials configured (no API key, no JWT)';
+            if (!json) {
+                process.stderr.write('Auth diagnostic:\n');
+                process.stderr.write(`  base_url:       ${baseUrl}\n`);
+                process.stderr.write(`  jwt:            not configured\n`);
+                process.stderr.write(`  api_key:        not configured\n`);
+                process.stderr.write(`  status:         not authenticated\n`);
+            }
+            return diag;
+        }
+        const client = new FacesClient(baseUrl, token, apiKey);
         try {
-            data = await client.get('/auth/me');
+            const data = await client.get('/auth/me');
+            const inner = (data.data ?? data);
+            diag.authenticated = true;
+            diag.auth_method = method;
+            diag.user_id = inner.user_id;
+            diag.username = inner.username;
+            diag.email = inner.email;
+            diag.name = inner.name;
+            diag.is_admin = inner.is_admin;
+            if (!json) {
+                process.stderr.write('Auth diagnostic:\n');
+                process.stderr.write(`  base_url:       ${baseUrl}\n`);
+                process.stderr.write(`  jwt:            ${token ? 'configured' : 'not configured'}\n`);
+                process.stderr.write(`  api_key:        ${apiKey ? diag.api_key_prefix : 'not configured'}\n`);
+                process.stderr.write(`  auth_method:    ${method}\n`);
+                process.stderr.write(`  status:         authenticated\n`);
+                process.stderr.write('\n');
+                process.stderr.write(`  user_id:        ${inner.user_id}\n`);
+                process.stderr.write(`  username:       ${inner.username}\n`);
+                process.stderr.write(`  email:          ${inner.email}\n`);
+                process.stderr.write(`  name:           ${inner.name}\n`);
+            }
+            return diag;
         }
         catch (err) {
-            if (err instanceof FacesAPIError)
-                this.error(`Error (${err.statusCode}): ${err.message}`);
-            throw err;
+            const errMsg = err instanceof FacesAPIError ? `${err.statusCode}: ${err.message}` : String(err);
+            diag.authenticated = false;
+            diag.auth_method = method;
+            diag.error = errMsg;
+            // If API key failed, also report JWT state
+            if (method === 'api_key' && token) {
+                diag.jwt_status = 'configured but not tried (API key takes priority)';
+            }
+            if (method === 'jwt') {
+                diag.jwt_status = 'failed';
+                if (apiKey) {
+                    diag.api_key_status = 'configured but not valid for this endpoint';
+                }
+            }
+            if (!json) {
+                process.stderr.write('Auth diagnostic:\n');
+                process.stderr.write(`  base_url:       ${baseUrl}\n`);
+                process.stderr.write(`  jwt:            ${token ? 'configured' : 'not configured'}\n`);
+                process.stderr.write(`  api_key:        ${apiKey ? diag.api_key_prefix : 'not configured'}\n`);
+                process.stderr.write(`  auth_method:    ${method}\n`);
+                process.stderr.write(`  status:         failed\n`);
+                process.stderr.write(`  error:          ${errMsg}\n`);
+            }
+            return diag;
         }
-        if (!this.jsonEnabled())
-            this.printHuman(data);
-        return data;
     }
 }

package/dist/commands/config/set.js

@@ -12,6 +12,10 @@ export default class ConfigSet extends BaseCommand {
     };
     async run() {
         const { args } = await this.parse(ConfigSet);
+        // Validate api_key prefix
+        if (args.key === 'api_key' && args.value && !args.value.startsWith('sk-faces-')) {
+            this.error('Faces API keys start with sk-faces-. This does not look like a Faces API key.');
+        }
         setConfigKey(args.key, args.value);
         this.log(`Set ${args.key}.`);
         return { key: args.key, status: 'set' };