@windrun-huaiin/backend-core 14.2.0 → 14.4.0

package/src/auth/auth-shared.ts

@@ -0,0 +1,16 @@
+export const AUTH_HEADERS = {
+  provider: 'x-auth-provider',
+  providerUserId: 'x-auth-provider-user-id',
+} as const;
+
+export const AUTH_ERRORS = {
+  unauthorized: 'UNAUTHORIZED',
+  userNotFound: 'USER_NOT_FOUND',
+} as const;
+
+export type AuthProvider = 'clerk';
+
+export interface ProviderIdentity {
+  provider: AuthProvider;
+  providerUserId: string;
+}

package/src/{lib → auth}/auth-utils.ts

@@ -1,6 +1,7 @@
 import { NextRequest } from 'next/server';
 import { userService } from '../services/database/index';
 import { User } from '../services/database/prisma-model-type';
+import { AUTH_ERRORS, AUTH_HEADERS, type AuthProvider } from './auth-shared';
 
 /**
  * 认证结果类型
@@ -8,7 +9,8 @@ import { User } from '../services/database/prisma-model-type';
 export interface AuthResult {
   userId: string;
   user: User;
-  clerkUserId: string;
+  provider: AuthProvider;
+  providerUserId: string;
 }
 
 /**
@@ -16,20 +18,22 @@ export interface AuthResult {
  */
 export async function getAuthenticatedUser(req: NextRequest): Promise<AuthResult> {
   try {
-    const clerkUserId = req.headers.get('x-clerk-user-id');
-    if (!clerkUserId) {
-      throw new Error('Authentication required');
+    const provider = req.headers.get(AUTH_HEADERS.provider);
+    const providerUserId = req.headers.get(AUTH_HEADERS.providerUserId);
+    if (provider !== 'clerk' || !providerUserId) {
+      throw new Error(AUTH_ERRORS.unauthorized);
     }
-    
-    const user = await userService.findByClerkUserId(clerkUserId);
+
+    const user = await userService.findByClerkUserId(providerUserId);
     if (!user) {
-      throw new Error('User not found in database');
+      throw new Error(AUTH_ERRORS.userNotFound);
     }
-    
+
     return {
       userId: user.userId,
       user,
-      clerkUserId
+      provider: 'clerk',
+      providerUserId,
     };
   } catch (error) {
     console.error('Error getting authenticated user:', error);
@@ -98,4 +102,4 @@ export class ApiAuthUtils {
       return null;
     }
   }
-}
+}

package/src/lib/index.ts

@@ -3,6 +3,5 @@ export * from './money-price-helper';
 export * from './fingerprint-config';
 export * from './credit-init';
 export * from './stripe-config';
-export * from './auth-utils';
 export * from './upstash-config';
 export * from './upstash';

package/src/lib/money-price-helper.ts

@@ -5,9 +5,9 @@ import {
 } from '@windrun-huaiin/third-ui/fingerprint/server';
 import type { InitUserContext } from '@windrun-huaiin/third-ui/main/server';
 import {
-  applyUserMockContext,
   buildInitUserContextFromEntities,
   fetchUserContextByClerkUserId,
+  finalizeUserContext,
 } from '../services/context';
 
 async function readFingerprintIdFromRequest(): Promise<string | null> {
@@ -42,7 +42,7 @@ export async function getMoneyPriceInitUserContext(): Promise<InitUserContext> {
       isClerkAuthenticated: true,
     });
 
-    return applyUserMockContext(initUserContext);
+    return finalizeUserContext(initUserContext);
   }
 
   const fingerprintId = await readFingerprintIdFromRequest();
@@ -58,4 +58,4 @@ export async function getMoneyPriceInitUserContext(): Promise<InitUserContext> {
     xSubscription: null,
     isClerkAuthenticated: false,
   };
-}
+}

package/src/services/context/index.ts

@@ -1 +1,2 @@
-export * from './user-context-service';
+export * from './user-context-service';
+export * from './user-context-finalizer';

package/src/services/context/user-context-finalizer.ts

