@faable/faable 1.5.31 → 1.5.33

package/dist/api/auth.js

@@ -13,5 +13,14 @@ async function getDeviceToken(device_code) {
     const res = await api.post(`/oauth/token`, { device_code, client_id: CLIENT_ID, grant_type: "urn:ietf:params:oauth:grant-type:device_code" });
     return res.data;
 }
+// Validate a device-flow access token against the Faable Auth server. The token
+// is issued by the auth server, so it must be introspected there — NOT against
+// the deploy API (api.faable.com), which has no /me route and would 404.
+async function getMe(access_token) {
+    const res = await api.get(`/me`, {
+        headers: { Authorization: `Bearer ${access_token}` },
+    });
+    return res.data;
+}
 
-export { getDeviceCode, getDeviceToken };
+export { getDeviceCode, getDeviceToken, getMe };

package/dist/commands/deploy/index.js

@@ -29,6 +29,10 @@ const deploy = {
         const workdir = args.workdir || process.cwd();
         const ctx = await context();
         const { api } = ctx;
+        if (!api) {
+            log.error("❌ Not logged in. Run 'faable login' first.");
+            process.exit(1);
+        }
         // Resolve runtime
         const { runtime } = await runtime_detection(workdir);
         // app_id resolution (the user never has to look one up):

package/dist/commands/link/index.js

@@ -61,6 +61,10 @@ const link = {
             }
         }
         const { api } = await context();
+        if (!api) {
+            log.error("❌ Not logged in. Run 'faable login' first.");
+            process.exit(1);
+        }
         log.info("Checking local git repository...");
         const gitUrl = await getGitRemoteUrl(workdir);
         const apps = await api.list();

package/dist/commands/login/index.js

@@ -1,7 +1,6 @@
 import { FaableApi } from '../../api/FaableApi.js';
-import { getDeviceCode, getDeviceToken } from '../../api/auth.js';
+import { getDeviceCode, getDeviceToken, getMe } from '../../api/auth.js';
 import { CredentialsStore } from '../../lib/CredentialsStore.js';
-import { bearer_strategy } from '../../api/strategies/bearer.strategy.js';
 import open from 'open';
 import ora from 'ora';
 import { log } from '../../log.js';
@@ -123,11 +122,9 @@ const login = {
                     const { access_token } = await getDeviceToken(device_code);
                     if (access_token) {
                         spinner.stop();
-                        const tempApi = FaableApi.create({
-                            auth: { token: access_token },
-                            authStrategy: bearer_strategy,
-                        });
-                        const me = await tempApi.getMe();
+                        // Validate the freshly issued token against the Auth server (it
+                        // issued the token). The deploy API has no /me route.
+                        const me = await getMe(access_token);
                         await store.saveCredentials({ token: access_token, email: me.email });
                         log.info(`✅ Successfully logged in as ${me.email}`);
                         return;

package/dist/commands/whoami/index.js

@@ -1,17 +1,29 @@
 import { log } from '../../log.js';
-import { context } from '../../api/context.js';
+import { getMe } from '../../api/auth.js';
+import { CredentialsStore } from '../../lib/CredentialsStore.js';
 
 const whoami = {
     command: "whoami",
     describe: "Display the current logged in user",
     handler: async () => {
-        const { api } = await context();
-        if (!api) {
+        const store = new CredentialsStore();
+        const config = await store.loadCredentials();
+        // Bearer token from the environment (CI) or a local `faable login`.
+        const token = process.env.FAABLE_TOKEN || config?.token;
+        if (!token) {
+            // API-key sessions can't be introspected at the auth server's /me; fall
+            // back to the email captured at login time.
+            if (config?.apikey && config.email) {
+                log.info(`Logged in as: ${config.email} (API key)`);
+                return;
+            }
             log.error("❌ Not logged in. Run 'faable login' first.");
             process.exit(1);
         }
         try {
-            const me = await api.getMe();
+            // Validate against the Auth server (it issued the token); the deploy API
+            // has no /me route.
+            const me = await getMe(token);
             log.info(`Logged in as: ${me.email}`);
         }
         catch {

package/dist/index.js

@@ -1,7 +1,6 @@
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import { deploy } from './commands/deploy/index.js';
-import { init } from './commands/init/index.js';
 import { link } from './commands/link/index.js';
 import { login } from './commands/login/index.js';
 import { logout } from './commands/logout/index.js';
@@ -34,7 +33,6 @@ yg.scriptName('faable')
     .command(login)
     .command(logout)
     .command(whoami)
-    .command(init)
     .command(link)
     .demandCommand(1)
     .help()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faable/faable",
-  "version": "1.5.31",
+  "version": "1.5.33",
   "main": "dist/index.js",
   "license": "MIT",
   "author": "Marc Pomar <marc@faable.com>",

package/dist/commands/init/index.js

@@ -1,35 +0,0 @@
-import prompts from 'prompts';
-import { CredentialsStore } from '../../lib/CredentialsStore.js';
-
-const init = {
-    command: 'init',
-    describe: 'Initialize Faable with API Key',
-    builder: yargs => {
-        return yargs.showHelpOnFail(false);
-    },
-    handler: async () => {
-        const store = new CredentialsStore();
-        const creds = await store.loadCredentials();
-        if (creds?.apikey) {
-            const { overwrite } = await prompts({
-                type: 'confirm',
-                name: 'overwrite',
-                message: 'An API key already exists. Do you want to overwrite it?',
-                initial: false
-            });
-            if (!overwrite) {
-                return;
-            }
-        }
-        const { apikey } = await prompts([
-            {
-                type: 'text',
-                name: 'apikey',
-                message: 'What is your Faable ApiKey?'
-            }
-        ]);
-        await store.saveCredentials({ apikey });
-    }
-};
-
-export { init };