@faable/faable 1.5.32 → 1.6.0

package/dist/api/auth.js

@@ -1,11 +1,24 @@
 import axios from 'axios';
+import os from 'os';
 
 const api = axios.create({ baseURL: "https://faable.auth.faable.link" });
 const CLIENT_ID = "c879023b-e34f-4b0c-a262-210e556bc2e4";
+const PLATFORM_LABELS = {
+    darwin: "macOS",
+    win32: "Windows",
+    linux: "Linux",
+};
+// Human-friendly device name shown on the auth confirm page so the user can
+// recognise which device they are authorising, e.g. "marcs-mbp (macOS)".
+function deviceName() {
+    const platform = PLATFORM_LABELS[os.platform()] || os.platform();
+    return `${os.hostname()} (${platform})`;
+}
 async function getDeviceCode() {
     const res = await api.post(`/oauth/device/code`, {
         client_id: CLIENT_ID,
         scope: "openid email profile offline_access",
+        device_name: deviceName(),
     });
     return res.data;
 }

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

@@ -3,6 +3,7 @@ import { getDeviceCode, getDeviceToken, getMe } from '../../api/auth.js';
 import { CredentialsStore } from '../../lib/CredentialsStore.js';
 import open from 'open';
 import ora from 'ora';
+import prompts from 'prompts';
 import { log } from '../../log.js';
 
 const wait = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -41,6 +42,26 @@ const login = {
     handler: async (args) => {
         const { apikey, token } = args;
         const store = new CredentialsStore();
+        // Interactive flow only: if there's already a session, confirm before
+        // re-authenticating. Flag-based logins (--apikey/--token) are an explicit
+        // re-auth (and often scripted), so they skip the prompt and overwrite.
+        if (!apikey && !token) {
+            const existing = await store.loadCredentials();
+            if (existing && (existing.token || existing.apikey)) {
+                const who = existing.email ? ` as ${existing.email}` : "";
+                const { proceed } = await prompts({
+                    type: "confirm",
+                    name: "proceed",
+                    message: `You are already logged in${who}. Log out and log in again?`,
+                    initial: false,
+                });
+                if (!proceed) {
+                    log.info("Keeping current session. Run `faable logout` to log out.");
+                    return;
+                }
+                await store.deleteCredentials();
+            }
+        }
         if (apikey) {
             log.info("Logging in with API Key...");
             const tempApi = FaableApi.create({ auth: { apikey }, authStrategy: (await import('../../api/strategies/apikey.strategy.js')).apikey_strategy });

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.32",
+  "version": "1.6.0",
   "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 };