@lobehub/chat 1.2.11 → 1.2.12

package/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 # Changelog
 
+### [Version 1.2.12](https://github.com/lobehub/lobe-chat/compare/v1.2.11...v1.2.12)
+
+<sup>Released on **2024-07-07**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fixed mobile web page navigation issue with inbox assistant, support to disable clerk signup with feature flag.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fixed mobile web page navigation issue with inbox assistant, closes [#2693](https://github.com/lobehub/lobe-chat/issues/2693) ([4476a5e](https://github.com/lobehub/lobe-chat/commit/4476a5e))
+- **misc**: Support to disable clerk signup with feature flag, closes [#3126](https://github.com/lobehub/lobe-chat/issues/3126) ([4ead315](https://github.com/lobehub/lobe-chat/commit/4ead315))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.2.11](https://github.com/lobehub/lobe-chat/compare/v1.2.10...v1.2.11)
 
 <sup>Released on **2024-07-07**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.2.11",
+  "version": "1.2.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/(auth)/signup/[[...signup]]/page.tsx

@@ -1,5 +1,7 @@
 import { SignUp } from '@clerk/nextjs';
+import { redirect } from 'next/navigation';
 
+import { serverFeatureFlags } from '@/config/featureFlags';
 import { metadataModule } from '@/server/metadata';
 import { translation } from '@/server/translation';
 
@@ -13,6 +15,12 @@ export const generateMetadata = async () => {
 };
 
 const Page = () => {
+  const enableClerkSignUp = serverFeatureFlags().enableClerkSignUp;
+
+  if (!enableClerkSignUp) {
+    redirect('/login');
+  }
+
   return <SignUp path="/signup" />;
 };
 

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

@@ -2,7 +2,7 @@
 
 import { MobileNavBar, MobileNavBarTitle } from '@lobehub/ui';
 import { Tag } from 'antd';
-import { useRouter } from 'next/navigation';
+import { useRouter, useSearchParams } from 'next/navigation';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
@@ -16,7 +16,17 @@ const Header = memo(() => {
   const { t } = useTranslation('setting');
 
   const router = useRouter();
+  const searchParams = useSearchParams();
   const activeSettingsKey = useActiveSettingsKey();
+
+  const handleBackClick = () => {
+    if (searchParams.has('session') && searchParams.has('showMobileWorkspace')) {
+      router.push(`/chat?${searchParams.toString()}`);
+    } else {
+      router.push(enableAuth ? '/me/settings' : '/me');
+    }
+  };
+
   return (
     <MobileNavBar
       center={
@@ -33,7 +43,7 @@ const Header = memo(() => {
           }
         />
       }
-      onBackClick={() => router.push(enableAuth ? '/me/settings' : '/me')}
+      onBackClick={handleBackClick}
       showBackButton
       style={mobileHeaderSticky}
     />

package/src/config/featureFlags/schema.ts

@@ -16,6 +16,8 @@ export const FeatureFlagsSchema = z.object({
 
   check_updates: z.boolean().optional(),
   welcome_suggest: z.boolean().optional(),
+
+  clerk_sign_up: z.boolean().optional(),
 });
 
 // TypeScript 类型，从 Zod schema 生成
@@ -36,6 +38,8 @@ export const DEFAULT_FEATURE_FLAGS: IFeatureFlags = {
 
   check_updates: true,
   welcome_suggest: true,
+
+  clerk_sign_up: true,
 };
 
 export const mapFeatureFlagsEnvToState = (config: IFeatureFlags) => {
@@ -53,5 +57,7 @@ export const mapFeatureFlagsEnvToState = (config: IFeatureFlags) => {
 
     enableCheckUpdates: config.check_updates,
     showWelcomeSuggest: config.welcome_suggest,
+
+    enableClerkSignUp: config.clerk_sign_up,
   };
 };

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

@@ -4,10 +4,13 @@ import { ClerkProvider } from '@clerk/nextjs';
 import { PropsWithChildren, memo, useEffect, useMemo, useState, useTransition } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
+
 import UserUpdater from './UserUpdater';
 import { useAppearance } from './useAppearance';
 
 const Clerk = memo(({ children }: PropsWithChildren) => {
+  const { enableClerkSignUp } = useServerConfigStore(featureFlagsSelectors);
   const appearance = useAppearance();
   const {
     i18n: { language, getResourceBundle },
@@ -27,8 +30,23 @@ const Clerk = memo(({ children }: PropsWithChildren) => {
     });
   }, [count, setCount, isPending, startTransition]);
 
+  const updatedAppearance = useMemo(
+    () => ({
+      ...appearance,
+      elements: {
+        ...appearance.elements,
+        ...(!enableClerkSignUp ? { footerAction: { display: 'none' } } : {}),
+      },
+    }),
+    [appearance, enableClerkSignUp],
+  );
+
   return (
-    <ClerkProvider appearance={appearance} localization={localization}>
+    <ClerkProvider
+      appearance={updatedAppearance}
+      localization={localization}
+      signUpUrl={!enableClerkSignUp ? '/login' : '/signup'} // Redirect sign-up to sign-in if disabled
+    >
       {children}
       <UserUpdater />
     </ClerkProvider>

package/src/store/serverConfig/selectors.test.ts

@@ -26,6 +26,7 @@ describe('featureFlagsSelectors', () => {
       showOpenAIProxyUrl: true,
       enableCheckUpdates: true,
       showWelcomeSuggest: true,
+      enableClerkSignUp: true,
     });
   });
 });