🐛 fix: fix onboard and auth for community version (#2908)

lobehub · Jun 17, 2024 · b02020d · b02020d
1 parent e815c47
commit b02020d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/middleware.ts b/src/middleware.ts
@@ -1,4 +1,4 @@
-import { clerkMiddleware } from '@clerk/nextjs/server';
+import { clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';
 import { NextResponse } from 'next/server';
 
 import { authEnv } from '@/config/auth';
@@ -13,6 +13,7 @@ export const config = {
     // include the /
     '/',
     '/chat(.*)',
+    '/settings(.*)',
     // ↓ cloud ↓
   ],
 };
@@ -42,8 +43,18 @@ const nextAuthMiddleware = auth((req) => {
   });
 });
 
+const isProtectedRoute = createRouteMatcher([
+  '/settings(.*)',
+  // ↓ cloud ↓
+]);
+
 export default authEnv.NEXT_PUBLIC_ENABLE_CLERK_AUTH
-  ? clerkMiddleware()
+  ? clerkMiddleware(
+      (auth, req) => {
+        if (isProtectedRoute(req)) auth().protect();
+      },
+      { signInUrl: '/login', signUpUrl: '/signup' },
+    )
   : authEnv.NEXT_PUBLIC_ENABLE_NEXT_AUTH
     ? nextAuthMiddleware
     : defaultMiddleware;
diff --git a/src/server/routers/lambda/user.ts b/src/server/routers/lambda/user.ts
@@ -28,7 +28,8 @@ export const userRouter = router({
       // 有消息，或者创建过助手，则认为有 conversation
       hasConversation: messageCount > 0 || sessionCount > 1,
 
-      isOnboard: state.isOnboarded || false,
+      // always return true for community version
+      isOnboard: state.isOnboarded || true,
       preference: state.preference as UserPreference,
       settings: state.settings,
       userId: ctx.userId,