@ecomweb/cli 0.7.0 → 0.9.0

package/README.md

@@ -5,20 +5,17 @@ Agent-friendly CLI for the ecomweb platform. Manage your store, products, orders
 ## Quick Start
 
 ```bash
-# Interactive setup wizard (recommended for first-time users)
-npx @ecomweb/cli setup
+npx @ecomweb/cli auth login      # approve this CLI in your browser
+npx @ecomweb/cli stores list     # every store you belong to
 
 # Or install globally
 npm install -g @ecomweb/cli
-ecomweb setup
+ecomweb auth login
 ```
 
-The setup wizard walks you through:
-
-1. **Create account** — enter your email, receive a verification code
-2. **Verify email** — enter the 6-digit code
-3. **Set up store** — pick an existing store or create a new one
-4. **Ready!** — API key is generated and saved automatically
+`auth login` shows a short code and opens the dashboard. Check the code matches,
+press **Approve**, and the CLI is logged in as you: your role in each of your
+stores, no API key. No store yet? `ecomweb stores create --name "My Store"`.
 
 ## Usage
 
@@ -60,23 +57,19 @@ ecomweb <topic> --help
 
 ## Start with an AI agent
 
-Build your store's storefront with Claude Code or Codex. Log in with your
-ecomweb email (we email you a 6-digit code; no API key needed), then create the
+Build your store's storefront with Claude Code or Codex. Log in, then create the
 project:
 
 ```bash
-npx @ecomweb/cli auth login --email you@shop.vn              # asks for the code, then your store
+npx @ecomweb/cli auth login                                  # approve in the browser
 npx @ecomweb/cli storefront init                             # create, install and run it
 npx @ecomweb/cli storefront init --github                    # the same, as a new GitHub repository
 ```
 
-Without a terminal (agents, scripts), run `auth login --email` once to get the
-code, then `auth login --email you@shop.vn --code <code> [--store-ref <ref>]`.
-No store yet? Add `--store-name "My Store"` to both runs: the store is
-created as you log in (in a terminal you are asked for the name). If the
-code was already used without a name, run `auth login --email you@shop.vn
---store-name "My Store"` again: the verified session is kept, so no new code
-is sent.
+Without a terminal (agents, scripts), `auth login` prints the link and the code
+as JSON and exits. After the user approves, `auth login --wait` finishes the
+login (it waits up to 100 seconds per run; run it again while it answers
+`authorization_pending`). Nothing secret passes through the chat.
 
 Inside a storefront project, commands use that project's store (its
 `.ecomweb.json`) unless you pass `--store-ref`.
@@ -251,7 +244,7 @@ plan with storefront hosting.
 
    ```bash
    npm i -g @ecomweb/cli
-   ecomweb auth login --email <your email>   # then choose the store
+   ecomweb auth login                        # approve in the browser, then choose the store
    ```
 
 2. **Copy the theme to work on.** Your shop keeps running the original while
@@ -323,14 +316,14 @@ ecomweb theme link 54 --url https://shop.example.com
 ecomweb theme schema push --theme 54
 ```
 
-## Non-Interactive Auth
-
-For CI/CD or scripting, use the flag-based commands instead of the wizard:
+## Authentication
 
 ```bash
-ecomweb auth register --email user@example.com
-ecomweb auth verify --email user@example.com --code 123456
-ecomweb init --store-name "My Store"
+ecomweb auth login                # browser approval; --no-browser prints the link only
+ecomweb auth logout               # revokes this CLI's session
+ecomweb auth status               # who you are, and the credential in use
+ecomweb stores create --name "My Store"
+ecomweb stores switch <ref>
 ```
 
 ## Output Formats
@@ -360,15 +353,40 @@ ecomweb auth status               # Check auth status, and which API URL is in u
 ### Profiles
 
 ```bash