@@ -0,0 +1,84 @@
+import { viewLocalTime } from '@windrun-huaiin/lib/utils';
+import type { XSubscription, XUser } from '@windrun-huaiin/third-ui/fingerprint';
+
+type FinalizableUserContext = {
+  xUser: XUser | null;
+  xSubscription: XSubscription | null;
+};
+
+/**
+ * Output finalizer for user-context payloads.
+ * Real data assembly should stay in user-context-service; any optional test-only
+ * shaping is isolated here so production services do not depend on mock code.
+ */
+export function finalizeUserContext<T extends FinalizableUserContext>(context: T): T {
+  const mockEnabled = process.env.MONEY_PRICE_MOCK_USER_ENABLED === 'true';
+  const mockType = Number(process.env.MONEY_PRICE_MOCK_USER_TYPE ?? NaN);
+
+  if (
+    !context.xUser ||
+    !mockEnabled ||
+    !Number.isInteger(mockType) ||
+    mockType < 0 ||
+    mockType > 4
+  ) {
+    return context;
+  }
+
+  const ensureSubscription = () => {
+    if (!context.xSubscription) {
+      const now = new Date();
+      context.xSubscription = {
+        id: BigInt(99999),
+        userId: context.xUser!.userId,
+        paySubscriptionId: 'MOCK-PAY-SUB-ID',
+        orderId: '',
+        priceId: '',
+        priceName: 'MOCK-TEST',
+        status: 'active',
+        creditsAllocated: 0,
+        subPeriodStart: viewLocalTime(now),
+        subPeriodEnd: viewLocalTime(now),
+      };
+    }
+
+    return context.xSubscription!;
+  };
+
+  switch (mockType) {
+    case 0: {
+      const subscription = ensureSubscription();
+      subscription.status = '';
+      subscription.priceId = '';
+      break;
+    }
+    case 1: {
+      const subscription = ensureSubscription();
+      subscription.priceId =
+        process.env.STRIPE_PRO_MONTHLY_PRICE_ID || subscription.priceId;
+      break;
+    }
+    case 2: {
+      const subscription = ensureSubscription();
+      subscription.priceId =
+        process.env.STRIPE_ULTRA_MONTHLY_PRICE_ID || subscription.priceId;
+      break;
+    }
+    case 3: {
+      const subscription = ensureSubscription();
+      subscription.priceId =
+        process.env.STRIPE_PRO_YEARLY_PRICE_ID || subscription.priceId;
+      break;
+    }
+    case 4: {
+      const subscription = ensureSubscription();
+      subscription.priceId =
+        process.env.STRIPE_ULTRA_YEARLY_PRICE_ID || subscription.priceId;
+      break;
+    }
+    default:
+      break;
+  }
+
+  return context;
+}

package/src/services/context/user-context-service.ts

@@ -121,80 +121,3 @@ export async function fetchLatestUserContextByFingerprintId(
     hasAnonymousUser: true,
   };
 }
-
-type MockableContext = {
-  xUser: XUser | null;
-  xSubscription: XSubscription | null;
-};
-
-export function applyUserMockContext<T extends MockableContext>(context: T): T {
-  const mockEnabled = process.env.MONEY_PRICE_MOCK_USER_ENABLED === 'true';
-  const mockType = Number(process.env.MONEY_PRICE_MOCK_USER_TYPE ?? NaN);
-
-  if (
-    !context.xUser ||
-    !mockEnabled ||
-    !Number.isInteger(mockType) ||
-    mockType < 0 ||
-    mockType > 4
-  ) {
-    return context;
-  }
-
-  const ensureSubscription = () => {
-    if (!context.xSubscription) {
-      const now = new Date();
-      context.xSubscription = {
-        id: BigInt(99999),
-        userId: context.xUser!.userId,
-        paySubscriptionId: 'MOCK-PAY-SUB-ID',
-        orderId: '',
-        priceId: '',
-        priceName: 'MOCK-TEST',
-        status: 'active',
-        creditsAllocated: 0,
-        subPeriodStart: viewLocalTime(now),
-        subPeriodEnd: viewLocalTime(now),
-      };
-    }
-
-    return context.xSubscription!;
-  };
-
-  switch (mockType) {
-    case 0: {
-      const subscription = ensureSubscription();
-      subscription.status = '';
-      subscription.priceId = '';
-      break;
-    }
-    case 1: {
-      const subscription = ensureSubscription();
-      subscription.priceId =
-        process.env.STRIPE_PRO_MONTHLY_PRICE_ID || subscription.priceId;
-      break;
-    }
-    case 2: {
-      const subscription = ensureSubscription();
-      subscription.priceId =
-        process.env.STRIPE_ULTRA_MONTHLY_PRICE_ID || subscription.priceId;
-      break;
-    }
-    case 3: {
-      const subscription = ensureSubscription();
-      subscription.priceId =
-        process.env.STRIPE_PRO_YEARLY_PRICE_ID || subscription.priceId;
-      break;
-    }
-    case 4: {
-      const subscription = ensureSubscription();
-      subscription.priceId =
-        process.env.STRIPE_ULTRA_YEARLY_PRICE_ID || subscription.priceId;
-      break;
-    }
-    default:
-      break;
-  }
-
-  return context;
-}