daycare-cli 0.0.0-canary.5d03c19 → 0.0.0-canary.62392d9

package/dist/api/app-server/README.md

@@ -0,0 +1,78 @@
+# Daycare App Server
+
+Core API server for the Daycare app. Handles authentication, active task listing, and `/app` access links.
+
+## Settings
+
+Configure under top-level `settings.appServer`:
+
+- `enabled`: enable/disable app server runtime (`false` by default)
+- `host`: bind host, default `127.0.0.1`
+- `port`: bind port, default `7332`
+- `appEndpoint`: app endpoint URL where generated links open, default `https://daycare.dev`
+- `serverEndpoint` (optional): backend endpoint URL embedded in hash payload (for example `https://api.example.com`)
+- `jwtSecret` (optional): shared seed override; when omitted, uses auth store key `seed`
+- `telegramInstanceId` (optional): preferred Telegram plugin instance id for WebApp auth (defaults to first enabled `telegram` plugin, or `telegram`)
+
+Notes:
+- `appEndpoint` and `serverEndpoint` must be full `http(s)` endpoint URLs.
+- Trailing slashes are removed automatically.
+- Paths/query/hash are not allowed.
+
+## Routes
+
+### Auth
+- `POST /auth/validate`: validate session tokens and exchange link tokens to 1-year session tokens
+- `POST /auth/refresh`: validate token and return a fresh 1-year session token
+- `POST /auth/telegram`: verify Telegram WebApp `initData` and issue a 1-year session token
+- `POST /auth/email/request`: send a 6-digit email sign-in code
+- `POST /auth/email/verify`: verify `{ email, code }` and issue a 1-year session token
+
+### Tasks (authenticated via `Authorization: Bearer <token>`)
+- `GET /tasks/active`: list active tasks with cron/webhook triggers and last execution timestamps
+
+### Secrets (authenticated via `Authorization: Bearer <token>`)
+- `GET /secrets`: list secret metadata (`name`, `displayName`, `description`, `variableNames`, `variableCount`)
+- `GET /secrets/:name`: read one secret metadata entry
+- `POST /secrets/create`: create/replace a secret
+- `POST /secrets/:name/update`: update display metadata and/or variable mappings
+- `POST /secrets/:name/delete`: delete a secret
+
+Responses never include secret variable values.
+
+### Other
+- `GET /`: welcome message
+- `POST /v1/webhooks/:token`: trigger a task webhook by signed token (unauthenticated)
+
+## Tool and command
+
+- Tool: `app_auth_link`
+- Slash command: `/app`
+
+Both generate a short-lived app URL in the form:
+`<appEndpoint-or-serverEndpoint>/verify#<base64url-json>`
+
+Token lifecycle:
+- Link token (ephemeral): embedded in `/verify#...` URL payload, default TTL is 1 hour.
+- Email code (ephemeral): kept only in app-server memory, default TTL is 10 minutes.
+- Session token (long-term): returned by `/auth/validate`, `/auth/refresh`, `/auth/telegram`, and `/auth/email/verify`, TTL is 1 year.
+
+## Structure
+
+```
+appServer.ts        — server lifecycle and route wiring
+appServerSettingsResolve.ts — settings defaults and validation
+appHttp.ts          — HTTP utilities (CORS, JSON, body parsing, listen/close)
+appAuthExtract.ts   — JWT Bearer token extraction
+appAuthLinkTool.ts  — magic link generation tool
+appTelegramInitDataValidate.ts — Telegram WebApp initData signature validation
+appJwtSecretResolve.ts — JWT secret resolution
+appEndpointNormalize.ts — endpoint URL validation
+routes/
+  routeAuthValidate.ts  — POST /auth/validate
+  routeAuthRefresh.ts   — POST /auth/refresh
+  routeAuthTelegram.ts  — POST /auth/telegram
+  routeWebhookTrigger.ts — POST /v1/webhooks/:token
+```
+
+Shared authenticated API handlers live in `sources/api/routes/`.

package/dist/api/app-server/appAuthLinkTool.d.ts

@@ -4,7 +4,7 @@ export declare const APP_AUTH_LINK_EXPIRES_IN_SECONDS = 3600;
 export declare const APP_AUTH_SESSION_EXPIRES_IN_SECONDS: number;
 export declare const APP_AUTH_LINK_SERVICE = "daycare.app-auth.link";
 export declare const APP_AUTH_DEFAULT_ENDPOINT = "https://daycare.dev";
