@lobehub/chat 1.7.10 → 1.8.0

package/src/middleware.ts

@@ -2,7 +2,7 @@ import { clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';
 import { NextResponse } from 'next/server';
 
 import { authEnv } from '@/config/auth';
-import { auth } from '@/libs/next-auth';
+import NextAuthEdge from '@/libs/next-auth/edge';
 
 import { OAUTH_AUTHORIZED } from './const/auth';
 
@@ -20,7 +20,8 @@ export const config = {
 
 const defaultMiddleware = () => NextResponse.next();
 
-const nextAuthMiddleware = auth((req) => {
+// Initialize an Edge compatible NextAuth middleware
+const nextAuthMiddleware = NextAuthEdge.auth((req) => {
   // skip the '/' route
   if (req.nextUrl.pathname === '/') return NextResponse.next();
 

package/src/server/context.ts

@@ -1,15 +1,18 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { getAuth } from '@clerk/nextjs/server';
+import { User } from 'next-auth';
 import { NextRequest } from 'next/server';
 
-import { JWTPayload, LOBE_CHAT_AUTH_HEADER, enableClerk } from '@/const/auth';
+import { JWTPayload, LOBE_CHAT_AUTH_HEADER, enableClerk, enableNextAuth } from '@/const/auth';
+import NextAuthEdge from '@/libs/next-auth/edge';
 
 type ClerkAuth = ReturnType<typeof getAuth>;
 
 export interface AuthContext {
-  auth?: ClerkAuth;
   authorizationHeader?: string | null;
+  clerkAuth?: ClerkAuth;
   jwtPayload?: JWTPayload | null;
+  nextAuth?: User;
   userId?: string | null;
 }
 
@@ -18,12 +21,14 @@ export interface AuthContext {
  * This is useful for testing when we don't want to mock Next.js' request/response
  */
 export const createContextInner = async (params?: {
-  auth?: ClerkAuth;
   authorizationHeader?: string | null;
+  clerkAuth?: ClerkAuth;
+  nextAuth?: User;
   userId?: string | null;
 }): Promise<AuthContext> => ({
-  auth: params?.auth,
   authorizationHeader: params?.authorizationHeader,
+  clerkAuth: params?.clerkAuth,
+  nextAuth: params?.nextAuth,
   userId: params?.userId,
 });
 
@@ -45,7 +50,19 @@ export const createContext = async (request: NextRequest): Promise<Context> => {
     auth = getAuth(request);
 
     userId = auth.userId;
+    return createContextInner({ authorizationHeader: authorization, clerkAuth: auth, userId });
   }
 
-  return createContextInner({ auth, authorizationHeader: authorization, userId });
+  if (enableNextAuth) {
+    try {
+      const session = await NextAuthEdge.auth();
+      if (session && session?.user?.id) {
+        auth = session.user;
+        userId = session.user.id;
+      }
+      return createContextInner({ authorizationHeader: authorization, nextAuth: auth, userId });
+    } catch {}
+  }
+
+  return createContextInner({ authorizationHeader: authorization, userId });
 };

package/src/server/routers/edge/config/index.test.ts

@@ -14,6 +14,12 @@ const createCaller = createCallerFactory(configRouter);
 let ctx: AuthContext;
 let router: ReturnType<typeof createCaller>;
 
+vi.mock('@/libs/next-auth/edge', () => {
+  return {
+    auth: vi.fn().mockResolvedValue(undefined),
+  };
+});
+
 beforeEach(async () => {
   vi.resetAllMocks();
   ctx = await createContextInner();

package/src/store/agent/slices/chat/action.test.ts

@@ -207,7 +207,7 @@ describe('AgentSlice', () => {
         model: 'gemini-pro',
       } as any);
 
-      renderHook(() => result.current.useInitAgentStore());
+      renderHook(() => result.current.useInitAgentStore(true));
 
       await waitFor(async () => {
         expect(result.current.agentMap[INBOX_SESSION_ID]).toEqual({ model: 'gemini-pro' });
@@ -215,12 +215,26 @@ describe('AgentSlice', () => {
       });
     });
 
+    it('should not modify state if user not logged in', async () => {
+      const { result } = renderHook(() => useAgentStore());
+      vi.spyOn(sessionService, 'getSessionConfig').mockResolvedValue({
+        model: 'gemini-pro',
+      } as any);
+
+      renderHook(() => result.current.useInitAgentStore(false));
+
+      await waitFor(async () => {
+        expect(result.current.agentMap[INBOX_SESSION_ID]).toBeUndefined();
+        expect(result.current.isInboxAgentConfigInit).toBe(false);
+      });
+    });
+
     it('should not modify state on failure', async () => {
       const { result } = renderHook(() => useAgentStore());
 
       vi.spyOn(globalService, 'getDefaultAgentConfig').mockRejectedValueOnce(new Error());
 
-      renderHook(() => result.current.useInitAgentStore());
+      renderHook(() => result.current.useInitAgentStore(true));
 
       await waitFor(async () => {
         expect(result.current.agentMap[INBOX_SESSION_ID]).toBeUndefined();

package/src/store/agent/slices/chat/action.ts

@@ -27,6 +27,7 @@ export interface AgentChatAction {
 
   useFetchAgentConfig: (id: string) => SWRResponse<LobeAgentConfig>;
   useInitAgentStore: (
+    isLogin: boolean | undefined,
     defaultAgentConfig?: DeepPartial<LobeAgentConfig>,
   ) => SWRResponse<DeepPartial<LobeAgentConfig>>;
 
@@ -111,9 +112,9 @@ export const createChatSlice: StateCreator<
         suspense: true,
       },
     ),
-  useInitAgentStore: (defaultAgentConfig) =>
+  useInitAgentStore: (isLogin, defaultAgentConfig) =>
     useOnlyFetchOnceSWR<DeepPartial<LobeAgentConfig>>(
-      'fetchInboxAgentConfig',
+      !!isLogin ? 'fetchInboxAgentConfig' : null,
       () => sessionService.getSessionConfig(INBOX_SESSION_ID),
       {
         onSuccess: (data) => {

package/src/store/user/slices/auth/selectors.ts

@@ -41,6 +41,8 @@ const isLogin = (s: UserStore) => {
 };
 
 export const authSelectors = {
+  enabledAuth: (s: UserStore): boolean => s.enableAuth(),
+  enabledNextAuth: (s: UserStore): boolean => !!s.enabledNextAuth,
   isLoaded: (s: UserStore) => s.isLoaded,
   isLogin,
   isLoginWithAuth: (s: UserStore) => s.isSignedIn,

package/src/types/next-auth.d.ts

@@ -9,6 +9,9 @@ declare module 'next-auth' {
       firstName?: string;
     } & DefaultSession['user'];
   }
+  interface User {
+    providerAccountId?: string;
+  }
   /**
    * More types can be extends here
    * ref: https://authjs.dev/getting-started/typescript