-ecomweb setup --profile staging           # Create a named profile
-ecomweb products list --profile staging   # Use it
+ecomweb auth login --profile staging --api-url <staging-api-url>   # Create (or update) the profile and sign in
+ecomweb products list --profile staging                             # Use it: same API, same session
 ```
 
+`auth login` saves the profile, with the API URL it used when one was given
+by `--api-url` or `ECOMWEB_API_URL`, only once the login is approved, in the
+same step that saves the session. A login that fails or is abandoned changes
+nothing. Without either, a new profile gets the production API.
+
+A login is bound to the API that issued it. If a command resolves another API
+URL (say `ECOMWEB_API_URL` is set in one shell and not the other), it fails
+with `SESSION_FOR_OTHER_API` and sends no token: pass `--api-url` with the
+session's URL, or sign in to the other API under its own `--profile`.
+
+### Where the login is kept
+
+In the OS keychain (macOS Keychain, Windows Credential Manager, the Linux
+Secret Service), under the service `ecomweb-cli`. Where there is none, in
+`~/.config/ecomweb/credentials/<profile>.session.json` (mode 0600). Force one
+with `ECOMWEB_CREDENTIAL_STORE=file` or `keychain`.
+
+### CI and servers
+
+Use a store API key from the dashboard (Settings, API keys), with only the
+scopes the job needs and an expiry. Pass it as `ECOMWEB_API_KEY` (or
+`--api-key`); it is never written to disk and wins over a login.
+
 ### Environment Variables
 
 | Variable | Description |
 |----------|-------------|
-| `ECOMWEB_API_KEY` | API key (overrides config) |
+| `ECOMWEB_API_KEY` | Store API key for CI and servers (wins over a login) |
+| `ECOMWEB_CREDENTIAL_STORE` | `keychain` or `file`: where the login is kept |
+| `ECOMWEB_NO_BROWSER` | Set to never open a browser (same as `--no-browser`) |
 | `ECOMWEB_STORE_REF` | Store ref (overrides config) |
 | `ECOMWEB_API_URL` | API base URL (overrides default) |
 
@@ -390,11 +408,17 @@ node ./bin/run.js --help
 > a local API explicitly:
 >
 > ```bash
-> export ECOMWEB_API_URL=http://localhost:3001
-> export ECOMWEB_STORE_REF=<your-store-ref>
-> export ECOMWEB_API_KEY=<a-store-api-key>
+> ecomweb auth login --profile local --api-url http://localhost:3001   # approve on your local dashboard
+> ecomweb auth profiles use local                                      # make it the default
+> ecomweb stores list                                                  # now talks to localhost:3001
 > ```
 >
+> The login saves `http://localhost:3001` as the `local` profile's API URL, so
+> later commands need neither the flag nor `ECOMWEB_API_URL`. Switch back with
+> `ecomweb auth profiles use default`. (Logging in with `ECOMWEB_API_URL`
+> exported and no `--profile` also works, but rewrites the `default` profile's
+> URL.)
+>
 > Note the missing `/api/v1` on the local URL. The API sets **no global
 > prefix** — routes hang directly off the origin. The production default
 > includes the prefix because the ingress adds it there.

package/dist/base-command.d.ts

@@ -1,5 +1,6 @@
 import { Command } from "@oclif/core";
 import { ConfigManager } from "./lib/config";
