@umituz/web-polar-payment 1.0.6 → 1.0.8

package/dist/index.d.mts

@@ -85,11 +85,11 @@ interface PolarAdapter {
     getPortalUrl(userId: string): Promise<string>;
 }
 
-type FirebaseFunctions = any;
-type FirebaseFirestore = any;
 interface FirebaseAdapterConfig {
-    functions: FirebaseFunctions;
-    firestore: FirebaseFirestore;
+    /** Firebase Functions instance from firebase/functions */
+    functions: unknown;
+    /** Firebase Firestore instance from firebase/firestore */
+    firestore: unknown;
     callables?: {
         createCheckout?: string;
         syncSubscription?: string;
@@ -133,12 +133,12 @@ declare const FREE_PLAN = "free";
 
 /**
  * Normalize a raw Polar status string to a known value.
- * @description Defaults to 'none' for unknown statuses.
+ * @description Defaults to 'none' for unknown statuses or non-string input.
  */
 declare function normalizeStatus(raw: string): SubscriptionStatusValue;
 /**
  * Normalize billing interval
- * @description Maps 'month'/'year' to 'monthly'/'yearly'
+ * @description Maps 'month'/'year' to 'monthly'/'yearly'. Defaults to 'monthly' for unknown values or non-string input.
  */
 declare function normalizeBillingCycle(interval: string): BillingCycle;
 

package/dist/index.d.ts

@@ -85,11 +85,11 @@ interface PolarAdapter {
     getPortalUrl(userId: string): Promise<string>;
 }
 
-type FirebaseFunctions = any;
-type FirebaseFirestore = any;
 interface FirebaseAdapterConfig {
-    functions: FirebaseFunctions;
-    firestore: FirebaseFirestore;
+    /** Firebase Functions instance from firebase/functions */
+    functions: unknown;
+    /** Firebase Firestore instance from firebase/firestore */
+    firestore: unknown;
     callables?: {
         createCheckout?: string;
         syncSubscription?: string;
@@ -133,12 +133,12 @@ declare const FREE_PLAN = "free";
 
 /**
  * Normalize a raw Polar status string to a known value.
- * @description Defaults to 'none' for unknown statuses.
+ * @description Defaults to 'none' for unknown statuses or non-string input.
  */
 declare function normalizeStatus(raw: string): SubscriptionStatusValue;
 /**
  * Normalize billing interval
- * @description Maps 'month'/'year' to 'monthly'/'yearly'
+ * @description Maps 'month'/'year' to 'monthly'/'yearly'. Defaults to 'monthly' for unknown values or non-string input.
  */
 declare function normalizeBillingCycle(interval: string): BillingCycle;
 

package/dist/index.js

@@ -56,16 +56,32 @@ function normalizeStatus(raw) {
     revoked: "revoked",
     none: "none"
   };
-  return map[raw?.toLowerCase()] ?? "none";
+  if (typeof raw !== "string") return "none";
+  return map[raw.toLowerCase()] ?? "none";
 }
 function normalizeBillingCycle(interval) {
-  if (interval === "month" || interval === "monthly") return "monthly";
-  if (interval === "year" || interval === "yearly") return "yearly";
+  if (typeof interval !== "string") return "monthly";
+  const normalized = interval.toLowerCase();
+  if (normalized === "month" || normalized === "monthly") return "monthly";
+  if (normalized === "year" || normalized === "yearly") return "yearly";
   return "monthly";
 }
 
 // src/infrastructure/services/firebase-billing.service.ts
+function asString(value) {
+  if (typeof value === "string") return value;
+  return void 0;
+}
+function asBoolean(value) {
+  if (typeof value === "boolean") return value;
+  return void 0;
+}
+function isTimestamp(value) {
+  return typeof value === "object" && value !== null && "toDate" in value && typeof value.toDate === "function";
+}
 function createFirebaseAdapter(config) {
+  const functions = config.functions;
+  const firestore = config.firestore;
   const callables = {
     createCheckout: config.callables?.createCheckout ?? "createCheckoutSession",
     sync: config.callables?.syncSubscription ?? "syncSubscription",
@@ -85,14 +101,14 @@ function createFirebaseAdapter(config) {
   };
   async function callable(name, data) {
     const { httpsCallable } = await import("firebase/functions");
-    const fn = httpsCallable(config.functions, name);
+    const fn = httpsCallable(functions, name);
     const result = await fn(data);
     return result.data;
   }
   return {
     async getStatus(userId) {
       const { doc, getDoc } = await import("firebase/firestore");
-      const snap = await getDoc(doc(config.firestore, db.collection, userId));
+      const snap = await getDoc(doc(firestore, db.collection, userId));
       if (!snap.exists()) {
         return { plan: "free", subscriptionStatus: "none" };
       }
@@ -100,19 +116,19 @@ function createFirebaseAdapter(config) {
       let currentPeriodEnd;
       const rawEnd = d[db.currentPeriodEnd];
       if (rawEnd != null) {
-        if (typeof rawEnd === "object" && "toDate" in rawEnd) {
+        if (isTimestamp(rawEnd)) {
           currentPeriodEnd = rawEnd.toDate().toISOString();
         } else if (typeof rawEnd === "string") {
           currentPeriodEnd = rawEnd;
         }
       }
       return {
-        plan: d[db.plan] ?? "free",
-        billingCycle: normalizeBillingCycle(d[db.billingCycle] ?? "monthly"),
-        subscriptionId: d[db.subscriptionId],
-        subscriptionStatus: normalizeStatus(d[db.subscriptionStatus] ?? "none"),
-        polarCustomerId: d[db.polarCustomerId],
-        cancelAtPeriodEnd: d[db.cancelAtPeriodEnd],
+        plan: asString(d[db.plan]) ?? "free",
+        billingCycle: normalizeBillingCycle(asString(d[db.billingCycle]) ?? "monthly"),
+        subscriptionId: asString(d[db.subscriptionId]),
+        subscriptionStatus: normalizeStatus(asString(d[db.subscriptionStatus]) ?? "none"),
+        polarCustomerId: asString(d[db.polarCustomerId]),
+        cancelAtPeriodEnd: asBoolean(d[db.cancelAtPeriodEnd]),
         currentPeriodEnd
       };
     },
@@ -177,6 +193,11 @@ var FREE_STATUS = {
   plan: "free",
   subscriptionStatus: "none"
 };
+function normalizeUserId(userId) {
+  if (typeof userId !== "string") return void 0;
+  const trimmed = userId.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
 function PolarProvider({ adapter, userId, children }) {
   const [status, setStatus] = (0, import_react2.useState)(FREE_STATUS);
   const [loading, setLoading] = (0, import_react2.useState)(true);
@@ -184,7 +205,7 @@ function PolarProvider({ adapter, userId, children }) {
   adapterRef.current = adapter;
   const refreshAbortRef = (0, import_react2.useRef)(null);
   const refresh = (0, import_react2.useCallback)(async () => {
-    const uid = userId?.trim();
+    const uid = normalizeUserId(userId);
     if (!uid) {
       setStatus(FREE_STATUS);
       setLoading(false);
@@ -213,14 +234,15 @@ function PolarProvider({ adapter, userId, children }) {
     };
   }, [refresh]);
   const startCheckout = (0, import_react2.useCallback)(async (params) => {
-    const result = await adapterRef.current.createCheckout({ ...params, userId: userId?.trim() });
+    const uid = normalizeUserId(userId);
+    const result = await adapterRef.current.createCheckout({ ...params, userId: uid });
     if (!result.url.startsWith("https://")) {
-      throw new Error("Invalid checkout URL returned");
+      throw new Error("[polar-billing] Invalid checkout URL returned: URL must start with https://");
     }
     window.location.href = result.url;
   }, [userId]);
   const syncSubscription = (0, import_react2.useCallback)(async () => {
-    const uid = userId?.trim();
+    const uid = normalizeUserId(userId);
     if (!uid) return { synced: false };
     const checkoutId = new URLSearchParams(window.location.search).get("checkout_id") ?? void 0;
     const result = await adapterRef.current.syncSubscription(uid, checkoutId);
@@ -228,7 +250,7 @@ function PolarProvider({ adapter, userId, children }) {
     return result;
   }, [userId, refresh]);
   const getBillingHistory = (0, import_react2.useCallback)(async () => {
-    const uid = userId?.trim();
+    const uid = normalizeUserId(userId);
     if (!uid) return [];
     return adapterRef.current.getBillingHistory(uid);
   }, [userId]);
@@ -241,8 +263,8 @@ function PolarProvider({ adapter, userId, children }) {
     [refresh]
   );
   const getPortalUrl = (0, import_react2.useCallback)(async () => {
-    const uid = userId?.trim();
-    if (!uid) throw new Error("No authenticated user");
+    const uid = normalizeUserId(userId);
+    if (!uid) throw new Error("[polar-billing] Cannot get portal URL: No authenticated user");
     return adapterRef.current.getPortalUrl(uid);
   }, [userId]);
   const value = (0, import_react2.useMemo)(

package/dist/index.mjs

@@ -12,16 +12,32 @@ function normalizeStatus(raw) {
     revoked: "revoked",
     none: "none"
   };
-  return map[raw?.toLowerCase()] ?? "none";
+  if (typeof raw !== "string") return "none";
+  return map[raw.toLowerCase()] ?? "none";
 }
 function normalizeBillingCycle(interval) {
-  if (interval === "month" || interval === "monthly") return "monthly";
-  if (interval === "year" || interval === "yearly") return "yearly";
+  if (typeof interval !== "string") return "monthly";
+  const normalized = interval.toLowerCase();
+  if (normalized === "month" || normalized === "monthly") return "monthly";
+  if (normalized === "year" || normalized === "yearly") return "yearly";
   return "monthly";
 }
 
 // src/infrastructure/services/firebase-billing.service.ts
+function asString(value) {
+  if (typeof value === "string") return value;
+  return void 0;
+}
+function asBoolean(value) {
+  if (typeof value === "boolean") return value;
+  return void 0;
+}
+function isTimestamp(value) {
+  return typeof value === "object" && value !== null && "toDate" in value && typeof value.toDate === "function";
+}
 function createFirebaseAdapter(config) {
+  const functions = config.functions;
+  const firestore = config.firestore;
   const callables = {
     createCheckout: config.callables?.createCheckout ?? "createCheckoutSession",
     sync: config.callables?.syncSubscription ?? "syncSubscription",
@@ -41,14 +57,14 @@ function createFirebaseAdapter(config) {
   };
   async function callable(name, data) {
     const { httpsCallable } = await import("firebase/functions");
-    const fn = httpsCallable(config.functions, name);
+    const fn = httpsCallable(functions, name);
     const result = await fn(data);
     return result.data;
   }
   return {
     async getStatus(userId) {
       const { doc, getDoc } = await import("firebase/firestore");
-      const snap = await getDoc(doc(config.firestore, db.collection, userId));
+      const snap = await getDoc(doc(firestore, db.collection, userId));
       if (!snap.exists()) {
         return { plan: "free", subscriptionStatus: "none" };
       }
@@ -56,19 +72,19 @@ function createFirebaseAdapter(config) {
       let currentPeriodEnd;
       const rawEnd = d[db.currentPeriodEnd];
       if (rawEnd != null) {
-        if (typeof rawEnd === "object" && "toDate" in rawEnd) {
+        if (isTimestamp(rawEnd)) {
           currentPeriodEnd = rawEnd.toDate().toISOString();
         } else if (typeof rawEnd === "string") {
           currentPeriodEnd = rawEnd;
         }
       }
       return {
-        plan: d[db.plan] ?? "free",
-        billingCycle: normalizeBillingCycle(d[db.billingCycle] ?? "monthly"),
-        subscriptionId: d[db.subscriptionId],
-        subscriptionStatus: normalizeStatus(d[db.subscriptionStatus] ?? "none"),
-        polarCustomerId: d[db.polarCustomerId],
-        cancelAtPeriodEnd: d[db.cancelAtPeriodEnd],
+        plan: asString(d[db.plan]) ?? "free",
+        billingCycle: normalizeBillingCycle(asString(d[db.billingCycle]) ?? "monthly"),
+        subscriptionId: asString(d[db.subscriptionId]),
+        subscriptionStatus: normalizeStatus(asString(d[db.subscriptionStatus]) ?? "none"),
+        polarCustomerId: asString(d[db.polarCustomerId]),
+        cancelAtPeriodEnd: asBoolean(d[db.cancelAtPeriodEnd]),
         currentPeriodEnd
       };
     },
@@ -139,6 +155,11 @@ var FREE_STATUS = {
   plan: "free",
   subscriptionStatus: "none"
 };
+function normalizeUserId(userId) {
+  if (typeof userId !== "string") return void 0;
+  const trimmed = userId.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
 function PolarProvider({ adapter, userId, children }) {
   const [status, setStatus] = useState(FREE_STATUS);
   const [loading, setLoading] = useState(true);
@@ -146,7 +167,7 @@ function PolarProvider({ adapter, userId, children }) {
   adapterRef.current = adapter;
   const refreshAbortRef = useRef(null);
   const refresh = useCallback(async () => {
-    const uid = userId?.trim();
+    const uid = normalizeUserId(userId);
     if (!uid) {
       setStatus(FREE_STATUS);
       setLoading(false);
@@ -175,14 +196,15 @@ function PolarProvider({ adapter, userId, children }) {
     };
   }, [refresh]);
   const startCheckout = useCallback(async (params) => {
-    const result = await adapterRef.current.createCheckout({ ...params, userId: userId?.trim() });
+    const uid = normalizeUserId(userId);
+    const result = await adapterRef.current.createCheckout({ ...params, userId: uid });
     if (!result.url.startsWith("https://")) {
-      throw new Error("Invalid checkout URL returned");
+      throw new Error("[polar-billing] Invalid checkout URL returned: URL must start with https://");
     }
     window.location.href = result.url;
   }, [userId]);
   const syncSubscription = useCallback(async () => {
-    const uid = userId?.trim();
+    const uid = normalizeUserId(userId);
     if (!uid) return { synced: false };
     const checkoutId = new URLSearchParams(window.location.search).get("checkout_id") ?? void 0;
     const result = await adapterRef.current.syncSubscription(uid, checkoutId);
@@ -190,7 +212,7 @@ function PolarProvider({ adapter, userId, children }) {
     return result;
   }, [userId, refresh]);
   const getBillingHistory = useCallback(async () => {
-    const uid = userId?.trim();
+    const uid = normalizeUserId(userId);
     if (!uid) return [];
     return adapterRef.current.getBillingHistory(uid);
   }, [userId]);
@@ -203,8 +225,8 @@ function PolarProvider({ adapter, userId, children }) {
     [refresh]
   );
   const getPortalUrl = useCallback(async () => {
-    const uid = userId?.trim();
-    if (!uid) throw new Error("No authenticated user");
+    const uid = normalizeUserId(userId);
+    if (!uid) throw new Error("[polar-billing] Cannot get portal URL: No authenticated user");
     return adapterRef.current.getPortalUrl(uid);
   }, [userId]);
   const value = useMemo(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@umituz/web-polar-payment",
-  "version": "1.0.6",
-  "description": "Universal Polar.sh subscription billing — Supabase & Firebase adapters",
+  "version": "1.0.8",
+  "description": "Universal Polar.sh subscription billing — Firebase adapter",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",

package/src/infrastructure/services/firebase-billing.service.ts

@@ -10,13 +10,44 @@ import type {
 } from '../../domain/entities';
 import { normalizeStatus, normalizeBillingCycle } from '../utils/normalization.util';
 
-// We use any for firebase types in implementation to bypass DTS build issues with external packages
+/**
+ * Type guard to safely extract string value from unknown Firestore data
+ */
+function asString(value: unknown): string | undefined {
+  if (typeof value === 'string') return value;
+  return undefined;
+}
+
+/**
+ * Type guard to safely extract boolean value from unknown Firestore data
+ */
+function asBoolean(value: unknown): boolean | undefined {
+  if (typeof value === 'boolean') return value;
+  return undefined;
+}
+
+/**
+ * Type guard to safely check if value is an object with toDate method
+ */
+function isTimestamp(value: unknown): value is { toDate(): Date } {
+  return (
+    typeof value === 'object' &&
+    value !== null &&
+    'toDate' in value &&
+    typeof (value as { toDate: unknown }).toDate === 'function'
+  );
+}
+
+// Internal type aliases for Firebase SDK compatibility
+// Using 'any' internally to avoid DTS build issues with external Firebase packages
 type FirebaseFunctions = any;
 type FirebaseFirestore = any;
 
 export interface FirebaseAdapterConfig {
-  functions: FirebaseFunctions;
-  firestore: FirebaseFirestore;
+  /** Firebase Functions instance from firebase/functions */
+  functions: unknown;
+  /** Firebase Firestore instance from firebase/firestore */
+  firestore: unknown;
   callables?: {
     createCheckout?: string;
     syncSubscription?: string;
@@ -41,6 +72,10 @@ export interface FirebaseAdapterConfig {
  * @description Implementation of PolarAdapter for Firebase Functions and Firestore.
  */
 export function createFirebaseAdapter(config: FirebaseAdapterConfig): PolarAdapter {
+  // Cast internally to Firebase types for implementation
+  const functions = config.functions as FirebaseFunctions;
+  const firestore = config.firestore as FirebaseFirestore;
+
   const callables = {
     createCheckout: config.callables?.createCheckout ?? 'createCheckoutSession',
     sync: config.callables?.syncSubscription ?? 'syncSubscription',
@@ -62,7 +97,7 @@ export function createFirebaseAdapter(config: FirebaseAdapterConfig): PolarAdapt
 
   async function callable<T = unknown, R = unknown>(name: string, data?: T): Promise<R> {
     const { httpsCallable } = await import('firebase/functions');
-    const fn = (httpsCallable as any)(config.functions, name) as (data?: T) => Promise<{ data: R }>;
+    const fn = (httpsCallable as any)(functions, name) as (data?: T) => Promise<{ data: R }>;
     const result = await fn(data);
     return result.data;
   }
@@ -70,7 +105,7 @@ export function createFirebaseAdapter(config: FirebaseAdapterConfig): PolarAdapt
   return {
     async getStatus(userId: string): Promise<SubscriptionStatus> {
       const { doc, getDoc } = await import('firebase/firestore');
-      const snap = await getDoc((doc as any)(config.firestore, db.collection, userId));
+      const snap = await getDoc((doc as any)(firestore, db.collection, userId));
 
       if (!snap.exists()) {
         return { plan: 'free', subscriptionStatus: 'none' };
@@ -81,20 +116,20 @@ export function createFirebaseAdapter(config: FirebaseAdapterConfig): PolarAdapt
       let currentPeriodEnd: string | undefined;
       const rawEnd = d[db.currentPeriodEnd];
       if (rawEnd != null) {
-        if (typeof rawEnd === 'object' && 'toDate' in (rawEnd as object)) {
-          currentPeriodEnd = (rawEnd as { toDate(): Date }).toDate().toISOString();
+        if (isTimestamp(rawEnd)) {
+          currentPeriodEnd = rawEnd.toDate().toISOString();
         } else if (typeof rawEnd === 'string') {
           currentPeriodEnd = rawEnd;
         }
       }
 
       return {
-        plan: (d[db.plan] as string) ?? 'free',
-        billingCycle: normalizeBillingCycle((d[db.billingCycle] as string) ?? 'monthly'),
-        subscriptionId: d[db.subscriptionId] as string | undefined,
-        subscriptionStatus: normalizeStatus((d[db.subscriptionStatus] as string) ?? 'none'),
-        polarCustomerId: d[db.polarCustomerId] as string | undefined,
-        cancelAtPeriodEnd: d[db.cancelAtPeriodEnd] as boolean | undefined,
+        plan: asString(d[db.plan]) ?? 'free',
+        billingCycle: normalizeBillingCycle(asString(d[db.billingCycle]) ?? 'monthly'),
+        subscriptionId: asString(d[db.subscriptionId]),
+        subscriptionStatus: normalizeStatus(asString(d[db.subscriptionStatus]) ?? 'none'),
+        polarCustomerId: asString(d[db.polarCustomerId]),
+        cancelAtPeriodEnd: asBoolean(d[db.cancelAtPeriodEnd]),
         currentPeriodEnd,
       };
     },

package/src/infrastructure/utils/normalization.util.ts

@@ -2,7 +2,7 @@ import type { SubscriptionStatusValue, BillingCycle } from '../../domain/entitie
 
 /**
  * Normalize a raw Polar status string to a known value.
- * @description Defaults to 'none' for unknown statuses.
+ * @description Defaults to 'none' for unknown statuses or non-string input.
  */
 export function normalizeStatus(raw: string): SubscriptionStatusValue {
   const map: Record<string, SubscriptionStatusValue> = {
@@ -17,15 +17,19 @@ export function normalizeStatus(raw: string): SubscriptionStatusValue {
     revoked: 'revoked',
     none: 'none',
   };
-  return map[raw?.toLowerCase()] ?? 'none';
+
+  if (typeof raw !== 'string') return 'none';
+  return map[raw.toLowerCase()] ?? 'none';
 }
 
-/** 
+/**
  * Normalize billing interval
- * @description Maps 'month'/'year' to 'monthly'/'yearly'
+ * @description Maps 'month'/'year' to 'monthly'/'yearly'. Defaults to 'monthly' for unknown values or non-string input.
  */
 export function normalizeBillingCycle(interval: string): BillingCycle {
-  if (interval === 'month' || interval === 'monthly') return 'monthly';
-  if (interval === 'year' || interval === 'yearly') return 'yearly';
+  if (typeof interval !== 'string') return 'monthly';
+  const normalized = interval.toLowerCase();
+  if (normalized === 'month' || normalized === 'monthly') return 'monthly';
+  if (normalized === 'year' || normalized === 'yearly') return 'yearly';
   return 'monthly';
 }

package/src/presentation/components/PolarProvider.tsx

@@ -33,6 +33,12 @@ const FREE_STATUS: SubscriptionStatus = {
   subscriptionStatus: 'none',
 };
 
+function normalizeUserId(userId: string | undefined): string | undefined {
+  if (typeof userId !== 'string') return undefined;
+  const trimmed = userId.trim();
+  return trimmed.length > 0 ? trimmed : undefined;
+}
+
 export function PolarProvider({ adapter, userId, children }: PolarProviderProps) {
   const [status, setStatus] = useState<SubscriptionStatus>(FREE_STATUS);
   const [loading, setLoading] = useState(true);
@@ -41,7 +47,7 @@ export function PolarProvider({ adapter, userId, children }: PolarProviderProps)
   const refreshAbortRef = useRef<AbortController | null>(null);
 
   const refresh = useCallback(async () => {
-    const uid = userId?.trim();
+    const uid = normalizeUserId(userId);
     if (!uid) {
       setStatus(FREE_STATUS);
       setLoading(false);
@@ -72,15 +78,16 @@ export function PolarProvider({ adapter, userId, children }: PolarProviderProps)
   }, [refresh]);
 
   const startCheckout = useCallback(async (params: CheckoutParams) => {
-    const result = await adapterRef.current.createCheckout({ ...params, userId: userId?.trim() });
+    const uid = normalizeUserId(userId);
+    const result = await adapterRef.current.createCheckout({ ...params, userId: uid });
     if (!result.url.startsWith('https://')) {
-      throw new Error('Invalid checkout URL returned');
+      throw new Error('[polar-billing] Invalid checkout URL returned: URL must start with https://');
     }
     window.location.href = result.url;
   }, [userId]);
 
   const syncSubscription = useCallback(async (): Promise<SyncResult> => {
-    const uid = userId?.trim();
+    const uid = normalizeUserId(userId);
     if (!uid) return { synced: false };
 
     const checkoutId = new URLSearchParams(window.location.search).get('checkout_id') ?? undefined;
@@ -90,7 +97,7 @@ export function PolarProvider({ adapter, userId, children }: PolarProviderProps)
   }, [userId, refresh]);
 
   const getBillingHistory = useCallback(async (): Promise<OrderItem[]> => {
-    const uid = userId?.trim();
+    const uid = normalizeUserId(userId);
     if (!uid) return [];
     return adapterRef.current.getBillingHistory(uid);
   }, [userId]);
@@ -105,8 +112,8 @@ export function PolarProvider({ adapter, userId, children }: PolarProviderProps)
   );
 
   const getPortalUrl = useCallback(async (): Promise<string> => {
-    const uid = userId?.trim();
-    if (!uid) throw new Error('No authenticated user');
+    const uid = normalizeUserId(userId);
+    if (!uid) throw new Error('[polar-billing] Cannot get portal URL: No authenticated user');
     return adapterRef.current.getPortalUrl(uid);
   }, [userId]);