@windrun-huaiin/diaomao 14.3.3 → 14.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windrun-huaiin/diaomao",
-  "version": "14.3.3",
+  "version": "14.3.4",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -27,10 +27,10 @@
     "@radix-ui/react-slot": "^1.2.4",
     "@tailwindcss/typography": "^0.5.19",
     "@types/mdx": "^2.0.13",
-    "@windrun-huaiin/backend-core": "14.3.0",
+    "@windrun-huaiin/backend-core": "14.6.0",
     "@windrun-huaiin/base-ui": "14.0.3",
     "@windrun-huaiin/lib": "14.0.1",
-    "@windrun-huaiin/third-ui": "14.4.3",
+    "@windrun-huaiin/third-ui": "14.5.0",
     "autoprefixer": "^10.4.27",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",

package/src/app/[locale]/layout.config.tsx

@@ -7,13 +7,11 @@ import { BaseLayoutProps } from 'fumadocs-ui/layouts/shared';
 import { getTranslations } from 'next-intl/server';
 import { CreditPopover } from '@/components/credit-popover';
 import { ExtendedLinkItem, HomeTitle } from '@windrun-huaiin/third-ui/fuma/base';
-import { getOptionalAuth } from '@windrun-huaiin/third-ui/clerk/patch/optional-auth';
 import { getAsNeededLocalizedUrl } from '@windrun-huaiin/lib';
 
 // home page normal menu
 export async function homeNavLinks(locale: string): Promise<ExtendedLinkItem[]> {
   const t1 = await getTranslations({ locale: locale, namespace: 'linkPreview' });
-  const { userId } = await getOptionalAuth();
   return [
     {
       icon: <icons.BugOff />,
@@ -29,7 +27,7 @@ export async function homeNavLinks(locale: string): Promise<ExtendedLinkItem[]>
       type: 'custom',
       secondary: true,
       mobilePinned: true,
-      children: userId ? <CreditPopover locale={locale} /> : null,
+      children: <CreditPopover locale={locale} />,
     },
     {
       type: 'custom',

package/src/components/credit-popover.tsx

@@ -1,5 +1,5 @@
-import { creditService, subscriptionService, userService } from '@windrun-huaiin/backend-core/database';
-import { auth } from '@clerk/nextjs/server';
+import { creditService, subscriptionService } from '@windrun-huaiin/backend-core/database';
+import { getOptionalServerAuthUser } from '@windrun-huaiin/backend-core/auth/server';
 import { viewLocalTime } from '@windrun-huaiin/lib/utils';
 import { CreditNavButton } from '@windrun-huaiin/third-ui/main';
 import type { CreditOverviewData } from '@windrun-huaiin/third-ui/main/server';
@@ -14,17 +14,11 @@ interface CreditPopoverProps {
 }
 
 export async function CreditPopover({ locale }: CreditPopoverProps) {
-  const { userId: clerkUserId } = await auth();
-
-  if (!clerkUserId) {
-    return null;
-  }
-
-  const user = await userService.findByClerkUserId(clerkUserId);
-  if (!user) {
-    console.warn('User not found!');
+  const authUser = await getOptionalServerAuthUser();
+  if (!authUser) {
     return null;
   }
+  const { user } = authUser;
 
   const enableSubscriptionUpgrade = process.env.ENABLE_STRIPE_SUBSCRIPTION_UPGRADE !== 'false';
 

package/src/mdx/blog/index.mdx

@@ -2,7 +2,7 @@
 title: Blog
 description: Articles and thoughts about various topics.
 icon: Rss
-date: 2026-03-29
+date: 2026-03-31
 ---
 
 ## Past List

package/src/mdx/blog/ioc.mdx

@@ -1,7 +1,7 @@
 ---
 title: Monthly Summary
 description: Index and Summary
-date: 2026-03-29
+date: 2026-03-31
 ---
 
 

package/src/proxy.ts

@@ -6,6 +6,7 @@
 
 
 import { appConfig } from "@/lib/appConfig";
+import { buildProtectedPageRoutePatterns, handleAuthMiddleware } from "@windrun-huaiin/backend-core/auth/middleware";
 import { clerkMiddleware, createRouteMatcher } from "@clerk/nextjs/server";
 import createMiddleware from "next-intl/middleware";
 import { NextRequest, NextResponse } from "next/server";
@@ -18,9 +19,12 @@ const intlMiddleware = createMiddleware({
 });
 
 // 需要身份认证的路由（页面路由）
-const protectedPageRoutes = createRouteMatcher([
-  // '/(.*)/(dashboard|settings|profile|billing)/(.*)',
-]);
+const protectedPageRoutes = createRouteMatcher(
+  buildProtectedPageRoutePatterns(
+    ['/dashboard', '/settings', '/profile', '/billing'],
+    appConfig.i18n.locales
+  )
+);
 
 // 需要身份认证的API路由
 const protectedApiRoutes = createRouteMatcher([
@@ -58,6 +62,16 @@ export default clerkMiddleware(
       (loc) => pathname === `/${loc}` || pathname.startsWith(`/${loc}/`)
     );
 
+    const authResponse = await handleAuthMiddleware(auth, req, {
+      protectedPageRoutes,
+      protectedApiRoutes,
+      publicApiRoutes,
+      intlMiddleware,
+    });
+    if (authResponse) {
+      return authResponse;
+    }
+
     // 对于无语言前缀的页面请求，根据配置进行处理
     // 避免落不到 [locale] 路由。
     if (!hasLocalePrefix && !pathname.startsWith('/api/')) {
@@ -75,44 +89,6 @@ export default clerkMiddleware(
       }
     }
 
-    // 1. 处理需要认证的页面路由
-    if (protectedPageRoutes(req)) {
-      const { userId: clerkUserId } = await auth();
-      if (!clerkUserId) return (await auth()).redirectToSignIn();
-
-      // 对于页面路由，只设置 Clerk 用户信息
-      const response = intlMiddleware(req);
-      if (response) {
-        response.headers.set("x-clerk-user-id", clerkUserId);
-        console.log("Set clerk_user_id for protected page:", clerkUserId);
-      }
-      return response;
-    }
-
-    // 2. 处理需要认证的API路由
-    if (protectedApiRoutes(req)) {
-      const { userId: clerkUserId } = await auth();
-      if (!clerkUserId) return (await auth()).redirectToSignIn();
-
-      // 只设置 Clerk 用户信息，让 API 自己处理数据库查询
-      const response = NextResponse.next();
-      response.headers.set("x-clerk-user-id", clerkUserId);
-      console.log("Set clerk_user_id for protected API:", clerkUserId);
-      return response;
-    }
-
-    // 3. 免认证的API路由，直接通过
-    if (publicApiRoutes(req)) {
-      console.log("Public API route, no auth required:", req.nextUrl.pathname);
-      return NextResponse.next();
-    }
-
-    // 4. 所有其他API路由都直接通过，不添加语言前缀
-    if (req.nextUrl.pathname.startsWith("/api/")) {
-      console.log("Other API route, no internationalization:", req.nextUrl.pathname);
-      return NextResponse.next();
-    }
-
     // 5. 其他路由使用默认的国际化中间件处理
 
     // handle trailing slash redirect