@doist/todoist-cli 1.63.2 → 1.65.0-next.1

package/dist/lib/auth-store.js

@@ -1,12 +1,23 @@
-import { clearApiToken, loadTokenForStoredUser, NoTokenError, TOKEN_ENV_VAR, upsertUser, } from './auth.js';
-import { readConfig } from './config.js';
-import { SecureStoreUnavailableError } from './secure-store.js';
-import { getDefaultUser, getStoredUsers } from './users.js';
+import { createKeyringTokenStore, } from '@doist/cli-core/auth';
+import { getConfigPath } from './config.js';
+import { createTodoistUserRecordStore } from './user-records.js';
+import { matchUserRef } from './users.js';
+/**
+ * Persisted identifiers for the keyring/config ABI. Shared with the read-side
+ * resolver (`auth.ts`) and the postinstall migration (`migrate-auth.ts`) so
+ * a rename can't silently desynchronise the three paths that touch the OS
+ * credential manager.
+ */
+export const SERVICE_NAME = 'todoist-cli';
+export const LEGACY_ACCOUNT = 'api-token';
+export const TOKEN_ENV_VAR = 'TODOIST_API_TOKEN';
+export function accountForUser(id) {
+    return `user-${id}`;
+}
 /**
  * Single source of truth for the `TodoistAccount` field layout. Used by the
- * auth provider's `validateToken` (post-handshake) and the token-store
- * `active()` adapter (post-read) so the persisted shape stays aligned with
- * what `set()` later disassembles via `accountToUpsertInput`.
+ * auth provider's `validateToken` (post-handshake), the migration helper,
+ * and the `UserRecordStore` adapter's record → account mapping.
  */
 export function toTodoistAccount(input) {
     return {
@@ -18,78 +29,41 @@ export function toTodoistAccount(input) {
         auth_flags: input.authFlags,
     };
 }
-/** Inverse of `toTodoistAccount` — feeds the upsert path that owns persistence. */
-export function accountToUpsertInput(account, token) {
-    return {
-        id: account.id,
-        email: account.email,
-        token,
-        authMode: account.auth_mode,
-        authScope: account.auth_scope,
-        authFlags: account.auth_flags,
-    };
-}
-function storedUserToAccount(user) {
-    return toTodoistAccount({
-        id: user.id,
-        email: user.email,
-        authMode: user.auth_mode ?? 'unknown',
-        authScope: user.auth_scope,
-        authFlags: user.auth_flags,
-    });
-}
+/**
+ * cli-core's keyring-backed `TokenStore`, wired to todoist-cli's
+ * `UserRecordStore` adapter. Two Todoist-specific overlays on top of the
+ * defaults:
+ *
+ *   - `active()` short-circuits to `null` when `TODOIST_API_TOKEN` is set.
+ *     The env var is the canonical override across the CLI; without this
+ *     short-circuit, `td auth status` would render the stored account while
+ *     `getAuthMetadata()` reports `source: 'env'` (wrong account, right
+ *     diagnostic).
+ *   - `accountForUser` / `matchAccount` are passed explicitly. `matchAccount`
+ *     delegates to `matchUserRef` so the keyring-store path and the
+ *     config-driven `findUserByRef` path share one matcher (case-insensitive
+ *     email + trim).
+ */
 export function createTodoistTokenStore() {
-    let lastStorageResult;
-    let lastClearResult;
+    const inner = createKeyringTokenStore({
+        serviceName: SERVICE_NAME,
+        userRecords: createTodoistUserRecordStore(),
+        recordsLocation: getConfigPath(),
+        accountForUser,
+        matchAccount: (account, ref) => matchUserRef({ id: account.id, email: account.email }, ref),
+    });
     return {
-        /**
-         * Pure view of persisted state. Deliberately ignores the global
-         * `--user` selector (a CLI-invocation concern, not storage) and
-         * returns `null` when `TODOIST_API_TOKEN` is in play (env tokens
-         * don't represent a persisted account). When multiple accounts
-         * are stored without a default, returns `null` rather than
-         * throwing a selection error — the runtime caller can react to
-         * "no active persisted account" but shouldn't see CLI-arg errors
-         * leaking out of a store read.
-         */
-        async active() {
+        active: async (ref) => {
             if (process.env[TOKEN_ENV_VAR])
                 return null;
-            const config = await readConfig();
-            const users = getStoredUsers(config);
-            if (users.length === 0)
-                return null;
-            const target = getDefaultUser(config) ?? (users.length === 1 ? users[0] : null);
-            if (!target)
-                return null;
-            try {
-                const { token } = await loadTokenForStoredUser(target);
-                return { token, account: storedUserToAccount(target) };
-            }
-            catch (error) {
-                // Token unreachable (no secret, keyring offline) — surface as
-                // "no active persisted account" so a `set()` retry can recover
-                // without a runtime caller having to special-case storage errors.
-                if (error instanceof NoTokenError)
-                    return null;
-                if (error instanceof SecureStoreUnavailableError)
-                    return null;
-                throw error;
-            }
-        },
-        async set(account, token) {
-            const { replaced: _replaced, ...result } = await upsertUser(accountToUpsertInput(account, token));
-            lastStorageResult = result;
-        },
-        async clear() {
-            lastClearResult = await clearApiToken();
-        },
-        getLastStorageResult() {
-            return lastStorageResult;
-        },
-        getLastClearResult() {
-            return lastClearResult;
+            return inner.active(ref);
         },
+        set: (account, token) => inner.set(account, token),
+        clear: (ref) => inner.clear(ref),
+        list: () => inner.list(),
+        setDefault: (ref) => inner.setDefault(ref),
+        getLastStorageResult: () => inner.getLastStorageResult(),
+        getLastClearResult: () => inner.getLastClearResult(),
     };
 }
 //# sourceMappingURL=auth-store.js.map

package/dist/lib/auth-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth-store.js","sourceRoot":"","sources":["../../src/lib/auth-store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth-store.js","sourceRoot":"","sources":["../../src/lib/auth-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,uBAAuB,GAE1B,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAgC,aAAa,EAAE,MAAM,aAAa,CAAA;AACzE,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEzC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,aAAa,CAAA;AACzC,MAAM,CAAC,MAAM,cAAc,GAAG,WAAW,CAAA;AACzC,MAAM,CAAC,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAChD,MAAM,UAAU,cAAc,CAAC,EAAU;IACrC,OAAO,QAAQ,EAAE,EAAE,CAAA;AACvB,CAAC;AAsBD;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAA0B;IACvD,OAAO;QACH,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,SAAS,EAAE,KAAK,CAAC,QAAQ;QACzB,UAAU,EAAE,KAAK,CAAC,SAAS;QAC3B,UAAU,EAAE,KAAK,CAAC,SAAS;KAC9B,CAAA;AACL,CAAC;AAID;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,uBAAuB;IACnC,MAAM,KAAK,GAAG,uBAAuB,CAAiB;QAClD,WAAW,EAAE,YAAY;QACzB,WAAW,EAAE,4BAA4B,EAAE;QAC3C,eAAe,EAAE,aAAa,EAAE;QAChC,cAAc;QACd,YAAY,EAAE,CAAC,OAAuB,EAAE,GAAe,EAAE,EAAE,CACvD,YAAY,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC;KAClE,CAAC,CAAA;IACF,OAAO;QACH,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAClB,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;gBAAE,OAAO,IAAI,CAAA;YAC3C,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAC5B,CAAC;QACD,GAAG,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC;QAClD,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;QAChC,IAAI,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE;QACxB,UAAU,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;QAC1C,oBAAoB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,oBAAoB,EAAE;QACxD,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,kBAAkB,EAAE;KACvD,CAAA;AACL,CAAC"}

package/dist/lib/auth.d.ts

@@ -1,7 +1,8 @@
+export type { TokenStorageLocation, TokenStorageResult } from '@doist/cli-core/auth';
 export { AUTH_FLAG_ORDER, CONFIG_VERSION, getConfigPath, readConfig, writeConfig, type AuthFlag, type AuthMode, type Config, type StoredUser, type UpdateChannel, } from './config.js';
 import { type AuthFlag, type AuthMode, type StoredUser } from './config.js';
 import { CliError } from './errors.js';
-export declare const TOKEN_ENV_VAR = "TODOIST_API_TOKEN";
+export { TOKEN_ENV_VAR } from './auth-store.js';
 export interface AuthMetadata {
     authMode: AuthMode;
     authScope?: string;
@@ -19,22 +20,9 @@ export interface ResolvedUser {
     authFlags?: AuthFlag[];
     source: AuthMetadata['source'];
 }
-export interface UpsertUserInput {
-    id: string;
-    email: string;
-    token: string;
-    authMode?: AuthMode;
-    authScope?: string;
-    authFlags?: AuthFlag[];
-}
 export declare class NoTokenError extends CliError {
     constructor();
 }
-export type TokenStorageLocation = 'secure-store' | 'config-file';
-export interface TokenStorageResult {
-    storage: TokenStorageLocation;
-    warning?: string;
-}
 /**
  * Resolve which stored user this invocation should act as, and load their
  * token. Honors `--user <ref>`, then `user.defaultUser`, then a single stored
@@ -48,52 +36,17 @@ export interface TokenStorageResult {
 export declare function resolveActiveUser(opts?: {
     ref?: string;
 }): Promise<ResolvedUser>;
-/**
- * Backwards-compatible no-arg accessor for the active user's token. Most call
- * sites (uploads, stats, api/core) only need the bearer string.
- */
+/** Bearer-only shortcut. Most call sites (SDK, uploads, stats) only need this. */
 export declare function getApiToken(): Promise<string>;
 /**
- * Like `resolveActiveUser` but returns whichever credentials are at hand
- * without mutating storage. Useful for `td doctor` / `td config view` where
- * we want to inspect (and report on) what would be used.
+ * Like `resolveActiveUser` but bundles the rendering metadata `td doctor` /
+ * `td config view` want. Lets `SecureStoreUnavailableError` propagate so the
+ * diagnostic surfaces can distinguish "missing token" from "broken keyring".
  */
 export declare function probeApiToken(): Promise<{
     token: string;
     metadata: AuthMetadata;
 }>;
 export declare function getAuthMetadata(): Promise<AuthMetadata>;
-/**
- * Add or update a user record. Stores the token in the OS credential manager
- * under `user-<id>` when available, falls back to per-user plaintext in config.
- * Sets `defaultUser` automatically if this is the first user being stored.
- */
-export declare function upsertUser(input: UpsertUserInput): Promise<TokenStorageResult & {
-    replaced: boolean;
-}>;
-/**
- * Remove the active user (resolved via `--user` or default). For multi-user
- * installs without a default, callers must pass `--user <ref>` to disambiguate.
- */
-export declare function clearApiToken(opts?: {
-    ref?: string;
-}): Promise<TokenStorageResult>;
-/**
- * Remove a specific user by id. Used by `td user remove` and as the underlying
- * primitive for `clearApiToken`.
- *
- * Order matters: write the new config first (the source of truth) and only
- * then delete the secret. If the config update fails the keyring is untouched,
- * so the user remains fully functional and a retry will simply re-attempt
- * the same operation. A keyring delete failure after a successful config
- * update leaves an orphan secret that the keyring's own service can clean up
- * later — the CLI no longer references it.
- */
-export declare function removeUserById(id: string): Promise<TokenStorageResult>;
-export declare function setDefaultUserId(id: string): Promise<void>;
 export declare function listStoredUsers(): Promise<StoredUser[]>;
-export declare function loadTokenForStoredUser(user: StoredUser): Promise<{
-    token: string;
-    source: 'secure-store' | 'config-file';
-}>;
 //# sourceMappingURL=auth.d.ts.map

package/dist/lib/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":"AACA,YAAY,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACpF,OAAO,EACH,eAAe,EACf,cAAc,EACd,aAAa,EACb,UAAU,EACV,WAAW,EACX,KAAK,QAAQ,EACb,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,UAAU,EACf,KAAK,aAAa,GACrB,MAAM,aAAa,CAAA;AAGpB,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,QAAQ,EAAc,KAAK,UAAU,EAAE,MAAM,aAAa,CAAA;AACvF,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAItC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,MAAM,WAAW,YAAY;IACzB,QAAQ,EAAE,QAAQ,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAA;IACtB,MAAM,EAAE,KAAK,GAAG,cAAc,GAAG,aAAa,CAAA;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,YAAY;IACzB,EAAE,EAAE,MAAM,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,QAAQ,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAA;IACtB,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CACjC;AAED,qBAAa,YAAa,SAAQ,QAAQ;;CAUzC;AAED;;;;;;;;;GASG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAO,GAAG,OAAO,CAAC,YAAY,CAAC,CA8B1F;AAeD,kFAAkF;AAClF,wBAAsB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC,CAEnD;AAED;;;;GAIG;AACH,wBAAsB,aAAa,IAAI,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,YAAY,CAAA;CAAE,CAAC,CAGxF;AAED,wBAAsB,eAAe,IAAI,OAAO,CAAC,YAAY,CAAC,CAW7D;AAED,wBAAsB,eAAe,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAE7D"}