@lobehub/chat 0.161.11 → 0.161.12

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 0.161.12](https://github.com/lobehub/lobe-chat/compare/v0.161.11...v0.161.12)
+
+<sup>Released on **2024-05-23**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor the home redirect implement.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor the home redirect implement, closes [#2626](https://github.com/lobehub/lobe-chat/issues/2626) ([ab4216e](https://github.com/lobehub/lobe-chat/commit/ab4216e))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.161.11](https://github.com/lobehub/lobe-chat/compare/v0.161.10...v0.161.11)
 
 <sup>Released on **2024-05-23**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.161.11",
+  "version": "0.161.12",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/app/(loading)/Redirect.tsx

@@ -3,35 +3,47 @@
 import { useRouter } from 'next/navigation';
 import { memo, useEffect } from 'react';
 
-import { messageService } from '@/services/message';
-import { sessionService } from '@/services/session';
 import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/selectors';
 
-const checkHasConversation = async () => {
-  const hasMessages = await messageService.hasMessages();
-  const hasAgents = await sessionService.hasSessions();
-  return hasMessages || hasAgents;
-};
-
 const Redirect = memo(() => {
   const router = useRouter();
-  const isLogin = useUserStore(authSelectors.isLogin);
+  const [isLogin, isLoaded, isUserStateInit, isUserHasConversation, isOnboard] = useUserStore(
+    (s) => [
+      authSelectors.isLogin(s),
+      authSelectors.isLoaded(s),
+      s.isUserStateInit,
+      s.isUserHasConversation,
+      s.isOnboard,
+    ],
+  );
 
   useEffect(() => {
+    // if user auth state is not ready, wait for loading
+    if (!isLoaded) return;
+
+    // this mean user is definitely not login
     if (!isLogin) {
       router.replace('/welcome');
       return;
     }
 
-    checkHasConversation().then((hasData) => {
-      if (hasData) {
-        router.replace('/chat');
-      } else {
-        router.replace('/welcome');
-      }
-    });
-  }, []);
+    // if user state not init, wait for loading
+    if (!isUserStateInit) return;
+
+    // user need to onboard
+    if (!isOnboard) {
+      router.replace('/onboard');
+      return;
+    }
+
+    // finally check the conversation status
+    if (isUserHasConversation) {
+      router.replace('/chat');
+    } else {
+      router.replace('/welcome');
+    }
+  }, [isUserStateInit, isLoaded, isUserHasConversation, isOnboard, isLogin]);
 
   return null;
 });

package/src/layout/AuthProvider/NoAuth/index.tsx

@@ -0,0 +1,16 @@
+'use client';
+
+import { PropsWithChildren, memo } from 'react';
+import { createStoreUpdater } from 'zustand-utils';
+
+import { useUserStore } from '@/store/user';
+
+const NoAuthProvider = memo<PropsWithChildren>(({ children }) => {
+  const useStoreUpdater = createStoreUpdater(useUserStore);
+
+  useStoreUpdater('isLoaded', true);
+
+  return children;
+});
+
+export default NoAuthProvider;

package/src/layout/AuthProvider/index.tsx

@@ -4,13 +4,14 @@ import { authEnv } from '@/config/auth';
 
 import Clerk from './Clerk';
 import NextAuth from './NextAuth';
+import NoAuth from './NoAuth';
 
 const AuthProvider = ({ children }: PropsWithChildren) => {
   if (authEnv.NEXT_PUBLIC_ENABLE_CLERK_AUTH) return <Clerk>{children}</Clerk>;
 
   if (authEnv.NEXT_PUBLIC_ENABLE_NEXT_AUTH) return <NextAuth>{children}</NextAuth>;
 
-  return children;
+  return <NoAuth>{children}</NoAuth>;
 };
 
 export default AuthProvider;

package/src/middleware.ts

@@ -41,16 +41,7 @@ const nextAuthMiddleware = auth((req) => {
 });
 
 export default authEnv.NEXT_PUBLIC_ENABLE_CLERK_AUTH
-  ? // can't lift to a function because if there is no clerk public key, it will throw error
-    clerkMiddleware((auth, request) => {
-      // if user is logged in and on the home page, redirect to chat
-      if (auth().userId && request.nextUrl.pathname === '/') {
-        request.nextUrl.pathname = '/chat';
-        return NextResponse.redirect(request.nextUrl);
-      }
-
-      return NextResponse.next();
-    })
+  ? clerkMiddleware()
   : authEnv.NEXT_PUBLIC_ENABLE_NEXT_AUTH
     ? nextAuthMiddleware
     : defaultMiddleware;

package/src/services/user/client.test.ts

