@faable/faable 1.5.22 → 1.5.23

package/dist/api/FaableApi.js

@@ -69,12 +69,6 @@ class FaableApi {
     async updateApp(app_id, params) {
         return data(this.client.post(`/app/${app_id}`, params));
     }
-    async getDeviceCode() {
-        return data(this.client.post(`/auth/device/code`));
-    }
-    async getDeviceToken(device_code) {
-        return data(this.client.post(`/auth/device/token`, { device_code }));
-    }
     async getMe() {
         return data(this.client.get(`/auth/me`));
     }

package/dist/api/auth.js

@@ -0,0 +1,17 @@
+import axios from 'axios';
+
+const api = axios.create({ baseURL: "https://faable.auth.faable.link" });
+const CLIENT_ID = "c879023b-e34f-4b0c-a262-210e556bc2e4";
+async function getDeviceCode() {
+    const res = await api.post(`/oauth/device/code`, {
+        client_id: CLIENT_ID,
+        scope: "openid email profile offline_access",
+    });
+    return res.data;
+}
+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;
+}
+
+export { getDeviceCode, getDeviceToken };

package/dist/commands/init/index.js

@@ -1,22 +1,35 @@
-import { writeGithubAction } from './writeGithubAction.js';
+import prompts from 'prompts';
+import { CredentialsStore } from '../../lib/CredentialsStore.js';
 
 const init = {
-    command: ["init", "initialize"],
-    describe: "Initialize Faable",
-    builder: (yargs) => {
-        return yargs
-            .option("overwrite", {
-            alias: "o",
-            type: "boolean",
-            description: "Overwrite generated file",
-            default: false,
-        })
-            .showHelpOnFail(false);
-    },
-    handler: async (args) => {
-        const { overwrite } = args;
-        await writeGithubAction({ overwrite });
+    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 };

package/dist/commands/login/index.js

@@ -1,4 +1,5 @@
 import { FaableApi } from '../../api/FaableApi.js';
+import { getDeviceCode, getDeviceToken } from '../../api/auth.js';
 import { CredentialsStore } from '../../lib/CredentialsStore.js';
 import open from 'open';
 import { log } from '../../log.js';
@@ -21,7 +22,7 @@ const login = {
     handler: async (args) => {
         const { apikey, token } = args;
         const store = new CredentialsStore();
-        const api = FaableApi.create(); // Base client for device flow
+        FaableApi.create(); // Base client for device flow
         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 });
@@ -53,7 +54,7 @@ const login = {
         // Interactive Device Flow
         log.info("Starting browser-based authentication...");
         try {
-            const { device_code, user_code, verification_uri, interval, expires_in } = await api.getDeviceCode();
+            const { device_code, user_code, verification_uri, interval, expires_in } = await getDeviceCode();
             log.info(`\nVerification code: ${user_code}\n`);
             log.info(`If your browser doesn't open automatically, please visit:\n${verification_uri}\n`);
             try {
@@ -67,7 +68,7 @@ const login = {
             const timeout = expires_in * 1000;
             while (Date.now() - start < timeout) {
                 try {
-                    const { access_token } = await api.getDeviceToken(device_code);
+                    const { access_token } = await getDeviceToken(device_code);
                     if (access_token) {
                         log.info("Token received!");
                         const tempApi = FaableApi.create({ auth: { token: access_token }, authStrategy: () => ({ headers: async () => ({ Authorization: `Bearer ${access_token}` }) }) });
@@ -79,13 +80,15 @@ const login = {
                 }
                 catch (e) {
                     // Typically returns 400 with "authorization_pending"
-                    if (e.cause?.response?.data?.error === "authorization_pending") {
+                    const errData = e.response?.data || e.cause?.response?.data;
+                    const errHeaders = e.response?.headers || e.cause?.response?.headers;
+                    if (errData?.error === "authorization_pending") {
                         // Wait and continue
                     }
-                    else if (e.cause?.response?.data?.error === "slow_down") {
+                    else if (errData?.error === "slow_down") {
                         // Should increase interval but for now we just wait
                     }
-                    else if (e.cause?.response?.headers?.["content-type"]?.includes("application/json")) {
+                    else if (errHeaders?.["content-type"]?.includes("application/json")) {
                         // Other error
                     }
                 }

package/dist/index.js

@@ -1,31 +1,29 @@
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import { apps } from './commands/apps/index.js';
+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';
 import { whoami } from './commands/whoami/index.js';
-import { auth } from './commands/auth/index.js';
-import { deploy } from './commands/deploy/index.js';
-import { log } from './log.js';
-import { link } from './commands/link/index.js';
-import { init } from './commands/init/index.js';
 import { version } from './config.js';
 import { Configuration } from './lib/Configuration.js';
+import { log } from './log.js';
 
 const yg = yargs();
-yg.scriptName("faable")
+yg.scriptName('faable')
     .middleware(function (_argv) {
     log.info(`Faable CLI ${version}`);
 }, true)
-    .option("c", {
-    alias: "config",
-    description: "Path to the local `faable.json` file",
-    string: true,
+    .option('c', {
+    alias: 'config',
+    description: 'Path to the local `faable.json` file',
+    string: true
 })
     .middleware(function (argv) {
     if (argv.config) {
         Configuration.instance().setConfigFile(argv.config, {
-            ignoreWarnings: false,
+            ignoreWarnings: false
         });
     }
     else {
@@ -33,11 +31,9 @@ yg.scriptName("faable")
     }
 }, true)
     .command(deploy)
-    .command(apps)
     .command(login)
     .command(logout)
     .command(whoami)
-    .command(auth)
     .command(init)
     .command(link)
     .demandCommand(1)

package/dist/lib/CredentialsStore.js

@@ -1,6 +1,6 @@
-import path__default from 'path';
-import os from 'os';
 import fs from 'fs-extra';
+import os from 'os';
+import path__default from 'path';
 import { log } from '../log.js';
 
 class CredentialsStore {
@@ -8,7 +8,7 @@ class CredentialsStore {
     faable_home;
     constructor(log$1 = log) {
         this.log = log$1;
-        this.faable_home = path__default.join(os.homedir(), ".faable");
+        this.faable_home = path__default.join(os.homedir(), '.faable');
     }
     async deleteCredentials() {
         if (fs.existsSync(this.credentials_path)) {
@@ -17,7 +17,7 @@ class CredentialsStore {
         this.log.info(`Deleted credentials`);
     }
     get credentials_path() {
-        return path__default.join(this.faable_home, "auth.json");
+        return path__default.join(this.faable_home, 'auth.json');
     }
     async saveCredentials(config) {
         await fs.ensureDir(this.faable_home);
@@ -25,14 +25,8 @@ class CredentialsStore {
         await fs.chmod(this.credentials_path, 0o600);
         this.log.info(`Stored credentials`);
     }
-    /**
-     * @deprecated use saveCredentials
-     */
-    async saveApiKey(config) {
-        return this.saveCredentials(config);
-    }
     async loadCredentials() {
-        const old_path = path__default.join(this.faable_home, "credentials");
+        const old_path = path__default.join(this.faable_home, 'credentials');
         // Migration from old path if it exists
         if (fs.existsSync(old_path) && !fs.existsSync(this.credentials_path)) {
             const config = await fs.readJSON(old_path);

package/package.json

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

package/dist/commands/apps/index.js

@@ -1,17 +0,0 @@
-import { context } from '../../api/context.js';
-
-const apps = {
-    command: "apps",
-    describe: "Manage Faable Cloud Apps",
-    builder: (yargs) => {
-        return yargs.showHelpOnFail(false);
-    },
-    handler: async (args) => {
-        const { api } = await context();
-        const apps = await api.list();
-        console.log("Apps...");
-        console.log(apps.map((app) => app.name));
-    },
-};
-
-export { apps };

package/dist/commands/auth/index.js

@@ -1,31 +0,0 @@
-import { log } from '../../log.js';
-import { context } from '../../api/context.js';
-
-const auth = {
-    command: "auth",
-    describe: "Manage authentication",
-    builder: (yargs) => {
-        return yargs.command({
-            command: "status",
-            describe: "Check authentication status",
-            handler: async () => {
-                const { api } = await context();
-                if (!api) {
-                    log.error("❌ Not authenticated. Run 'faable login' first.");
-                    process.exit(1);
-                }
-                try {
-                    const me = await api.getMe();
-                    log.info(`✅ Authenticated as ${me.email}`);
-                }
-                catch (e) {
-                    log.error("❌ Not authenticated or session expired");
-                    process.exit(1);
-                }
-            },
-        });
-    },
-    handler: () => { },
-};
-
-export { auth };

package/dist/commands/init/writeGithubAction.js

@@ -1,108 +0,0 @@
-import path__default from 'path';
-import fs from 'fs-extra';
-import { log } from '../../log.js';
-import prompts from 'prompts';
-import { CredentialsStore } from '../../lib/CredentialsStore.js';
-import yaml from 'yaml';
-
-const store = new CredentialsStore();
-const get_workflows_dir = () => {
-    return path__default.join(process.cwd(), ".github", "workflows");
-};
-const get_default_action = () => {
-    return path__default.join(get_workflows_dir(), "deploy.yml");
-};
-const demandConfig = async (force = false) => {
-    const creds = await store.loadCredentials();
-    if (creds?.apikey) {
-        return;
-    }
-    const { apikey } = await prompts([
-        {
-            type: "text",
-            name: "apikey",
-            message: "What is your Faable ApiKey?",
-        },
-    ]);
-    await store.saveApiKey({ apikey });
-};
-const tentativeName = async () => {
-    try {
-        const pkg = path__default.join(process.cwd(), "package.json");
-        const { name } = await fs.readJSON(pkg);
-        return name;
-    }
-    catch (error) {
-        return;
-    }
-};
-const checkPackageManager = async () => {
-    if (fs.existsSync(path__default.join(process.cwd(), "package-lock.json"))) {
-        return "npm";
-    }
-    if (fs.existsSync(path__default.join(process.cwd(), "yarn.lock"))) {
-        return "yarn";
-    }
-    throw new Error("No package-lock.json or yarn.lock file found");
-};
-const writeGithubAction = async (params = {}) => {
-    const { overwrite } = params;
-    await demandConfig();
-    const gh_action_file = get_default_action();
-    // Already configured
-    if (!overwrite && fs.pathExistsSync(gh_action_file)) {
-        log.info(`Github action is already configured.`);
-        return;
-    }
-    const onCancel = (prompt) => {
-        log.info("Cancel");
-        process.exit(0);
-    };
-    const { app_name } = await prompts([
-        {
-            type: "text",
-            name: "app_name",
-            initial: await tentativeName(),
-            message: "Which app are you deploying",
-        },
-    ], { onCancel });
-    const manager = await checkPackageManager();
-    const action = {
-        name: "Deploy to Faable",
-        on: {
-            push: {
-                branches: ["main"],
-            },
-        },
-        permissions: {
-            "id-token": "write",
-            "contents": "read"
-        },
-        jobs: {
-            deploy: {
-                "runs-on": "ubuntu-latest",
-                steps: [
-                    { uses: "actions/checkout@v2" },
-                    {
-                        uses: "actions/setup-node@v4",
-                        with: {
-                            "node-version": "lts/*",
-                        },
-                    },
-                    ...(manager == "npm" ? [{ run: "npm ci" }] : []),
-                    ...(manager == "yarn"
-                        ? [{ run: "yarn install --frozen-lockfile" }]
-                        : []),
-                    {
-                        name: "Deploy to Faable",
-                        run: `npx @faable/faable deploy ${app_name}`,
-                    },
-                ],
-            },
-        },
-    };
-    await fs.writeFile(gh_action_file, yaml.stringify(action));
-    log.info(`Written ${gh_action_file}`);
-};
-
-export { writeGithubAction };