@lobehub/chat 1.51.16 → 1.52.1

package/.env.example

@@ -190,6 +190,7 @@ OPENAI_API_KEY=sk-xxxxxxxxx
 
 
 # NextAuth related configurations
+# NEXT_PUBLIC_ENABLE_NEXT_AUTH=1
 # NEXT_AUTH_SECRET=
 
 # Auth0 configurations

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 1.52.1](https://github.com/lobehub/lobe-chat/compare/v1.52.0...v1.52.1)
+
+<sup>Released on **2025-02-08**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix static relative issues.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix static relative issues, closes [#5874](https://github.com/lobehub/lobe-chat/issues/5874) ([419977b](https://github.com/lobehub/lobe-chat/commit/419977b))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+## [Version 1.52.0](https://github.com/lobehub/lobe-chat/compare/v1.51.16...v1.52.0)
+
+<sup>Released on **2025-02-08**</sup>
+
+#### ✨ Features
+
+- **misc**: Refactor the auth condition in Next Auth.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's improved
+
+- **misc**: Refactor the auth condition in Next Auth, closes [#5866](https://github.com/lobehub/lobe-chat/issues/5866) ([e529108](https://github.com/lobehub/lobe-chat/commit/e529108))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.51.16](https://github.com/lobehub/lobe-chat/compare/v1.51.15...v1.51.16)
 
 <sup>Released on **2025-02-07**</sup>

package/Dockerfile.database

@@ -38,6 +38,7 @@ FROM base AS builder
 ARG USE_CN_MIRROR
 ARG NEXT_PUBLIC_BASE_PATH
 ARG NEXT_PUBLIC_SERVICE_MODE
+ARG NEXT_PUBLIC_ENABLE_NEXT_AUTH
 ARG NEXT_PUBLIC_SENTRY_DSN
 ARG NEXT_PUBLIC_ANALYTICS_POSTHOG
 ARG NEXT_PUBLIC_POSTHOG_HOST
@@ -49,7 +50,7 @@ ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID
 ENV NEXT_PUBLIC_BASE_PATH="${NEXT_PUBLIC_BASE_PATH}"
 
 ENV NEXT_PUBLIC_SERVICE_MODE="${NEXT_PUBLIC_SERVICE_MODE:-server}" \
-    NEXT_PUBLIC_ENABLE_NEXT_AUTH="1" \
+    NEXT_PUBLIC_ENABLE_NEXT_AUTH="${NEXT_PUBLIC_ENABLE_NEXT_AUTH:-1}" \
     APP_URL="http://app.com" \
     DATABASE_DRIVER="node" \
     DATABASE_URL="postgres://postgres:password@localhost:5432/postgres" \

package/changelog/v1.json

@@ -1,4 +1,22 @@
 [
+  {
+    "children": {
+      "fixes": [
+        "Fix static relative issues."
+      ]
+    },
+    "date": "2025-02-08",
+    "version": "1.52.1"
+  },
+  {
+    "children": {
+      "features": [
+        "Refactor the auth condition in Next Auth."
+      ]
+    },
+    "date": "2025-02-08",
+    "version": "1.52.0"
+  },
   {
     "children": {},
     "date": "2025-02-07",

package/next.config.ts

@@ -179,6 +179,7 @@ const nextConfig: NextConfig = {
   ],
   // when external packages in dev mode with turbopack, this config will lead to bundle error
   serverExternalPackages: isProd ? ['@electric-sql/pglite'] : undefined,
+
   transpilePackages: ['pdfjs-dist', 'mermaid'],
 
   webpack(config) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.51.16",
+  "version": "1.52.1",
   "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/[variants]/(main)/(mobile)/me/(home)/__tests__/UserBanner.test.tsx

@@ -49,8 +49,9 @@ afterEach(() => {
 describe('UserBanner', () => {
   it('should render UserInfo and DataStatistics when auth is disabled', () => {
     act(() => {
-      useUserStore.setState({ isSignedIn: false, enableAuth: () => false });
+      useUserStore.setState({ isSignedIn: false });
     });
+    enableAuth = false;
 
     render(<UserBanner />);
 
@@ -75,7 +76,7 @@ describe('UserBanner', () => {
 
   it('should render UserLoginOrSignup when user is not logged in with auth enabled', () => {
     act(() => {
-      useUserStore.setState({ isSignedIn: false, enableAuth: () => true });
+      useUserStore.setState({ isSignedIn: false });
     });
     enableClerk = true;
 

package/src/app/[variants]/(main)/(mobile)/me/(home)/__tests__/useCategory.test.tsx

@@ -1,7 +1,7 @@
 import { act, renderHook } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
 
-import { ServerConfigStoreProvider } from '@/store/serverConfig';
+import { ServerConfigStoreProvider } from '@/store/serverConfig/Provider';
 import { useUserStore } from '@/store/user';
 
 import { useCategory } from '../features/useCategory';
@@ -45,12 +45,10 @@ afterEach(() => {
   enableClerk = true;
 });
 
-// 目前对 enableAuth 的判定是在 useUserStore 中，所以需要 mock useUserStore
-// 类型定义： enableAuth: () => boolean
 describe('useCategory', () => {
   it('should return correct items when the user is logged in with authentication', () => {
     act(() => {
-      useUserStore.setState({ isSignedIn: true, enableAuth: () => true });
+      useUserStore.setState({ isSignedIn: true });
     });
     enableAuth = true;
     enableClerk = false;
@@ -70,8 +68,9 @@ describe('useCategory', () => {
 
   it('should return correct items when the user is not logged in', () => {
     act(() => {
-      useUserStore.setState({ isSignedIn: false, enableAuth: () => true });
+      useUserStore.setState({ isSignedIn: false });
     });
+    enableAuth = true;
 
     const { result } = renderHook(() => useCategory(), { wrapper });
 
@@ -88,9 +87,10 @@ describe('useCategory', () => {
 
   it('should handle settings for non-authenticated users', () => {
     act(() => {
-      useUserStore.setState({ isSignedIn: false, enableAuth: () => false });
+      useUserStore.setState({ isSignedIn: false });
     });
     enableClerk = false;
+    enableAuth = false;
 
     const { result } = renderHook(() => useCategory(), { wrapper });
 

package/src/app/[variants]/(main)/(mobile)/me/(home)/features/UserBanner.tsx

@@ -5,6 +5,7 @@ import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
+import { enableAuth, enableNextAuth } from '@/const/auth';
 import { isDeprecatedEdition } from '@/const/version';
 import DataStatistics from '@/features/User/DataStatistics';
 import UserInfo from '@/features/User/UserInfo';
@@ -15,11 +16,7 @@ import { authSelectors } from '@/store/user/selectors';
 const UserBanner = memo(() => {
   const router = useRouter();
   const isLoginWithAuth = useUserStore(authSelectors.isLoginWithAuth);
-  const [enableAuth, signIn, enabledNextAuth] = useUserStore((s) => [
-    authSelectors.enabledAuth(s),
-    s.openLogin,
-    authSelectors.enabledNextAuth(s),
-  ]);
+  const [signIn] = useUserStore((s) => [s.openLogin]);
 
   return (
     <Flexbox gap={12} paddingBlock={8}>
@@ -38,7 +35,7 @@ const UserBanner = memo(() => {
         <UserLoginOrSignup
           onClick={() => {
             // If use NextAuth, call openLogin method directly
-            if (enabledNextAuth) {
+            if (enableNextAuth) {
               signIn();
               return;
             }

package/src/app/[variants]/(main)/(mobile)/me/(home)/features/useCategory.tsx

@@ -12,6 +12,7 @@ import { useRouter } from 'next/navigation';
 import { useTranslation } from 'react-i18next';
 
 import { CellProps } from '@/components/Cell';
+import { enableAuth } from '@/const/auth';
 import { LOBE_CHAT_CLOUD } from '@/const/branding';
 import { DOCUMENTS, FEEDBACK, OFFICIAL_URL, UTM_SOURCE } from '@/const/url';
 import { isServerMode } from '@/const/version';
@@ -27,10 +28,9 @@ export const useCategory = () => {
   const { canInstall, install } = usePWAInstall();
   const { t } = useTranslation(['common', 'setting', 'auth']);
   const { showCloudPromotion, hideDocs } = useServerConfigStore(featureFlagsSelectors);
-  const [isLogin, isLoginWithAuth, enableAuth] = useUserStore((s) => [
+  const [isLogin, isLoginWithAuth] = useUserStore((s) => [
     authSelectors.isLogin(s),
     authSelectors.isLoginWithAuth(s),
-    authSelectors.enabledAuth(s),
   ]);
 
   const profile: CellProps[] = [

package/src/app/[variants]/(main)/(mobile)/me/(home)/page.tsx

@@ -37,5 +37,3 @@ const Page = async (props: DynamicLayoutProps) => {
 Page.displayName = 'Me';
 
 export default Page;
-
-export const dynamic = 'force-static';

package/src/app/[variants]/(main)/(mobile)/me/profile/features/Category.tsx

@@ -6,15 +6,15 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import Cell, { CellProps } from '@/components/Cell';
+import { enableAuth } from '@/const/auth';
 import { isDeprecatedEdition } from '@/const/version';
 import { ProfileTabs } from '@/store/global/initialState';
 import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/selectors';
 
 const Category = memo(() => {
-  const [isLogin, enableAuth, isLoginWithClerk, signOut] = useUserStore((s) => [
+  const [isLogin, isLoginWithClerk, signOut] = useUserStore((s) => [
     authSelectors.isLogin(s),
-    authSelectors.enabledAuth(s),
     authSelectors.isLoginWithClerk(s),
     s.logout,
   ]);

package/src/app/[variants]/(main)/(mobile)/me/profile/page.tsx

@@ -27,5 +27,3 @@ const Page = async (props: DynamicLayoutProps) => {
 Page.displayName = 'MeProfile';
 
 export default Page;
-
-export const dynamic = 'force-static';

package/src/app/[variants]/(main)/(mobile)/me/settings/page.tsx

@@ -27,5 +27,3 @@ const Page = async (props: DynamicLayoutProps) => {
 Page.displayName = 'MeSettings';
 
 export default Page;
-
-export const dynamic = 'force-static';

package/src/app/[variants]/(main)/discover/search/page.tsx

@@ -71,5 +71,3 @@ const Page = async (props: Props) => {
 Page.DisplayName = 'DiscoverSearch';
 
 export default Page;
-
-export const dynamic = 'force-static';

package/src/app/[variants]/(main)/layout.tsx

@@ -8,5 +8,3 @@ const MainLayout = ServerLayout({ Desktop, Mobile });
 MainLayout.displayName = 'MainLayout';
 
 export default MainLayout;
-
-export const dynamic = 'force-dynamic';

package/src/app/[variants]/(main)/profile/(home)/Client.tsx

@@ -4,6 +4,7 @@ import { Form, type ItemGroup } from '@lobehub/ui';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { enableAuth } from '@/const/auth';
 import { FORM_STYLE } from '@/const/layoutTokens';
 import AvatarWithUpload from '@/features/AvatarWithUpload';
 import UserAvatar from '@/features/User/UserAvatar';
@@ -14,8 +15,7 @@ type SettingItemGroup = ItemGroup;
 
 const Client = memo<{ mobile?: boolean }>(() => {
   const [isLoginWithNextAuth] = useUserStore((s) => [authSelectors.isLoginWithNextAuth(s)]);
-  const [enableAuth, nickname, username, userProfile] = useUserStore((s) => [
-    s.enableAuth(),
+  const [nickname, username, userProfile] = useUserStore((s) => [
     userProfileSelectors.nickName(s),
     userProfileSelectors.username(s),
     userProfileSelectors.userProfile(s),

package/src/app/[variants]/(main)/profile/hooks/useCategory.tsx

@@ -4,6 +4,7 @@ import Link from 'next/link';
 import { useTranslation } from 'react-i18next';
 
 import type { MenuProps } from '@/components/Menu';
+import { enableAuth } from '@/const/auth';
 import { isDeprecatedEdition } from '@/const/version';
 import { ProfileTabs } from '@/store/global/initialState';
 import { useUserStore } from '@/store/user';
@@ -11,10 +12,7 @@ import { authSelectors } from '@/store/user/slices/auth/selectors';
 
 export const useCategory = () => {
   const { t } = useTranslation('auth');
-  const [enableAuth, isLoginWithClerk] = useUserStore((s) => [
-    authSelectors.enabledAuth(s),
-    authSelectors.isLoginWithClerk(s),
-  ]);
+  const [isLoginWithClerk] = useUserStore((s) => [authSelectors.isLoginWithClerk(s)]);
 
   const cateItems: MenuProps['items'] = [
     {

package/src/app/[variants]/(main)/settings/_layout/Mobile/Header.tsx

@@ -6,13 +6,12 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
+import { enableAuth } from '@/const/auth';
 import { useActiveSettingsKey } from '@/hooks/useActiveTabKey';
 import { useQueryRoute } from '@/hooks/useQueryRoute';
 import { useShowMobileWorkspace } from '@/hooks/useShowMobileWorkspace';
 import { SettingsTabs } from '@/store/global/initialState';
 import { useSessionStore } from '@/store/session';
-import { useUserStore } from '@/store/user';
-import { authSelectors } from '@/store/user/selectors';
 import { mobileHeaderSticky } from '@/styles/mobileHeader';
 
 const Header = memo(() => {
@@ -22,7 +21,6 @@ const Header = memo(() => {
   const showMobileWorkspace = useShowMobileWorkspace();
   const activeSettingsKey = useActiveSettingsKey();
   const isSessionActive = useSessionStore((s) => !!s.activeId);
-  const enableAuth = useUserStore(authSelectors.enabledAuth);
 
   const handleBackClick = () => {
     if (isSessionActive && showMobileWorkspace) {

package/src/app/[variants]/(main)/settings/layout.ts

@@ -9,5 +9,3 @@ const SettingsLayout = ServerLayout<LayoutProps>({ Desktop, Mobile });
 SettingsLayout.displayName = 'SettingsLayout';
 
 export default SettingsLayout;
-
-export const dynamic = 'force-static';

package/src/app/[variants]/page.tsx

@@ -7,4 +7,3 @@ export const metadata: Metadata = {
 };
 
 export { default } from './loading';
-

package/src/config/auth.ts

@@ -217,8 +217,7 @@ export const getAuthConfig = () => {
       CLERK_WEBHOOK_SECRET: process.env.CLERK_WEBHOOK_SECRET,
 
       // Next Auth
-      NEXT_PUBLIC_ENABLE_NEXT_AUTH:
-        !!process.env.NEXT_AUTH_SECRET || process.env.NEXT_PUBLIC_ENABLE_NEXT_AUTH === '1',
+      NEXT_PUBLIC_ENABLE_NEXT_AUTH: process.env.NEXT_PUBLIC_ENABLE_NEXT_AUTH === '1',
       NEXT_AUTH_SSO_PROVIDERS: process.env.NEXT_AUTH_SSO_PROVIDERS,
       NEXT_AUTH_SECRET: process.env.NEXT_AUTH_SECRET,
       NEXT_AUTH_DEBUG: !!process.env.NEXT_AUTH_DEBUG,

package/src/const/auth.ts

@@ -2,8 +2,7 @@ import { authEnv } from '@/config/auth';
 
 export const enableClerk = authEnv.NEXT_PUBLIC_ENABLE_CLERK_AUTH;
 export const enableNextAuth = authEnv.NEXT_PUBLIC_ENABLE_NEXT_AUTH;
-export const enableAuth =
-  authEnv.NEXT_PUBLIC_ENABLE_CLERK_AUTH || authEnv.NEXT_PUBLIC_ENABLE_NEXT_AUTH;
+export const enableAuth = enableClerk || enableNextAuth || false;
 
 export const LOBE_CHAT_AUTH_HEADER = 'X-lobe-chat-auth';
 

package/src/features/User/UserPanel/PanelContent.tsx

@@ -5,6 +5,7 @@ import { Flexbox } from 'react-layout-kit';
 
 import BrandWatermark from '@/components/BrandWatermark';
 import Menu from '@/components/Menu';
+import { enableAuth, enableNextAuth } from '@/const/auth';
 import { isDeprecatedEdition } from '@/const/version';
 import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/selectors';
@@ -19,12 +20,7 @@ import { useMenu } from './useMenu';
 const PanelContent = memo<{ closePopover: () => void }>(({ closePopover }) => {
   const router = useRouter();
   const isLoginWithAuth = useUserStore(authSelectors.isLoginWithAuth);
-  const [openSignIn, signOut, enableAuth, enabledNextAuth] = useUserStore((s) => [
-    s.openLogin,
-    s.logout,
-    s.enableAuth(),
-    s.enabledNextAuth,
-  ]);
+  const [openSignIn, signOut] = useUserStore((s) => [s.openLogin, s.logout]);
   const { mainItems, logoutItems } = useMenu();
 
   const handleSignIn = () => {
@@ -36,7 +32,7 @@ const PanelContent = memo<{ closePopover: () => void }>(({ closePopover }) => {
     signOut();
     closePopover();
     // NextAuth doesn't need to redirect to login page
-    if (enabledNextAuth) return;
+    if (enableNextAuth) return;
     router.push('/login');
   };
 

package/src/features/User/UserPanel/useMenu.tsx

@@ -21,6 +21,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import type { MenuProps } from '@/components/Menu';
+import { enableAuth } from '@/const/auth';
 import { LOBE_CHAT_CLOUD } from '@/const/branding';
 import {
   DISCORD,
@@ -68,8 +69,7 @@ export const useMenu = () => {
   const hasNewVersion = useNewVersion();
   const { t } = useTranslation(['common', 'setting', 'auth']);
   const { showCloudPromotion, hideDocs } = useServerConfigStore(featureFlagsSelectors);
-  const [enableAuth, isLogin, isLoginWithAuth] = useUserStore((s) => [
-    authSelectors.enabledAuth(s),
+  const [isLogin, isLoginWithAuth] = useUserStore((s) => [
     authSelectors.isLogin(s),
     authSelectors.isLoginWithAuth(s),
   ]);

package/src/features/User/__tests__/PanelContent.test.tsx

@@ -68,13 +68,12 @@ vi.mock('@/const/version', () => ({
 // 定义一个变量来存储 enableAuth 的值
 let enableAuth = true;
 
-beforeEach(() => {
-  useUserStore.setState({ enableAuth: () => true });
-});
-
-afterEach(() => {
-  enableAuth = true;
-});
+// 模拟 @/const/auth 模块
+vi.mock('@/const/auth', () => ({
+  get enableAuth() {
+    return enableAuth;
+  },
+}));
 
 describe('PanelContent', () => {
   const closePopover = vi.fn();

package/src/features/User/__tests__/useMenu.test.tsx

@@ -1,7 +1,7 @@
 import { act, renderHook } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
 
-import { ServerConfigStoreProvider } from '@/store/serverConfig';
+import { ServerConfigStoreProvider } from '@/store/serverConfig/Provider';
 import { useUserStore } from '@/store/user';
 
 import { useMenu } from '../UserPanel/useMenu';

package/src/layout/GlobalProvider/StoreInitialization.tsx

@@ -5,6 +5,7 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { createStoreUpdater } from 'zustand-utils';
 
+import { enableNextAuth } from '@/const/auth';
 import { useIsMobile } from '@/hooks/useIsMobile';
 import { useEnabledDataSync } from '@/hooks/useSyncData';
 import { useAgentStore } from '@/store/agent';
@@ -37,10 +38,12 @@ const StoreInitialization = memo(() => {
   // init the system preference
   useInitSystemStatus();
 
+  // fetch server config
+  const useFetchServerConfig = useServerConfigStore((s) => s.useInitServerConfig);
+  useFetchServerConfig();
+
   // Update NextAuth status
   const useUserStoreUpdater = createStoreUpdater(useUserStore);
-  const enableNextAuth = useServerConfigStore(serverConfigSelectors.enabledOAuthSSO);
-  useUserStoreUpdater('enabledNextAuth', enableNextAuth);
   const oAuthSSOProviders = useServerConfigStore(serverConfigSelectors.oAuthSSOProviders);
   useUserStoreUpdater('oAuthSSOProviders', oAuthSSOProviders);
 

package/src/layout/GlobalProvider/index.tsx

@@ -4,7 +4,7 @@ import { appEnv } from '@/config/app';
 import { getServerFeatureFlagsValue } from '@/config/featureFlags';
 import DevPanel from '@/features/DevPanel';
 import { getServerGlobalConfig } from '@/server/globalConfig';
-import { ServerConfigStoreProvider } from '@/store/serverConfig';
+import { ServerConfigStoreProvider } from '@/store/serverConfig/Provider';
 import { getAntdLocale } from '@/utils/locale';
 
 import AntdV5MonkeyPatch from './AntdV5MonkeyPatch';
@@ -37,7 +37,7 @@ const GlobalLayout = async ({
 
   // get default feature flags to use with ssr
   const serverFeatureFlags = getServerFeatureFlagsValue();
-  const serverConfig = getServerGlobalConfig();
+  const serverConfig = await getServerGlobalConfig();
   return (
     <StyleRegistry>
       <Locale antdLocale={antdLocale} defaultLang={userLocale}>

package/src/middleware.ts

@@ -1,7 +1,6 @@
 import { clerkMiddleware, createRouteMatcher } from '@clerk/nextjs/server';
 import { NextRequest, NextResponse } from 'next/server';
 import { UAParser } from 'ua-parser-js';
-import urlJoin from 'url-join';
 
 import { authEnv } from '@/config/auth';
 import { LOBE_THEME_APPEARANCE } from '@/const/theme';
@@ -84,23 +83,21 @@ const defaultMiddleware = (request: NextRequest) => {
   if (['/api', '/trpc', '/webapi'].some((path) => url.pathname.startsWith(path)))
     return NextResponse.next();
 
-  // 处理 URL 重写
-  // 构建新路径: /${route}${originalPathname}
-  // 只对 GET 请求进行 URL 重写，确保其他类型的请求（包括 OPTIONS）不受影响
-  const nextPathname = `/${urlJoin(route, url.pathname)}`;
+  // refs: https://github.com/lobehub/lobe-chat/pull/5866
+  // new handle segment rewrite: /${route}${originalPathname}
+  // / -> /zh-CN__0__dark
+  // /discover -> /zh-CN__0__dark/discover
+  const nextPathname = `/${route}` + (url.pathname === '/' ? '' : url.pathname);
   console.log(`[rewrite] ${url.pathname} -> ${nextPathname}`);
+
   url.pathname = nextPathname;
 
-  return NextResponse.rewrite(url);
+  return NextResponse.rewrite(url, { status: 200 });
 };
 
-const publicRoute = ['/', '/discover'];
-
 // Initialize an Edge compatible NextAuth middleware
 const nextAuthMiddleware = NextAuthEdge.auth((req) => {
   const response = defaultMiddleware(req);
-  // skip the '/' route
-  if (publicRoute.some((url) => req.nextUrl.pathname.startsWith(url))) return response;
 
   // Just check if session exists
   const session = req.auth;

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

@@ -37,7 +37,7 @@ describe('configRouter', () => {
           const response = await router.getGlobalConfig();
 
           // Assert
-          const result = response.languageModel?.openai;
+          const result = response.serverConfig.languageModel?.openai;
 
           expect(result).toMatchSnapshot();
           process.env.OPENAI_MODEL_LIST = '';
@@ -49,7 +49,7 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.languageModel?.openai?.serverModelCards;
+          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
 
           expect(result).toMatchSnapshot();
 
@@ -62,7 +62,7 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.languageModel?.openai?.serverModelCards;
+          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
 
           expect(result?.find((s) => s.id === 'gpt-4-0125-preview')?.displayName).toEqual(
             'gpt-4-32k',
@@ -76,7 +76,7 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.languageModel?.openai?.serverModelCards;
+          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
 
           expect(result?.find((r) => r.id === 'gpt-4')).toBeUndefined();
 
@@ -88,7 +88,7 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.languageModel?.openai?.serverModelCards;
+          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
 
           const model = result?.find((o) => o.id === 'gpt-4-1106-preview');
 
@@ -102,7 +102,7 @@ describe('configRouter', () => {
 
           const response = await router.getGlobalConfig();
 
-          const result = response.languageModel?.openai?.serverModelCards;
+          const result = response.serverConfig.languageModel?.openai?.serverModelCards;
 
           expect(result).toContainEqual({
             displayName: 'model1',
@@ -137,7 +137,7 @@ describe('configRouter', () => {
           const response = await router.getGlobalConfig();
 
           // Assert
-          const result = response.languageModel?.openrouter;
+          const result = response.serverConfig.languageModel?.openrouter;
 
           expect(result).toMatchSnapshot();
 

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

@@ -1,12 +1,17 @@
+import { getServerFeatureFlagsValue } from '@/config/featureFlags';
 import { publicProcedure, router } from '@/libs/trpc';
 import { getServerDefaultAgentConfig, getServerGlobalConfig } from '@/server/globalConfig';
+import { GlobalRuntimeConfig } from '@/types/serverConfig';
 
 export const configRouter = router({
   getDefaultAgentConfig: publicProcedure.query(async () => {
     return getServerDefaultAgentConfig();
   }),
 
-  getGlobalConfig: publicProcedure.query(async () => {
-    return getServerGlobalConfig();
+  getGlobalConfig: publicProcedure.query(async (): Promise<GlobalRuntimeConfig> => {
+    const serverConfig = await getServerGlobalConfig();
+    const serverFeatureFlags = getServerFeatureFlagsValue();
+
+    return { serverConfig, serverFeatureFlags };
   }),
 });