+import { CredentialStore, StoredSession } from "./lib/credential-store";
 import { ApiClient } from "./lib/api-client";
 import { OutputEnvelope, OutputOptions } from "./lib/output";
 export declare abstract class BaseCommand extends Command {
@@ -17,6 +18,13 @@ export declare abstract class BaseCommand extends Command {
     };
     protected configManager: ConfigManager;
     protected apiClient: ApiClient;
+    protected credentials: CredentialStore;
+    protected get profileName(): string;
+    protected lockPathFor(profile: string): string;
+    protected get apiUrl(): string;
+    protected revokeSession(session: StoredSession, profile?: string): Promise<unknown | undefined>;
+    protected now(): number;
+    protected sleep(ms: number): Promise<void>;
     protected get outputOptions(): OutputOptions;
     private parsedFlags;
     init(): Promise<void>;

package/dist/base-command.js

@@ -1,8 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseCommand = void 0;
 const core_1 = require("@oclif/core");
+const node_path_1 = __importDefault(require("node:path"));
 const config_1 = require("./lib/config");
+const credential_store_1 = require("./lib/credential-store");
+const session_1 = require("./lib/session");
 const api_client_1 = require("./lib/api-client");
 const project_setup_1 = require("./lib/project-setup");
 const errors_1 = require("./lib/errors");
@@ -12,6 +18,33 @@ class BaseCommand extends core_1.Command {
         super(...arguments);
         this.parsedFlags = {};
     }
+    get profileName() {
+        return this.configManager.getProfileName();
+    }
+    lockPathFor(profile) {
+        return node_path_1.default.join(config_1.CREDENTIALS_DIR, `${profile}.lock`);
+    }
+    get apiUrl() {
+        return this.configManager.resolveApiUrl(this.getFlag("api-url"));
+    }
+    async revokeSession(session, profile) {
+        try {
+            const fallback = profile ? this.configManager.getProfile(profile).api_url : this.apiUrl;
+            await new api_client_1.ApiClient({ baseUrl: session.api_url ?? fallback, timeout: 10_000 }).post("/auth/logout", {
+                refresh_token: session.refresh_token,
+            });
+            return undefined;
+        }
+        catch (error) {
+            return error ?? new Error("revoke failed");
+        }
+    }
+    now() {
+        return Date.now();
+    }
+    sleep(ms) {
+        return new Promise((resolve) => setTimeout(resolve, ms));
+    }
     get outputOptions() {
         const flags = this.parsedFlags;
         return {
@@ -26,13 +59,19 @@ class BaseCommand extends core_1.Command {
         await super.init();
         const { flags } = await this.parse(this.constructor);
         this.parsedFlags = flags;
-        this.configManager = new config_1.ConfigManager();
+        this.configManager = new config_1.ConfigManager(flags.profile);
         const apiUrl = this.configManager.resolveApiUrl(flags["api-url"]);
         const apiKey = this.configManager.resolveApiKey(flags["api-key"]);
-        this.apiClient = new api_client_1.ApiClient({
-            baseUrl: apiUrl,
-            apiKey,
+        this.credentials = (0, credential_store_1.lazyCredentialStore)(() => (0, credential_store_1.openCredentialStore)({ dir: config_1.CREDENTIALS_DIR }));
+        const anonymous = new api_client_1.ApiClient({ baseUrl: apiUrl });
+        const session = new session_1.SessionManager({
+            store: this.credentials,
+            profile: this.profileName,
+            lockPath: this.lockPathFor(this.profileName),
+            apiUrl,
+            refresh: (refresh_token) => anonymous.post("/auth/session/refresh", { refresh_token }),
         });
+        this.apiClient = new api_client_1.ApiClient({ baseUrl: apiUrl, apiKey, session });
         const storeRef = this.resolveStore();
         if (storeRef) {
             this.apiClient.setStoreRef(storeRef);

package/dist/base-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../src/base-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-command.js","sourceRoot":"","sources":["../src/base-command.ts"],"names":[],"mappings":"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"}

package/dist/commands/auth/login.d.ts

@@ -1,11 +1,11 @@
 import { BaseCommand } from "../../base-command";
+export declare const WAIT_LIMIT_MS = 100000;
 export default class AuthLogin extends BaseCommand {
     static description: string;
     static examples: string[];
     static flags: {
-        email: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        code: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        "store-name": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        wait: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        browser: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         "store-ref": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         "api-key": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         "api-url": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
@@ -18,5 +18,7 @@ export default class AuthLogin extends BaseCommand {
         exclude: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
-    private loginWithEmail;
+    protected isInteractive(): boolean;
+    private outputPending;
+    private selectStore;
 }

package/dist/commands/auth/login.js

@@ -1,119 +1,147 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.WAIT_LIMIT_MS = void 0;
 const node_os_1 = require("node:os");
 const core_1 = require("@oclif/core");
 const prompts_1 = require("@inquirer/prompts");
 const base_command_1 = require("../../base-command");
-const email_login_1 = require("../../lib/email-login");
+const config_1 = require("../../lib/config");
+const errors_1 = require("../../lib/errors");
+const file_lock_1 = require("../../lib/file-lock");
+const device_login_1 = require("../../lib/device-login");
+const open_browser_1 = require("../../lib/open-browser");
+const pending_login_1 = require("../../lib/pending-login");
+const session_1 = require("../../lib/session");
+const store_selection_1 = require("../../lib/store-selection");
+exports.WAIT_LIMIT_MS = 100_000;
+const FINAL_CODES = new Set(["DEVICE_AUTH_DENIED", "DEVICE_AUTH_EXPIRED"]);
 class AuthLogin extends base_command_1.BaseCommand {
     async run() {
-        const apiUrl = this.getFlag("api-url");
-        const apiKey = this.getFlag("api-key");
-        const email = this.getFlag("email");
-        if (email && !apiKey)
-            return this.loginWithEmail(email, apiUrl);
-        if (!apiKey) {
-            this.outputJson({
-                error: {
-                    code: "MISSING_API_KEY",
-                    message: "Say how to log in: --email (we email you a code) or --api-key.",
-                    hint: "Run: ecomweb auth login --email you@shop.vn",
+        const profile = this.profileName;
+        const givenApiUrl = this.getFlag("api-url");
+        const apiUrl = this.apiUrl;
+        const api = this.apiClient.anonymous();
+        const interactive = this.isInteractive();
+        this.configManager.removeLegacyCredentials(profile);
+        const existing = (0, pending_login_1.readPending)(config_1.CREDENTIALS_DIR, profile, apiUrl, this.now());
+        let pending = existing ?? (await (0, device_login_1.requestDeviceCode)(api, (0, node_os_1.hostname)(), apiUrl, this.now()));
+        if (!existing) {
+            (0, pending_login_1.writePending)(config_1.CREDENTIALS_DIR, profile, pending);
+            if (this.getFlag("browser"))
+                (0, open_browser_1.openBrowser)(pending.verification_uri_complete);
+        }
+        if (!interactive && (!this.getFlag("wait") || !existing))
+            return this.outputPending(pending);
+        if (interactive) {
+            this.logToStderr(`Your code: ${pending.user_code}`);
+            this.logToStderr(`Approve this CLI at: ${pending.verification_uri_complete}`);
+            this.logToStderr("Waiting for approval...");
+        }
+        const deadline = interactive ? pending.expires_at : Math.min(pending.expires_at, this.now() + exports.WAIT_LIMIT_MS);
+        let tokens;
+        try {
+            tokens = await (0, device_login_1.pollUntil)(api, pending, {
+                deadline,
+                now: () => this.now(),
+                sleep: (ms) => this.sleep(ms),
+                onInterval: (interval) => {
+                    pending = { ...pending, interval };
+                    (0, pending_login_1.writePending)(config_1.CREDENTIALS_DIR, profile, pending);
                 },
             });
-            this.exit(2);
-            return;
         }
-        const profileName = this.getFlag("profile") || this.configManager.getActiveProfileName();
-        this.configManager.setApiKey(apiKey, profileName);
-        if (apiUrl) {
-            this.configManager.setProfile(profileName, { api_url: apiUrl });
+        catch (error) {
+            if (error instanceof errors_1.CliError && FINAL_CODES.has(error.payload.code))
+                (0, pending_login_1.deletePending)(config_1.CREDENTIALS_DIR, profile);
+            throw error;
         }
+        if (!tokens) {
+            if (!interactive)
+                return this.outputPending(pending);
+            (0, pending_login_1.deletePending)(config_1.CREDENTIALS_DIR, profile);
+            throw (0, device_login_1.deviceAuthExpired)();
+        }
+        (0, pending_login_1.deletePending)(config_1.CREDENTIALS_DIR, profile);
+        const session = (0, session_1.sessionFromTokens)(tokens, apiUrl);
+        const previous = await (0, file_lock_1.withFileLock)(this.lockPathFor(profile), async () => {
+            const previous = this.credentials.get(profile);
+            this.credentials.set(profile, session);
+            this.configManager.setProfile(profile, givenApiUrl ? { api_url: givenApiUrl } : {});
+            return previous;
+        });
+        if (previous && previous.refresh_token !== session.refresh_token)
+            await this.revokeSession(previous);
         try {
-            await this.apiClient.health();
-            this.outputJson({
-                message: "Login successful.",
-                profile: profileName,
-                api_url: this.configManager.getProfile(profileName).api_url,
-                hint: "Run: ecomweb stores list to see available stores",
-            });
+            await this.selectStore(profile, session.email, interactive);
         }
-        catch {
-            this.outputJson({
-                message: "Credentials saved (API connection failed — verify API is running).",
-                profile: profileName,
-                api_url: this.configManager.getProfile(profileName).api_url,
-                hint: "Run: ecomweb health check to verify connectivity",
+        catch (error) {
+            const { json, exitCode } = (0, errors_1.formatError)(error);
+            throw new errors_1.CliError(json.error.code, `Signed in, but choosing a store failed: ${json.error.message}`, exitCode, {
+                hint: json.error.hint,
+                details: { ...json.error.details, logged_in: true, profile },
             });
         }
     }
-    async loginWithEmail(email, apiUrl) {
-        const profileName = this.getFlag("profile") || this.configManager.getActiveProfileName();
-        if (apiUrl)
-            this.configManager.setProfile(profileName, { api_url: apiUrl });
-        const interactive = Boolean(process.stdin.isTTY && process.stderr.isTTY);
-        const prompt = { output: process.stderr };
-        const sameEmail = (other) => other?.trim().toLowerCase() === email.trim().toLowerCase();
-        const kept = this.configManager.getJwtTokens(profileName);
-        const keptSession = kept && sameEmail(kept.email) ? kept : undefined;
-        const result = await (0, email_login_1.emailLogin)(this.apiClient, {
-            email,
-            code: this.getFlag("code"),
-            session: keptSession,
-            onSession: ({ access_token, refresh_token, expires_at }) => this.configManager.setJwtTokens({ access_token, refresh_token, expires_at, email }, profileName),
+    isInteractive() {
+        return Boolean(process.stdin.isTTY && process.stderr.isTTY && !process.env.CI);
+    }
+    outputPending(pending) {
+        const flag = this.getFlag("profile");
+        const apiUrlFlag = this.getFlag("api-url");
+        const again = `${flag ? ` --profile ${flag}` : ""}${apiUrlFlag ? ` --api-url ${apiUrlFlag}` : ""}`;
+        this.outputJson({
+            status: "authorization_pending",
+            verification_uri_complete: pending.verification_uri_complete,
+            user_code: pending.user_code,
+            expires_in: Math.max(0, Math.round((pending.expires_at - this.now()) / 1000)),
+            hint: `Open the link and approve, then run: ecomweb auth login --wait${again}`,
+        });
+    }
+    async selectStore(profile, email, interactive) {
+        const stores = (await this.apiClient.listStores({ limit: 100 })).map((s) => ({ ref: s.ref, name: s.name }));
+        const choice = await (0, store_selection_1.chooseStore)({
+            stores,
             storeRef: this.getFlag("store-ref"),
-            storeName: this.getFlag("store-name"),
-            keyName: `CLI (${(0, node_os_1.hostname)()})`,
-            askStoreName: interactive
-                ? () => {
-                    this.logToStderr("This account has no store yet: name one to create it.");
-                    return (0, prompts_1.input)({ message: "Store name:" }, prompt);
-                }
-                : undefined,
-            askCode: interactive
-                ? () => {
-                    this.logToStderr(`We emailed a 6-digit code to ${email}.`);
-                    return (0, prompts_1.input)({ message: "Code:" }, prompt);
-                }
-                : undefined,
-            chooseStore: interactive
-                ? (stores) => (0, prompts_1.select)({ message: "Which store?", choices: stores.map((s) => ({ name: `${s.name} (${s.ref})`, value: s })) }, prompt)
+            currentRef: this.configManager.getProfile(profile).store_ref,
+            prompt: interactive
+                ? (list, currentRef) => (0, prompts_1.select)({
+                    message: "Which store?",
+                    choices: list.map((s) => ({ name: `${s.name} (${s.ref})`, value: s })),
+                    default: list.find((s) => s.ref === currentRef),
+                }, { output: process.stderr })
                 : undefined,
         });
-        if (result.status === "code_sent") {
-            if (keptSession)
-                this.configManager.removeJwtTokens(profileName);
-            this.outputJson({
-                status: "code_sent",
-                email,
-                hint: `Check your email, then run: ecomweb auth login --email ${email} --code <code>${this.getFlag("store-name") ? ` --store-name ${JSON.stringify(this.getFlag("store-name"))}` : ""}`,
-            });
-            return;
+        const done = { status: "logged_in", email, profile };
+        if (choice.kind === "selected") {
+            this.configManager.setStoreRef(choice.store.ref, choice.store.name, profile);
+            this.outputJson({ ...done, store: choice.store });
+        }
+        else if (choice.kind === "choose") {
+            this.outputJson({ ...done, store: null, stores: choice.stores, hint: "Run: ecomweb stores switch <ref>" });
+        }
+        else {
+            this.outputJson({ ...done, store: null, hint: 'Run: ecomweb stores create --name "My Store"' });
         }
-        this.configManager.setApiKey(result.apiKey, profileName);
-        this.configManager.setStoreRef(result.store.ref, result.store.name, profileName);
-        if (sameEmail(this.configManager.getJwtTokens(profileName)?.email))
-            this.configManager.removeJwtTokens(profileName);
-        this.outputJson({
-            status: "logged_in",
-            email,
-            profile: profileName,
-            store: { ref: result.store.ref, name: result.store.name },
-            ...(result.created && { created: true }),
-        });
     }
 }
-AuthLogin.description = "Log in: with --email (a code is emailed to you; no API key needed), or with --api-key";
+AuthLogin.description = "Log in by approving this CLI in your browser";
 AuthLogin.examples = [
-    "ecomweb auth login --email you@shop.vn",
-    "ecomweb auth login --email you@shop.vn --code 123456 --store-ref abc123",
-    "ecomweb auth login --api-url http://localhost:3001 --api-key sk_live_abc123",
-    "ECOMWEB_API_KEY=sk_live_abc123 ecomweb auth login",
+    "ecomweb auth login",
+    "ecomweb auth login --wait",
+    "ecomweb auth login --no-browser",
+    "ecomweb auth login --store-ref abc123",
 ];
 AuthLogin.flags = {
     ...base_command_1.BaseCommand.baseFlags,
-    email: core_1.Flags.string({ description: "Log in with a code emailed to this address" }),
-    code: core_1.Flags.string({ description: "The emailed code (when not asked for in a terminal)" }),
-    "store-name": core_1.Flags.string({ description: "Create a store with this name (a new merchant) and log in to it" }),
+    wait: core_1.Flags.boolean({
+        description: "Wait (up to 100 seconds) for the approval of the code an earlier run printed",
+        default: false,
+    }),
+    browser: core_1.Flags.boolean({
+        description: "Open the approval link in the browser (--no-browser only prints it)",
+        default: true,
+        allowNo: true,
+    }),
 };
 exports.default = AuthLogin;
 //# sourceMappingURL=login.js.map

package/dist/commands/auth/login.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"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"}

package/dist/commands/auth/logout.js

@@ -1,21 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const base_command_1 = require("../../base-command");
+const config_1 = require("../../lib/config");
+const file_lock_1 = require("../../lib/file-lock");
+const pending_login_1 = require("../../lib/pending-login");
 class AuthLogout extends base_command_1.BaseCommand {
     async run() {
-        const profileName = this.getFlag("profile") || "default";
-        this.configManager.removeApiKey(profileName);
+        const profile = this.profileName;
+        const { session, failure } = await (0, file_lock_1.withFileLock)(this.lockPathFor(profile), async () => {
+            const session = this.credentials.get(profile);
+            const failure = session ? await this.revokeSession(session) : undefined;
+            this.credentials.delete(profile);
+            return { session, failure };
+        });
+        const revoked = Boolean(session) && !failure;
+        const warning = failure
+            ? `Could not revoke the session on the server (${failure instanceof Error ? failure.message : String(failure)}). ` +
+                "It was forgotten here; it ends by itself after 30 days unused, or revoke it now on your profile page in the dashboard."
+            : undefined;
+        (0, pending_login_1.deletePending)(config_1.CREDENTIALS_DIR, profile);
+        this.configManager.removeLegacyCredentials(profile);
+        const usingApiKey = !session && this.configManager.resolveApiKey(this.getFlag("api-key")) !== undefined;
         this.outputJson({
-            message: "Credentials removed.",
-            profile: profileName,
+            message: session
+                ? "Logged out."
+                : usingApiKey
+                    ? "No session to log out of: this command is using an API key from --api-key or ECOMWEB_API_KEY."
+                    : "Not logged in.",
+            profile,
+            server_session_revoked: revoked,
+            ...(warning && { warning }),
         });
     }
 }
-AuthLogout.description = "Clear stored API credentials";
-AuthLogout.examples = [
-    "ecomweb auth logout",
-    "ecomweb auth logout --profile production",
-];
+AuthLogout.description = "Log out: revoke this CLI's session and forget it";
+AuthLogout.examples = ["ecomweb auth logout", "ecomweb auth logout --profile staging"];
 AuthLogout.flags = {
     ...base_command_1.BaseCommand.baseFlags,
 };