-export type AppAuthLinkKind = "session" | "email" | "connect-email";
+export type AppAuthLinkKind = "session" | "connect-email";
 declare const appAuthLinkResultSchema: import("@sinclair/typebox").TObject<{
     url: import("@sinclair/typebox").TString;
     token: import("@sinclair/typebox").TString;

package/dist/api/app-server/appAuthLinkTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appAuthLinkTool.d.ts","sourceRoot":"","sources":["../../../sources/api/app-server/appAuthLinkTool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAsB,MAAM,SAAS,CAAC;AAIlE,eAAO,MAAM,gCAAgC,OAAO,CAAC;AACrD,eAAO,MAAM,mCAAmC,QAAqB,CAAC;AACtE,eAAO,MAAM,qBAAqB,0BAA0B,CAAC;AAC7D,eAAO,MAAM,yBAAyB,wBAAwB,CAAC;AAC/D,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,OAAO,GAAG,eAAe,CAAC;AAKpE,QAAA,MAAM,uBAAuB;;;;;EAQ5B,CAAC;AAEF,KAAK,iBAAiB,GAAG,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAEhE,MAAM,MAAM,kBAAkB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,eAAe,CAAC;CAC1B,CAAC;AAOF,MAAM,MAAM,wBAAwB,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAarG;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,WAAW,CAAC,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,GACxB,MAAM,CAYR;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,kBAAkB,EAC3B,WAAW,CAAC,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,GACxB,MAAM,CAmBR;AAMD,MAAM,MAAM,sBAAsB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,cAAc,CAoC/E"}
+{"version":3,"file":"appAuthLinkTool.d.ts","sourceRoot":"","sources":["../../../sources/api/app-server/appAuthLinkTool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAsB,MAAM,SAAS,CAAC;AAIlE,eAAO,MAAM,gCAAgC,OAAO,CAAC;AACrD,eAAO,MAAM,mCAAmC,QAAqB,CAAC;AACtE,eAAO,MAAM,qBAAqB,0BAA0B,CAAC;AAC7D,eAAO,MAAM,yBAAyB,wBAAwB,CAAC;AAC/D,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,eAAe,CAAC;AAK1D,QAAA,MAAM,uBAAuB;;;;;EAQ5B,CAAC;AAEF,KAAK,iBAAiB,GAAG,MAAM,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAEhE,MAAM,MAAM,kBAAkB,GAAG;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,eAAe,CAAC;CAC1B,CAAC;AAOF,MAAM,MAAM,wBAAwB,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAarG;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,WAAW,CAAC,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,GACxB,MAAM,CAYR;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,kBAAkB,EAC3B,WAAW,CAAC,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,MAAM,GACxB,MAAM,CAmBR;AAMD,MAAM,MAAM,sBAAsB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACxC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,cAAc,CAoC/E"}

package/dist/api/app-server/appEmailAuth.d.ts

@@ -1,39 +1,38 @@
 import type { EmailMessage } from "../../email/emailSend.js";
-import type { DaycareDb } from "../../schema.js";
 import type { UsersRepository } from "../../storage/usersRepository.js";
-import { type AppRequestEndpointHeaders } from "./appRequestEndpointsResolve.js";
+export declare const APP_EMAIL_CODE_EXPIRES_IN_MS: number;
+export declare const APP_EMAIL_CODE_RESEND_IN_MS: number;
+export declare const APP_EMAIL_CODE_REQUEST_WINDOW_MS: number;
+export declare const APP_EMAIL_CODE_MAX_REQUESTS_PER_WINDOW = 5;
+export declare const APP_EMAIL_CODE_MAX_ATTEMPTS = 5;
 export type AppEmailAuthOptions = {
-    db: DaycareDb;
     users: UsersRepository;
-    host: string;
-    port: number;
-    serverEndpoint?: string;
-    appEndpoint?: string;
     secret: string;
     replyTo?: string;
     mailSend: (message: EmailMessage) => Promise<void>;
 };
+export type AppEmailRequestResult = {
+    expiresAt: number;
+    retryAfterMs: number;
+};
 /**
- * Coordinates Better Auth magic-link email delivery and maps verified emails to Daycare users.
- * Expects: storage migrations are applied and mailSend delivers outbound email.
+ * Coordinates email sign-in codes and maps verified emails to Daycare users.
+ * Expects: secret is stable for the app server process and mailSend delivers outbound email.
  */
 export declare class AppEmailAuth {
     private readonly users;
-    private readonly host;
-    private readonly port;
-    private readonly serverEndpoint?;
-    private readonly appEndpoint?;
     private readonly secret;
     private readonly replyTo?;
     private readonly mailSend;
-    private readonly db;
+    private readonly pendingEmails;
+    private readonly pendingLock;
     constructor(options: AppEmailAuthOptions);
-    request(email: string, headers?: AppRequestEndpointHeaders): Promise<void>;
-    verify(token: string, headers?: AppRequestEndpointHeaders): Promise<{
+    request(email: string): Promise<AppEmailRequestResult>;
+    verify(email: string, code: string): Promise<{
         email: string;
         userId: string;
     }>;
-    private authCreate;
+    private pendingPrune;
     private userIdResolveByEmail;
 }
 //# sourceMappingURL=appEmailAuth.d.ts.map

package/dist/api/app-server/appEmailAuth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appEmailAuth.d.ts","sourceRoot":"","sources":["../../../sources/api/app-server/appEmailAuth.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAQjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE,OAAO,EAAE,KAAK,yBAAyB,EAA8B,MAAM,iCAAiC,CAAC;AAE7G,MAAM,MAAM,mBAAmB,GAAG;IAC9B,EAAE,EAAE,SAAS,CAAC;IACd,KAAK,EAAE,eAAe,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD,CAAC;AAEF;;;GAGG;AACH,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkB;IACxC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAC3D,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAY;gBAEnB,OAAO,EAAE,mBAAmB;IAYlC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB1E,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAkC5G,OAAO,CAAC,UAAU;YA6BJ,oBAAoB;CAsBrC"}
+{"version":3,"file":"appEmailAuth.d.ts","sourceRoot":"","sources":["../../../sources/api/app-server/appEmailAuth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAGxE,eAAO,MAAM,4BAA4B,QAAiB,CAAC;AAC3D,eAAO,MAAM,2BAA2B,QAAY,CAAC;AACrD,eAAO,MAAM,gCAAgC,QAAiB,CAAC;AAC/D,eAAO,MAAM,sCAAsC,IAAI,CAAC;AACxD,eAAO,MAAM,2BAA2B,IAAI,CAAC;AAa7C,MAAM,MAAM,mBAAmB,GAAG;IAC9B,KAAK,EAAE,eAAe,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF;;;GAGG;AACH,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkB;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAC3D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAwC;IACtE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAmB;gBAEnC,OAAO,EAAE,mBAAmB;IAOlC,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IA6DtD,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;IAmDrF,OAAO,CAAC,YAAY;YAYN,oBAAoB;CAoBrC"}

package/dist/api/app-server/appEmailAuth.js

@@ -1,123 +1,141 @@
-import { betterAuth } from "better-auth";
-import { drizzleAdapter } from "better-auth/adapters/drizzle";
-import { magicLink } from "better-auth/plugins";
-import { appAuthAccountsTable, appAuthSessionsTable, appAuthUsersTable, appAuthVerificationsTable } from "../../schema.js";
-import { userConnectorKeyCreate } from "../../storage/userConnectorKeyCreate.js";
-import { APP_AUTH_SESSION_EXPIRES_IN_SECONDS, appAuthPayloadUrlBuild } from "./appAuthLinkTool.js";
-import { appRequestEndpointsResolve } from "./appRequestEndpointsResolve.js";
+import { createHmac, randomBytes, randomInt, timingSafeEqual } from "node:crypto";
+import { AsyncLock } from "../../utils/lock.js";
+export const APP_EMAIL_CODE_EXPIRES_IN_MS = 10 * 60 * 1000;
+export const APP_EMAIL_CODE_RESEND_IN_MS = 30 * 1000;
+export const APP_EMAIL_CODE_REQUEST_WINDOW_MS = 10 * 60 * 1000;
+export const APP_EMAIL_CODE_MAX_REQUESTS_PER_WINDOW = 5;
+export const APP_EMAIL_CODE_MAX_ATTEMPTS = 5;
 /**
- * Coordinates Better Auth magic-link email delivery and maps verified emails to Daycare users.
- * Expects: storage migrations are applied and mailSend delivers outbound email.
+ * Coordinates email sign-in codes and maps verified emails to Daycare users.
+ * Expects: secret is stable for the app server process and mailSend delivers outbound email.
  */
 export class AppEmailAuth {
     users;
-    host;
-    port;
-    serverEndpoint;
-    appEndpoint;
     secret;
     replyTo;
     mailSend;
-    db;
+    pendingEmails = new Map();
+    pendingLock = new AsyncLock();
     constructor(options) {
-        this.db = options.db;
         this.users = options.users;
-        this.host = options.host;
-        this.port = options.port;
-        this.serverEndpoint = options.serverEndpoint;
-        this.appEndpoint = options.appEndpoint;
-        this.secret = options.secret;
+        this.secret = options.secret.trim();
         this.replyTo = options.replyTo;
         this.mailSend = options.mailSend;
     }
-    async request(email, headers) {
+    async request(email) {
         const normalizedEmail = appEmailNormalize(email);
-        if (!normalizedEmail) {
-            throw new Error("Email is required.");
+        if (!appEmailIsValid(normalizedEmail)) {
+            throw new Error("A valid email is required.");
         }
-        const endpoints = appRequestEndpointsResolve({
-            host: this.host,
-            port: this.port,
-            appEndpoint: this.appEndpoint,
-            serverEndpoint: this.serverEndpoint,
-            headers
-        });
-        const auth = this.authCreate(endpoints);
-        await auth.api.signInMagicLink({
-            body: {
-                email: normalizedEmail
-            },
-            headers: appEmailAuthHeadersBuild(headers, this.host, this.port, endpoints.serverEndpoint)
+        return this.pendingLock.inLock(async () => {
+            const now = Date.now();
+            this.pendingPrune(now);
+            const existing = this.pendingEmails.get(normalizedEmail);
+            if (existing && now < existing.resendAvailableAt) {
+                throw new Error(appEmailRetryMessage(existing.resendAvailableAt - now));
+            }
+            const requestWindowStartedAt = existing && now - existing.requestWindowStartedAt < APP_EMAIL_CODE_REQUEST_WINDOW_MS
+                ? existing.requestWindowStartedAt
+                : now;
+            const requestCount = existing && requestWindowStartedAt === existing.requestWindowStartedAt ? existing.requestCount + 1 : 1;
+            if (requestCount > APP_EMAIL_CODE_MAX_REQUESTS_PER_WINDOW) {
+                throw new Error(`Too many sign-in codes requested. Try again in ${appEmailMinutesText(requestWindowStartedAt + APP_EMAIL_CODE_REQUEST_WINDOW_MS - now)}.`);
+            }
+            const code = appEmailCodeGenerate();
+            const salt = randomBytes(16).toString("hex");
+            const expiresAt = now + APP_EMAIL_CODE_EXPIRES_IN_MS;
+            const resendAvailableAt = now + APP_EMAIL_CODE_RESEND_IN_MS;
+            await this.mailSend(appEmailAuthMessageBuild({
+                email: normalizedEmail,
+                code,
+                expiresAt,
+                replyTo: this.replyTo
+            }));
+            this.pendingEmails.set(normalizedEmail, {
+                codeHash: appEmailCodeHash(this.secret, normalizedEmail, salt, code),
+                salt,
+                expiresAt,
+                resendAvailableAt,
+                requestWindowStartedAt,
+                requestCount,
+                failedAttempts: 0,
+                updatedAt: now
+            });
+            return {
+                expiresAt,
+                retryAfterMs: APP_EMAIL_CODE_RESEND_IN_MS
+            };
         });
     }
-    async verify(token, headers) {
-        const normalizedToken = token.trim();
-        if (!normalizedToken) {
-            throw new Error("Magic-link token is required.");
+    async verify(email, code) {
+        const normalizedEmail = appEmailNormalize(email);
+        const normalizedCode = appEmailCodeNormalize(code);
+        if (!appEmailIsValid(normalizedEmail)) {
+            throw new Error("A valid email is required.");
         }
-        const endpoints = appRequestEndpointsResolve({
-            host: this.host,
-            port: this.port,
-            appEndpoint: this.appEndpoint,
-            serverEndpoint: this.serverEndpoint,
-            headers
-        });
-        const auth = this.authCreate(endpoints);
-        const result = await auth.api.magicLinkVerify({
-            query: {
-                token: normalizedToken
-            },
-            headers: appEmailAuthHeadersBuild(headers, this.host, this.port, endpoints.serverEndpoint)
-        });
-        const email = appEmailNormalize(result.user.email);
-        if (!email) {
-            throw new Error("Verified email is missing.");
+        if (!normalizedCode) {
+            throw new Error("Code must be six digits.");
         }
-        const userId = await this.userIdResolveByEmail(email);
-        return {
-            email,
-            userId
-        };
-    }
-    authCreate(endpoints) {
-        return appEmailAuthCreate({
-            db: this.db,
-            users: this.users,
-            host: this.host,
-            port: this.port,
-            serverEndpoint: endpoints.serverEndpoint,
-            appEndpoint: endpoints.appEndpoint,
-            secret: this.secret,
-            replyTo: this.replyTo,
-            mailSend: this.mailSend
-        }, async ({ email, token }) => {
-            await this.mailSend(appEmailAuthMessageBuild({
-                email,
-                token,
-                host: this.host,
-                port: this.port,
-                serverEndpoint: endpoints.serverEndpoint,
-                appEndpoint: endpoints.appEndpoint,
-                replyTo: this.replyTo
-            }));
+        return this.pendingLock.inLock(async () => {
+            const now = Date.now();
+            this.pendingPrune(now);
+            const pending = this.pendingEmails.get(normalizedEmail);
+            if (!pending) {
+                throw new Error("Invalid or expired sign-in code.");
+            }
+            if (now > pending.expiresAt) {
+                this.pendingEmails.delete(normalizedEmail);
+                throw new Error("Invalid or expired sign-in code.");
+            }
+            if (pending.failedAttempts >= APP_EMAIL_CODE_MAX_ATTEMPTS) {
+                this.pendingEmails.delete(normalizedEmail);
+                throw new Error("Too many failed attempts. Request a new sign-in code.");
+            }
+            const providedHash = appEmailCodeHash(this.secret, normalizedEmail, pending.salt, normalizedCode);
+            if (!timingSafeEqual(providedHash, pending.codeHash)) {
+                const failedAttempts = pending.failedAttempts + 1;
+                if (failedAttempts >= APP_EMAIL_CODE_MAX_ATTEMPTS) {
+                    this.pendingEmails.delete(normalizedEmail);
+                    throw new Error("Too many failed attempts. Request a new sign-in code.");
+                }
+                this.pendingEmails.set(normalizedEmail, {
+                    ...pending,
+                    failedAttempts,
+                    updatedAt: now
+                });
+                throw new Error("Invalid or expired sign-in code.");
+            }
+            this.pendingEmails.delete(normalizedEmail);
+            const userId = await this.userIdResolveByEmail(normalizedEmail);
+            return {
+                email: normalizedEmail,
+                userId
+            };
         });
     }
+    pendingPrune(now) {
+        for (const [email, challenge] of this.pendingEmails.entries()) {
+            if (challenge.expiresAt <= now ||
+                challenge.requestWindowStartedAt + APP_EMAIL_CODE_REQUEST_WINDOW_MS <= now ||
+                challenge.updatedAt + APP_EMAIL_CODE_REQUEST_WINDOW_MS <= now) {
+                this.pendingEmails.delete(email);
+            }
+        }
+    }
     async userIdResolveByEmail(email) {
-        const connectorKey = userConnectorKeyCreate("email", email);
-        const existing = await this.users.findByConnectorKey(connectorKey);
+        const connector = { name: "email", key: email };
+        const existing = await this.users.findByConnector(connector);
         if (existing) {
             return existing.id;
         }
-        const allUsers = await this.users.findMany();
         try {
             const created = await this.users.create({
-                isOwner: allUsers.length === 0,
-                connectorKey
+                connector
             });
             return created.id;
         }
         catch (error) {
-            const raced = await this.users.findByConnectorKey(connectorKey);
+            const raced = await this.users.findByConnector(connector);
             if (raced) {
                 return raced.id;
             }
@@ -128,91 +146,42 @@ export class AppEmailAuth {
 function appEmailNormalize(email) {
     return email.trim().toLowerCase();
 }
-function appEmailAuthCreate(options, sendMagicLink) {
-    return betterAuth({
-        secret: options.secret,
-        baseURL: appEmailAuthBaseUrlResolve(options.host, options.port, options.serverEndpoint),
-        session: {
-            expiresIn: APP_AUTH_SESSION_EXPIRES_IN_SECONDS
-        },
-        database: drizzleAdapter(options.db, {
-            provider: "pg",
-            schema: {
-                user: appAuthUsersTable,
-                session: appAuthSessionsTable,
-                account: appAuthAccountsTable,
-                verification: appAuthVerificationsTable
-            },
-            usePlural: false
-        }),
-        plugins: [
-            magicLink({
-                sendMagicLink: async ({ email, token }) => {
-                    await sendMagicLink({ email, token });
-                }
-            })
-        ]
-    });
+function appEmailIsValid(email) {
+    return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email);
 }
-function appEmailAuthBaseUrlResolve(host, port, serverEndpoint) {
-    return serverEndpoint?.trim() || `http://${host}:${port}`;
+function appEmailCodeGenerate() {
+    return `${randomInt(1, 10)}${randomInt(0, 10)}${randomInt(0, 10)}${randomInt(0, 10)}${randomInt(0, 10)}${randomInt(0, 10)}`;
 }
-function appEmailAuthHeadersBuild(headers, host, port, serverEndpoint) {
-    const result = new Headers();
-    const source = headers instanceof Headers
-        ? headers
-        : Array.isArray(headers)
-            ? new Headers(headers)
-            : new Headers(appEmailAuthHeadersNormalize(headers));
-    source.forEach((value, key) => {
-        result.set(key, value);
-    });
-    const baseUrl = new URL(appEmailAuthBaseUrlResolve(host, port, serverEndpoint));
-    if (!result.has("host")) {
-        result.set("host", baseUrl.host);
-    }
-    if (!result.has("origin")) {
-        result.set("origin", baseUrl.origin);
-    }
-    if (!result.has("x-forwarded-host")) {
-        result.set("x-forwarded-host", baseUrl.host);
-    }
-    if (!result.has("x-forwarded-proto")) {
-        result.set("x-forwarded-proto", baseUrl.protocol.replace(":", ""));
-    }
-    return result;
+function appEmailCodeNormalize(code) {
+    const digits = code.replaceAll(/\D/g, "");
+    return /^[1-9][0-9]{5}$/.test(digits) ? digits : null;
 }
-function appEmailAuthHeadersNormalize(headers) {
-    if (!headers || headers instanceof Headers || Array.isArray(headers)) {
-        return {};
-    }
-    const result = {};
-    for (const [key, value] of Object.entries(headers)) {
-        if (typeof value === "string") {
-            result[key] = value;
-            continue;
-        }
-        if (Array.isArray(value)) {
-            result[key] = value.join(", ");
-        }
-    }
-    return result;
+function appEmailCodeHash(secret, email, salt, code) {
+    return createHmac("sha256", secret).update(`${email}:${salt}:${code}`, "utf8").digest();
+}
+function appEmailRetryMessage(retryAfterMs) {
+    return `Please wait ${appEmailSecondsText(retryAfterMs)} before requesting another sign-in code.`;
+}
+function appEmailSecondsText(durationMs) {
+    const seconds = Math.max(1, Math.ceil(durationMs / 1000));
+    return `${seconds} second${seconds === 1 ? "" : "s"}`;
+}
+function appEmailMinutesText(durationMs) {
+    const minutes = Math.max(1, Math.ceil(durationMs / 60_000));
+    return `${minutes} minute${minutes === 1 ? "" : "s"}`;
 }
 function appEmailAuthMessageBuild(options) {
-    const url = appAuthPayloadUrlBuild(options.host, options.port, {
-        backendUrl: options.serverEndpoint?.trim() ?? "",
-        token: options.token,
-        kind: "email"
-    }, options.appEndpoint, options.serverEndpoint);
+    const expiresInMinutes = Math.max(1, Math.ceil((options.expiresAt - Date.now()) / 60_000));
+    const expirationText = `${expiresInMinutes} minute${expiresInMinutes === 1 ? "" : "s"}`;
     return {
         to: options.email,
-        subject: "Your Daycare sign-in link",
+        subject: "Your Daycare sign-in code",
         replyTo: options.replyTo,
-        text: `Use this link to sign in to Daycare: ${url}`,
+        text: `Your Daycare sign-in code is ${options.code}. It expires in ${expirationText}.`,
         html: [
-            "<p>Use this link to sign in to Daycare.</p>",
-            `<p><a href="${url}">Open Daycare</a></p>`,
-            `<p>${url}</p>`
+            "<p>Your Daycare sign-in code is:</p>",
+            `<p><strong style="font-size: 28px; letter-spacing: 4px;">${options.code}</strong></p>`,
+            `<p>It expires in ${expirationText}.</p>`
         ].join("")
     };
 }

package/dist/api/app-server/appEmailAuth.js.map

@@ -1 +1 @@
-{"version":3,"file":"appEmailAuth.js","sourceRoot":"","sources":["../../../sources/api/app-server/appEmailAuth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"appEmailAuth.js","sourceRoot":"","sources":["../../../sources/api/app-server/appEmailAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGlF,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,MAAM,CAAC,MAAM,4BAA4B,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC3D,MAAM,CAAC,MAAM,2BAA2B,GAAG,EAAE,GAAG,IAAI,CAAC;AACrD,MAAM,CAAC,MAAM,gCAAgC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC/D,MAAM,CAAC,MAAM,sCAAsC,GAAG,CAAC,CAAC;AACxD,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC;AAyB7C;;;GAGG;AACH,MAAM,OAAO,YAAY;IACJ,KAAK,CAAkB;IACvB,MAAM,CAAS;IACf,OAAO,CAAU;IACjB,QAAQ,CAAkC;IAC1C,aAAa,GAAG,IAAI,GAAG,EAA6B,CAAC;IACrD,WAAW,GAAG,IAAI,SAAS,EAAE,CAAC;IAE/C,YAAY,OAA4B;QACpC,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAa;QACvB,MAAM,eAAe,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACjD,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAClD,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;YACtC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAEvB,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YACzD,IAAI,QAAQ,IAAI,GAAG,GAAG,QAAQ,CAAC,iBAAiB,EAAE,CAAC;gBAC/C,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,QAAQ,CAAC,iBAAiB,GAAG,GAAG,CAAC,CAAC,CAAC;YAC5E,CAAC;YAED,MAAM,sBAAsB,GACxB,QAAQ,IAAI,GAAG,GAAG,QAAQ,CAAC,sBAAsB,GAAG,gCAAgC;gBAChF,CAAC,CAAC,QAAQ,CAAC,sBAAsB;gBACjC,CAAC,CAAC,GAAG,CAAC;YACd,MAAM,YAAY,GACd,QAAQ,IAAI,sBAAsB,KAAK,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3G,IAAI,YAAY,GAAG,sCAAsC,EAAE,CAAC;gBACxD,MAAM,IAAI,KAAK,CACX,kDAAkD,mBAAmB,CACjE,sBAAsB,GAAG,gCAAgC,GAAG,GAAG,CAClE,GAAG,CACP,CAAC;YACN,CAAC;YAED,MAAM,IAAI,GAAG,oBAAoB,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC7C,MAAM,SAAS,GAAG,GAAG,GAAG,4BAA4B,CAAC;YACrD,MAAM,iBAAiB,GAAG,GAAG,GAAG,2BAA2B,CAAC;YAE5D,MAAM,IAAI,CAAC,QAAQ,CACf,wBAAwB,CAAC;gBACrB,KAAK,EAAE,eAAe;gBACtB,IAAI;gBACJ,SAAS;gBACT,OAAO,EAAE,IAAI,CAAC,OAAO;aACxB,CAAC,CACL,CAAC;YAEF,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,EAAE;gBACpC,QAAQ,EAAE,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,CAAC;gBACpE,IAAI;gBACJ,SAAS;gBACT,iBAAiB;gBACjB,sBAAsB;gBACtB,YAAY;gBACZ,cAAc,EAAE,CAAC;gBACjB,SAAS,EAAE,GAAG;aACjB,CAAC,CAAC;YAEH,OAAO;gBACH,SAAS;gBACT,YAAY,EAAE,2BAA2B;aAC5C,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAa,EAAE,IAAY;QACpC,MAAM,eAAe,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,cAAc,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACnD,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAChD,CAAC;QAED,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;YACtC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAEvB,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YACxD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,GAAG,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;gBAC1B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;gBAC3C,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,OAAO,CAAC,cAAc,IAAI,2BAA2B,EAAE,CAAC;gBACxD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;gBAC3C,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;YAC7E,CAAC;YAED,MAAM,YAAY,GAAG,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YAClG,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACnD,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,GAAG,CAAC,CAAC;gBAClD,IAAI,cAAc,IAAI,2BAA2B,EAAE,CAAC;oBAChD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;oBAC3C,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;gBAC7E,CAAC;gBACD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,EAAE;oBACpC,GAAG,OAAO;oBACV,cAAc;oBACd,SAAS,EAAE,GAAG;iBACjB,CAAC,CAAC;gBACH,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;YACxD,CAAC;YAED,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;YAChE,OAAO;gBACH,KAAK,EAAE,eAAe;gBACtB,MAAM;aACT,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,YAAY,CAAC,GAAW;QAC5B,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;YAC5D,IACI,SAAS,CAAC,SAAS,IAAI,GAAG;gBAC1B,SAAS,CAAC,sBAAsB,GAAG,gCAAgC,IAAI,GAAG;gBAC1E,SAAS,CAAC,SAAS,GAAG,gCAAgC,IAAI,GAAG,EAC/D,CAAC;gBACC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACrC,CAAC;QACL,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,KAAa;QAC5C,MAAM,SAAS,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;QAChD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAC7D,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,QAAQ,CAAC,EAAE,CAAC;QACvB,CAAC;QAED,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;gBACpC,SAAS;aACZ,CAAC,CAAC;YACH,OAAO,OAAO,CAAC,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YAC1D,IAAI,KAAK,EAAE,CAAC;gBACR,OAAO,KAAK,CAAC,EAAE,CAAC;YACpB,CAAC;YACD,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;CACJ;AAED,SAAS,iBAAiB,CAAC,KAAa;IACpC,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AACtC,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IAClC,OAAO,4BAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,oBAAoB;IACzB,OAAO,GAAG,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;AAChI,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAY;IACvC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC1C,OAAO,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1D,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAc,EAAE,KAAa,EAAE,IAAY,EAAE,IAAY;IAC/E,OAAO,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,KAAK,IAAI,IAAI,IAAI,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC;AAC5F,CAAC;AAED,SAAS,oBAAoB,CAAC,YAAoB;IAC9C,OAAO,eAAe,mBAAmB,CAAC,YAAY,CAAC,0CAA0C,CAAC;AACtG,CAAC;AAED,SAAS,mBAAmB,CAAC,UAAkB;IAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC;IAC1D,OAAO,GAAG,OAAO,UAAU,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;AAC1D,CAAC;AAED,SAAS,mBAAmB,CAAC,UAAkB;IAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC;IAC5D,OAAO,GAAG,OAAO,UAAU,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;AAC1D,CAAC;AAED,SAAS,wBAAwB,CAAC,OAKjC;IACG,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;IAC3F,MAAM,cAAc,GAAG,GAAG,gBAAgB,UAAU,gBAAgB,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IAExF,OAAO;QACH,EAAE,EAAE,OAAO,CAAC,KAAK;QACjB,OAAO,EAAE,2BAA2B;QACpC,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,gCAAgC,OAAO,CAAC,IAAI,mBAAmB,cAAc,GAAG;QACtF,IAAI,EAAE;YACF,sCAAsC;YACtC,4DAA4D,OAAO,CAAC,IAAI,eAAe;YACvF,oBAAoB,cAAc,OAAO;SAC5C,CAAC,IAAI,CAAC,EAAE,CAAC;KACb,CAAC;AACN,CAAC"}

package/dist/api/app-server/appEmailConnect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appEmailConnect.d.ts","sourceRoot":"","sources":["../../../sources/api/app-server/appEmailConnect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAGxE,OAAO,EAAE,KAAK,yBAAyB,EAA8B,MAAM,iCAAiC,CAAC;AAE7G,eAAO,MAAM,oCAAoC,QAAU,CAAC;AAG5D,MAAM,MAAM,sBAAsB,GAAG;IACjC,KAAK,EAAE,eAAe,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD,CAAC;AAOF;;;GAGG;AACH,qBAAa,eAAe;IACxB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkB;IACxC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqC;gBAElD,OAAO,EAAE,sBAAsB;IAWrC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgD1F,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAwB1E"}
+{"version":3,"file":"appEmailConnect.d.ts","sourceRoot":"","sources":["../../../sources/api/app-server/appEmailConnect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAGxE,OAAO,EAAE,KAAK,yBAAyB,EAA8B,MAAM,iCAAiC,CAAC;AAE7G,eAAO,MAAM,oCAAoC,QAAU,CAAC;AAG5D,MAAM,MAAM,sBAAsB,GAAG;IACjC,KAAK,EAAE,eAAe,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD,CAAC;AAOF;;;GAGG;AACH,qBAAa,eAAe;IACxB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAkB;IACxC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqC;gBAElD,OAAO,EAAE,sBAAsB;IAWrC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgD1F,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;CAwB1E"}

package/dist/api/app-server/appEmailConnect.js

@@ -1,4 +1,3 @@
-import { userConnectorKeyCreate } from "../../storage/userConnectorKeyCreate.js";
 import { jwtSign, jwtVerify } from "../../utils/jwt.js";
 import { appAuthPayloadUrlBuild } from "./appAuthLinkTool.js";
 import { appRequestEndpointsResolve } from "./appRequestEndpointsResolve.js";
@@ -40,8 +39,8 @@ export class AppEmailConnect {
         if (!user) {
             throw new Error("User not found.");
         }
-        const connectorKey = userConnectorKeyCreate("email", normalizedEmail);
-        const existing = await this.users.findByConnectorKey(connectorKey);
+        const connector = { name: "email", key: normalizedEmail };
+        const existing = await this.users.findByConnector(connector);
         if (existing?.id === normalizedUserId) {
             throw new Error("Email is already connected.");
         }
@@ -79,15 +78,15 @@ export class AppEmailConnect {
         if (!user) {
             throw new Error("User not found.");
         }
-        const connectorKey = userConnectorKeyCreate("email", payload.email);
-        const existing = await this.users.findByConnectorKey(connectorKey);
+        const connector = { name: "email", key: payload.email };
+        const existing = await this.users.findByConnector(connector);
         if (existing?.id === payload.userId) {
             return payload;
         }
         if (existing) {
             throw new Error("Email is already connected to another account.");
         }
-        await this.users.addConnectorKey(payload.userId, connectorKey);
+        await this.users.addConnector(payload.userId, connector);
         return payload;
     }
 }