@comfyorg/account-core 1.0.0-alpha.2 → 1.0.0-alpha.3

package/dist/core/billing/telemetry/webHandoffEvent.d.ts

@@ -0,0 +1,11 @@
+import type { HostedBillingIntent, PaymentIntentSource } from './vocabulary.js';
+export type WebHandoffBillingEvent = {
+    operation: 'web_handoff';
+    stage: 'opened';
+    outcome: 'pending';
+    intent: HostedBillingIntent;
+    result: 'opened' | 'blocked';
+    payment_intent_source?: PaymentIntentSource;
+    /** The cloud journey id the entry link carries as `correlation_id`. */
+    correlation_id: string;
+};

package/dist/core/billing/telemetry/webHandoffEvent.js

@@ -0,0 +1 @@
+export {};

package/dist/core/billing/telemetry/webReturnEvent.d.ts

@@ -0,0 +1,8 @@
+/** Back from a checkout step, the frame's close, the finished checkout's close, or the surface's link to the host. */
+export type WebReturnControl = 'back' | 'close' | 'success_close' | 'host_link';
+export type WebReturnBillingEvent = {
+    operation: 'web_return';
+    stage: 'clicked';
+    outcome: 'pending';
+    control: WebReturnControl;
+};

package/dist/core/billing/telemetry/webReturnEvent.js

@@ -0,0 +1 @@
+export {};

package/dist/core/billing/telemetry/webSessionEvent.d.ts

@@ -0,0 +1,17 @@
+import type { SessionErrorCode } from '../../sessionContracts.js';
+export type WebSessionMode = 'session-client' | 'web-session';
+export type WebSessionBillingEvent = {
+    operation: 'web_session';
+    outcome: 'pending';
+} & ({
+    stage: 'signin_required';
+    reason: 'no_session' | 'refused';
+} | {
+    stage: 'established';
+    /** `interactive` once the customer signed in on billing web itself; `restored` when a session was already there. */
+    origin: 'restored' | 'interactive';
+    mode: WebSessionMode;
+} | {
+    stage: 'failed';
+    error_code: SessionErrorCode;
+});

package/dist/core/billing/telemetry/webSessionEvent.js

@@ -0,0 +1 @@
+export {};

package/dist/core/webSession.d.ts