@@ -46,6 +46,8 @@ describe('ClientService', () => {
     expect(userState).toEqual({
       avatar: mockUser.avatar,
       isOnboard: true,
+      canEnablePWAGuide: false,
+      hasConversation: false,
       canEnableTrace: false,
       preference: mockPreference,
       settings: mockUser.settings,

package/src/services/user/client.ts

@@ -1,6 +1,7 @@
 import { DeepPartial } from 'utility-types';
 
 import { MessageModel } from '@/database/client/models/message';
+import { SessionModel } from '@/database/client/models/session';
 import { UserModel } from '@/database/client/models/user';
 import { GlobalSettings } from '@/types/settings';
 import { UserInitializationState, UserPreference } from '@/types/user';
@@ -18,10 +19,13 @@ export class ClientService implements IUserService {
   async getUserState(): Promise<UserInitializationState> {
     const user = await UserModel.getUser();
     const messageCount = await MessageModel.count();
+    const sessionCount = await SessionModel.count();
 
     return {
       avatar: user.avatar,
+      canEnablePWAGuide: messageCount >= 2,
       canEnableTrace: messageCount >= 4,
+      hasConversation: messageCount > 0 || sessionCount > 0,
       isOnboard: true,
       preference: await this.preferenceStorage.getFromLocalStorage(),
       settings: user.settings as GlobalSettings,

package/src/services/user/type.ts

@@ -6,7 +6,6 @@ import { UserInitializationState, UserPreference } from '@/types/user';
 export interface IUserService {
   getUserState: () => Promise<UserInitializationState>;
   resetUserSettings: () => Promise<any>;
-  updateAvatar: (avatar: string) => Promise<any>;
   updatePreference: (preference: UserPreference) => Promise<any>;
   updateUserSettings: (patch: DeepPartial<GlobalSettings>) => Promise<any>;
 }

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

@@ -41,6 +41,7 @@ const isLogin = (s: UserStore) => {
 };
 
 export const authSelectors = {
+  isLoaded: (s: UserStore) => s.isLoaded,
   isLogin,
   isLoginWithAuth: (s: UserStore) => s.isSignedIn,
   isLoginWithClerk: (s: UserStore): boolean => (s.isSignedIn && enableClerk) || false,

package/src/store/user/slices/common/action.test.ts

@@ -5,6 +5,7 @@ import { withSWR } from '~test-utils';
 
 import { DEFAULT_PREFERENCE } from '@/const/user';
 import { userService } from '@/services/user';
+import { ClientService } from '@/services/user/client';
 import { useUserStore } from '@/store/user';
 import { preferenceSelectors } from '@/store/user/selectors';
 import { GlobalServerConfig } from '@/types/serverConfig';
@@ -36,7 +37,7 @@ describe('createCommonSlice', () => {
       const avatar = 'new-avatar';
 
       const spyOn = vi.spyOn(result.current, 'refreshUserState');
-      const updateAvatarSpy = vi.spyOn(userService, 'updateAvatar');
+      const updateAvatarSpy = vi.spyOn(ClientService.prototype, 'updateAvatar');
 
       await act(async () => {
         await result.current.updateAvatar(avatar);

package/src/store/user/slices/common/action.ts

@@ -4,6 +4,7 @@ import type { StateCreator } from 'zustand/vanilla';
 
 import { DEFAULT_PREFERENCE } from '@/const/user';
 import { userService } from '@/services/user';
+import { ClientService } from '@/services/user/client';
 import type { UserStore } from '@/store/user';
 import type { GlobalServerConfig } from '@/types/serverConfig';
 import type { GlobalSettings } from '@/types/settings';
@@ -45,7 +46,9 @@ export const createCommonSlice: StateCreator<
     await mutate(GET_USER_STATE_KEY);
   },
   updateAvatar: async (avatar) => {
-    await userService.updateAvatar(avatar);
+    const clientService = new ClientService();
+
+    await clientService.updateAvatar(avatar);
     await get().refreshUserState();
   },
 
@@ -89,8 +92,12 @@ export const createCommonSlice: StateCreator<
               {
                 defaultSettings,
                 enabledNextAuth: serverConfig.enabledOAuthSSO,
+                isOnboard: data.isOnboard,
+                isShowPWAGuide: data.canEnablePWAGuide,
                 isUserCanEnableTrace: data.canEnableTrace,
+                isUserHasConversation: data.hasConversation,
                 isUserStateInit: true,
+
                 preference,
                 serverLanguageModel: serverConfig.languageModel,
                 settings: data.settings || {},

package/src/store/user/slices/common/initialState.ts

@@ -1,9 +1,15 @@
 export interface CommonState {
+  isOnboard: boolean;
+  isShowPWAGuide: boolean;
   isUserCanEnableTrace: boolean;
+  isUserHasConversation: boolean;
   isUserStateInit: boolean;
 }
 
 export const initialCommonState: CommonState = {
+  isOnboard: false,
+  isShowPWAGuide: false,
   isUserCanEnableTrace: false,
+  isUserHasConversation: false,
   isUserStateInit: false,
 };

package/src/types/user/index.ts

@@ -34,7 +34,9 @@ export interface UserPreference {
 
 export interface UserInitializationState {
   avatar?: string;
+  canEnablePWAGuide?: boolean;
   canEnableTrace?: boolean;
+  hasConversation?: boolean;
   isOnboard?: boolean;
   preference: UserPreference;
   settings: DeepPartial<GlobalSettings>;