@@ -21,7 +21,8 @@ export declare function createWebSession(options: WebSessionOptions, getIdentity
 /** Sends no CSRF token: sign-out must work against a dead session. */
 export declare function deleteWebSession(options: WebSessionOptions): Promise<WebSessionCommandResult>;
 /**
- * Signs the user out of every device. Only a body the contract recognises is
- * ok: the caller tells the user every device is signed out on that answer.
+ * Signs the user out of every device with the session cookie alone. Only a
+ * body the contract recognises is ok: the caller tells the user every device
+ * is signed out on that answer.
  */
-export declare function revokeAllWebSessions(options: WebSessionOptions, csrfToken: string, getIdentityProof: () => Promise<string>): Promise<WebSessionCommandResult>;
+export declare function revokeAllWebSessions(options: WebSessionOptions, csrfToken: string): Promise<WebSessionCommandResult>;

package/dist/core/webSession.js

@@ -4,6 +4,7 @@
  * Identity proof is an opaque string from the caller, so no provider leaks in.
  */
 import { zCreateSessionResponse, zDeleteSessionResponse, zErrorResponse, zGetSessionResponse, zRevokeAllSessionsResponse } from '@comfyorg/ingest-types/zod';
+import { COMFY_CLIENT } from './requestAuth.js';
 import { timedSignal } from './requestTimeout.js';
 const UNAUTHORIZED_CODES = {
     no_session: 'NO_SESSION',
@@ -125,14 +126,14 @@ export async function deleteWebSession(options) {
     return { status: 'ok' };
 }
 /**
- * Signs the user out of every device. Only a body the contract recognises is
- * ok: the caller tells the user every device is signed out on that answer.
+ * Signs the user out of every device with the session cookie alone. Only a
+ * body the contract recognises is ok: the caller tells the user every device
+ * is signed out on that answer.
  */
-export async function revokeAllWebSessions(options, csrfToken, getIdentityProof) {
-    const proof = await getIdentityProof();
+export async function revokeAllWebSessions(options, csrfToken) {
     const sent = await send(options, '/auth/sessions/revoke-all', {
         method: 'POST',
-        headers: { Authorization: `Bearer ${proof}`, 'X-CSRF-Token': csrfToken }
+        headers: { 'X-Comfy-Client': COMFY_CLIENT, 'X-CSRF-Token': csrfToken }
     });
     if ('code' in sent)
         return sent;

package/dist/core/webSessionIdentity.d.ts

@@ -187,8 +187,8 @@ declare const zSharedMessage: z.ZodObject<{
                 name?: string | undefined;
                 signInProvider?: string | undefined;
             };
-            expiresAt: number;
             csrfToken: string;
+            expiresAt: number;
             absoluteExpiresAt: number;
         }, {
             user: {
@@ -198,8 +198,8 @@ declare const zSharedMessage: z.ZodObject<{
                 name?: string | undefined;
                 signInProvider?: string | undefined;
             };
-            expiresAt: number;
             csrfToken: string;
+            expiresAt: number;
             absoluteExpiresAt: number;
         }>;
     }, "strip", z.ZodTypeAny, {
@@ -212,8 +212,8 @@ declare const zSharedMessage: z.ZodObject<{
                 name?: string | undefined;
                 signInProvider?: string | undefined;
             };
-            expiresAt: number;
             csrfToken: string;
+            expiresAt: number;
             absoluteExpiresAt: number;
         };
     }, {
@@ -226,8 +226,8 @@ declare const zSharedMessage: z.ZodObject<{
                 name?: string | undefined;
                 signInProvider?: string | undefined;
             };
-            expiresAt: number;
             csrfToken: string;
+            expiresAt: number;
             absoluteExpiresAt: number;
         };
     }>, z.ZodObject<{
@@ -254,8 +254,8 @@ declare const zSharedMessage: z.ZodObject<{
                 name?: string | undefined;
                 signInProvider?: string | undefined;
             };
-            expiresAt: number;
             csrfToken: string;
+            expiresAt: number;
             absoluteExpiresAt: number;
         };
     } | {
@@ -275,8 +275,8 @@ declare const zSharedMessage: z.ZodObject<{
                 name?: string | undefined;
                 signInProvider?: string | undefined;
             };
-            expiresAt: number;
             csrfToken: string;
+            expiresAt: number;
             absoluteExpiresAt: number;
         };
     } | {

package/dist/signInSchemas.d.ts

@@ -2,7 +2,7 @@ import { z } from 'zod';
 /**
  * The exact message keys the schemas emit, so a host wires every one of them
  * or the compiler says which is missing. Both hosts already carry these keys:
- * the app in `src/locales/en/main.json`, the website in its translations map.
+ * the app in `src/locales/en/main.json`, the website in `apps/website/src/locales/en/main.json`.
  */
 export type AuthSchemaMessageKey = 'validation.prefix' | 'validation.length' | 'validation.invalidEmail' | 'validation.required' | 'validation.minLength' | 'validation.maxLength' | 'validation.password.uppercase' | 'validation.password.lowercase' | 'validation.password.number' | 'validation.password.special' | 'validation.password.match';
 export type AuthSchemaTranslate = (key: AuthSchemaMessageKey, params?: Record<string, string | number>) => string;

package/dist/telemetry.d.ts

@@ -4,10 +4,24 @@
  * every host. The package never calls a telemetry API itself; call sites
  * stay host-specific.
  */
+import type { WebSessionBootstrapEvent, WebSessionIdentityOptions } from './core/webSessionIdentity.js';
 export declare const SESSION_TELEMETRY_EVENT: {
     readonly refreshSucceeded: "auth.unified.refresh.succeeded";
     readonly refreshFailed: "auth.unified.refresh.failed";
+    readonly bootstrap: "session_bootstrap";
+    readonly signedOutRemotely: "session_signed_out_remotely";
 };
+export type WebSessionTelemetryEvent = {
+    readonly name: typeof SESSION_TELEMETRY_EVENT.bootstrap;
+    readonly properties: WebSessionBootstrapEvent;
+} | {
+    readonly name: typeof SESSION_TELEMETRY_EVENT.signedOutRemotely;
+    readonly properties: {
+        readonly origin: string;
+    };
+};
+/** The web-session identity's telemetry hooks, routed to one host sink. */
+export declare function webSessionTelemetryHooks(track: (event: WebSessionTelemetryEvent) => void): Pick<WebSessionIdentityOptions, 'onBootstrap' | 'onSignedOutRemotely'>;
 /**
  * The cloud app's `billing.operation.*` events, emitted by the billing
  * operation lifecycle for every observed `billing_op_id` regardless of
@@ -19,6 +33,18 @@ export declare const BILLING_OPERATION_TELEMETRY_EVENT: {
     readonly failed: "billing.operation.failed";
     readonly timeout: "billing.operation.timeout";
 };
+/**
+ * Payment friction the lifecycle observes inside one operation: a bank
+ * challenge and its verdict, each retryable decline, and a hosted step the
+ * customer was sent to and came back from.
+ */
+export declare const BILLING_CHECKOUT_FRICTION_TELEMETRY_EVENT: {
+    readonly challengeRequired: "billing.checkout.challenge_required";
+    readonly challengeCompleted: "billing.checkout.challenge_completed";
+    readonly challengeFailed: "billing.checkout.challenge_failed";
+    readonly redirectStarted: "billing.checkout.redirect_started";
+    readonly returned: "billing.checkout.returned";
+};
 export declare const AUTH_TELEMETRY_EVENT: {
     readonly signUpOpened: "app:user_sign_up_opened";
     readonly authCompleted: "app:user_auth_completed";

package/dist/telemetry.js

@@ -1,13 +1,22 @@
-/**
- * Shared telemetry vocabulary. The event names match the cloud app's
- * TelemetryEvents verbatim so an auth outcome is one queryable event across
- * every host. The package never calls a telemetry API itself; call sites
- * stay host-specific.
- */
 export const SESSION_TELEMETRY_EVENT = {
     refreshSucceeded: 'auth.unified.refresh.succeeded',
-    refreshFailed: 'auth.unified.refresh.failed'
+    refreshFailed: 'auth.unified.refresh.failed',
+    bootstrap: 'session_bootstrap',
+    signedOutRemotely: 'session_signed_out_remotely'
 };
+/** The web-session identity's telemetry hooks, routed to one host sink. */
+export function webSessionTelemetryHooks(track) {
+    return {
+        onBootstrap: ({ outcome, origin }) => track({
+            name: SESSION_TELEMETRY_EVENT.bootstrap,
+            properties: { outcome, origin }
+        }),
+        onSignedOutRemotely: ({ origin }) => track({
+            name: SESSION_TELEMETRY_EVENT.signedOutRemotely,
+            properties: { origin }
+        })
+    };
+}
 /**
  * The cloud app's `billing.operation.*` events, emitted by the billing
  * operation lifecycle for every observed `billing_op_id` regardless of
@@ -19,6 +28,18 @@ export const BILLING_OPERATION_TELEMETRY_EVENT = {
     failed: 'billing.operation.failed',
     timeout: 'billing.operation.timeout'
 };
+/**
+ * Payment friction the lifecycle observes inside one operation: a bank
+ * challenge and its verdict, each retryable decline, and a hosted step the
+ * customer was sent to and came back from.
+ */
+export const BILLING_CHECKOUT_FRICTION_TELEMETRY_EVENT = {
+    challengeRequired: 'billing.checkout.challenge_required',
+    challengeCompleted: 'billing.checkout.challenge_completed',
+    challengeFailed: 'billing.checkout.challenge_failed',
+    redirectStarted: 'billing.checkout.redirect_started',
+    returned: 'billing.checkout.returned'
+};
 export const AUTH_TELEMETRY_EVENT = {
     signUpOpened: 'app:user_sign_up_opened',
     authCompleted: 'app:user_auth_completed',

package/dist/testing.d.ts

@@ -36,7 +36,8 @@ export interface FakeWebSessionEndpoint {
 /**
  * A `fetch` serving ingest's session routes under `/api/auth`. POST with a
  * bearer proof signs `signInUser` in; DELETE and revoke-all leave the cookie
- * revoked, as the real endpoint does.
+ * revoked, as the real endpoint does. Revoke-all serves only the cookie path,
+ * which needs the CSRF token and `X-Comfy-Client`.
  */
 export declare function createFakeWebSessionEndpoint({ state, signInUser, now }: {
     state: FakeWebSessionState;

package/dist/testing.js

@@ -67,15 +67,15 @@ function routesFor(signInUser, now) {
         [
             'POST /api/auth/sessions/revoke-all',
             (endpoint, headers) => {
-                if (!headers.get('authorization')?.startsWith('Bearer ')) {
-                    return errorResponse(401, 'no_session');
-                }
                 if (endpoint.state.kind === 'dead') {
                     return errorResponse(401, endpoint.state.code);
                 }
                 if (headers.get('x-csrf-token') !== FAKE_CSRF_TOKEN) {
                     return errorResponse(403, 'csrf_invalid');
                 }
+                if (!headers.has('x-comfy-client')) {
+                    return errorResponse(403, 'origin_not_allowed');
+                }
                 revoke(endpoint);
                 return jsonResponse(200, { revoked: 1 });
             }
@@ -85,7 +85,8 @@ function routesFor(signInUser, now) {
 /**
  * A `fetch` serving ingest's session routes under `/api/auth`. POST with a
  * bearer proof signs `signInUser` in; DELETE and revoke-all leave the cookie
- * revoked, as the real endpoint does.
+ * revoked, as the real endpoint does. Revoke-all serves only the cookie path,
+ * which needs the CSRF token and `X-Comfy-Client`.
  */
 export function createFakeWebSessionEndpoint({ state, signInUser = fakeWebSessionUser(), now = Date.now }) {
     const requests = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comfyorg/account-core",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.3",
   "description": "Shared account layer: a framework-free session core that exchanges a signed-in identity for the workspace-scoped Cloud JWT with valid-on-read freshness, plus the package-owned Firebase identity entry. It has no view layer and no Vue dependency; the composables and unstyled components ship from @comfyorg/account-ui",
   "keywords": [],
   "homepage": "https://comfy.org",
@@ -127,6 +127,8 @@
     "zod": "^3.23.8"
   },
   "scripts": {
+    "format": "oxfmt --write",
+    "format:check": "oxfmt --check",
     "build": "pnpm run clean && tsc -p tsconfig.build.json",
     "check:pack": "tsx scripts/checkPublishable.ts",
     "clean": "node --input-type=module -e \"import { rmSync } from 'node:fs'; rmSync('dist', { recursive: true, force: true })\"",