@lobehub/lobehub 2.0.0-next.16 → 2.0.0-next.18

package/src/app/[variants]/oauth/consent/[uid]/Consent/BuiltinConsent.tsx

@@ -0,0 +1,57 @@
+'use client';
+
+import { Icon } from '@lobehub/ui';
+import { Card, Result } from 'antd';
+import { useTheme } from 'antd-style';
+import { LoaderCircle } from 'lucide-react';
+import { memo, useEffect, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Center } from 'react-layout-kit';
+
+interface BuiltinConsentProps {
+  uid: string;
+}
+
+const BuiltinConsent = memo<BuiltinConsentProps>(({ uid }) => {
+  const { t } = useTranslation('oauth');
+  const formRef = useRef<HTMLFormElement>(null);
+
+  useEffect(() => {
+    // Auto-submit on mount
+    formRef.current?.submit();
+  }, []);
+
+  const theme = useTheme();
+  return (
+    <>
+      <Center height="100vh">
+        <Card
+          style={{
+            alignItems: 'center',
+            display: 'flex',
+            justifyContent: 'center',
+            minHeight: 280,
+            minWidth: 500,
+            width: '100%',
+          }}
+        >
+          <Result
+            icon={<Icon icon={LoaderCircle} spin style={{ color: theme.colorText }} />}
+            status="success"
+            style={{ padding: 0 }}
+            subTitle={t('consent.redirecting')}
+            title=""
+          />
+        </Card>
+      </Center>
+      <form action="/oidc/consent" method="post" ref={formRef} style={{ display: 'none' }}>
+        <input name="uid" type="hidden" value={uid} />
+        <input name="consent" type="hidden" value="accept" />
+      </form>
+    </>
+  );
+});
+
+BuiltinConsent.displayName = 'BuiltinConsent';
+
+export default BuiltinConsent;

package/src/app/[variants]/oauth/consent/[uid]/{Consent.tsx → Consent/index.tsx}

@@ -7,7 +7,8 @@ import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Center, Flexbox } from 'react-layout-kit';
 
-import OAuthApplicationLogo from './components/OAuthApplicationLogo';
+import OAuthApplicationLogo from '../components/OAuthApplicationLogo';
+import BuiltinConsent from './BuiltinConsent';
 
 interface ClientProps {
   clientId: string;
@@ -117,6 +118,8 @@ function getScopeDescription(scope: string, t: any): string {
   return t(`consent.scope.${scope.replace(':', '-')}`, scope);
 }
 
+const BUILTIN_CLIENTS = new Set(['lobehub-desktop', 'lobehub-mobile', 'lobehub-market']);
+
 const ConsentClient = memo<ClientProps>(({ uid, clientId, scopes, clientMetadata }) => {
   const { styles } = useStyles();
   const { t } = useTranslation('oauth');
@@ -124,6 +127,11 @@ const ConsentClient = memo<ClientProps>(({ uid, clientId, scopes, clientMetadata
   const [isLoading, setIsLoading] = useState(false);
 
   const clientDisplayName = clientMetadata?.clientName || clientId;
+
+  if (BUILTIN_CLIENTS.has(clientId)) {
+    return <BuiltinConsent uid={clientId} />;
+  }
+
   return (
     <Center className={styles.container} gap={16}>
       <Flexbox gap={40}>

package/src/app/[variants]/oauth/consent/[uid]/Login.tsx

@@ -59,6 +59,8 @@ const LoginConfirmClient = memo<LoginConfirmProps>(({ uid, clientMetadata }) =>
   const avatar = useUserStore(userProfileSelectors.userAvatar);
   const nickName = useUserStore(userProfileSelectors.nickName);
 
+  const [isLoading, setIsLoading] = React.useState(false);
+
   const titleText = t('login.title', { clientName: clientDisplayName });
   const descriptionText = t('login.description', { clientName: clientDisplayName });
   const buttonText = t('login.button'); // Or "Continue"
@@ -99,7 +101,12 @@ const LoginConfirmClient = memo<LoginConfirmProps>(({ uid, clientMetadata }) =>
 
           <Flexbox gap={16}>
             {/* Form points to the endpoint handling login confirmation */}
-            <form action="/oidc/consent" method="post" style={{ width: '100%' }}>
+            <form
+              action="/oidc/consent"
+              method="post"
+              onSubmit={() => setIsLoading(true)}
+              style={{ width: '100%' }}
+            >
               {/* Adjust action URL */}
               <input name="uid" type="hidden" value={uid} />
               <input name="choice" type="hidden" value={'accept'} />
@@ -108,6 +115,7 @@ const LoginConfirmClient = memo<LoginConfirmProps>(({ uid, clientMetadata }) =>
                 className={styles.authButton}
                 disabled={!isUserStateInit}
                 htmlType="submit"
+                loading={isLoading}
                 name="consent"
                 size="large"
                 type="primary"

package/src/locales/default/oauth.ts

@@ -19,6 +19,7 @@ const oauth = {
     },
     permissionsTitle: '请求以下权限：',
     redirectUri: '授权成功后将重定向到',
+    redirecting: '授权成功，跳转中...',
     scope: {
       'email': '访问您的电子邮件地址',
       'offline_access': '允许客户端访问您的数据',

package/src/server/routers/lambda/__tests__/integration/message.integration.test.ts

@@ -318,47 +318,6 @@ describe('Message Router Integration Tests', () => {
     });
   });
 
-  describe('batchCreateMessages', () => {
-    it('should create multiple messages in batch', async () => {
-      const caller = messageRouter.createCaller(createTestContext(userId));
-
-      const messagesToCreate = [
-        {
-          content: 'Batch message 1',
-          role: 'user' as const,
-          sessionId: testSessionId,
-        },
-        {
-          content: 'Batch message 2',
-          role: 'assistant' as const,
-          sessionId: testSessionId,
-        },
-        {
-          content: 'Batch message 3',
-          role: 'user' as const,
-          sessionId: testSessionId,
-          topicId: testTopicId,
-        },
-      ];
-
-      const result = await caller.batchCreateMessages(messagesToCreate);
-
-      expect(result.success).toBe(true);
-      // Note: rowCount might be undefined in PGlite, so we skip this check
-      // expect(result.added).toBe(3);
-
-      // 验证数据库中的消息
-      const dbMessages = await serverDB
-        .select()
-        .from(messages)
-        .where(eq(messages.sessionId, testSessionId));
-
-      expect(dbMessages.length).toBeGreaterThanOrEqual(3);
-      const topicMessage = dbMessages.find((m) => m.content === 'Batch message 3');
-      expect(topicMessage?.topicId).toBe(testTopicId);
-    });
-  });
-
   describe('removeMessages', () => {
     it('should remove multiple messages', async () => {
       const caller = messageRouter.createCaller(createTestContext(userId));

package/src/server/routers/lambda/message.ts

@@ -1,5 +1,6 @@
 import {
-  BatchTaskResult,
+  CreateMessageParamsSchema,
+  CreateNewMessageParamsSchema,
   UIChatMessage,
   UpdateMessageParamsSchema,
   UpdateMessageRAGParamsSchema,
@@ -27,14 +28,6 @@ const messageProcedure = authedProcedure.use(serverDatabase).use(async (opts) =>
 });
 
 export const messageRouter = router({
-  batchCreateMessages: messageProcedure
-    .input(z.array(z.any()))
-    .mutation(async ({ input, ctx }): Promise<BatchTaskResult> => {
-      const data = await ctx.messageModel.batchCreate(input);
-
-      return { added: data.rowCount as number, ids: [], skips: [], success: true };
-    }),
-
   count: messageProcedure
     .input(
       z
@@ -64,7 +57,7 @@ export const messageRouter = router({
     }),
 
   createMessage: messageProcedure
-    .input(z.object({}).passthrough().partial())
+    .input(CreateMessageParamsSchema)
     .mutation(async ({ input, ctx }) => {
       const data = await ctx.messageModel.create(input as any);
 
@@ -72,7 +65,7 @@ export const messageRouter = router({
     }),
 
   createNewMessage: messageProcedure
-    .input(z.object({}).passthrough().partial())
+    .input(CreateNewMessageParamsSchema)
     .mutation(async ({ input, ctx }) => {
       return ctx.messageModel.createNewMessage(input as any, {
         postProcessUrl: (path) => ctx.fileService.getFullFileUrl(path),

package/src/server/routers/lambda/user.ts

@@ -1,9 +1,17 @@
 import { UserJSON } from '@clerk/backend';
+import { enableClerk, isDesktop } from '@lobechat/const';
+import {
+  NextAuthAccountSchame,
+  UserGuideSchema,
+  UserInitializationState,
+  UserPreference,
+  UserPreferenceSchema,
+  UserSettings,
+  UserSettingsSchema,
+} from '@lobechat/types';
 import { v4 as uuidv4 } from 'uuid';
 import { z } from 'zod';
 
-import { enableClerk } from '@/const/auth';
-import { isDesktop } from '@/const/version';
 import { MessageModel } from '@/database/models/message';
 import { SessionModel } from '@/database/models/session';
 import { UserModel, UserNotFoundError } from '@/database/models/user';
@@ -16,13 +24,6 @@ import { S3 } from '@/server/modules/S3';
 import { FileService } from '@/server/services/file';
 import { NextAuthUserService } from '@/server/services/nextAuthUser';
 import { UserService } from '@/server/services/user';
-import {
-  NextAuthAccountSchame,
-  UserGuideSchema,
-  UserInitializationState,
-  UserPreference,
-} from '@/types/user';
-import { UserSettings } from '@/types/user/settings';
 
 const userProcedure = authedProcedure.use(serverDatabase).use(async ({ ctx, next }) => {
   return next({
@@ -199,30 +200,28 @@ export const userRouter = router({
     return ctx.userModel.updateGuide(input);
   }),
 
-  updatePreference: userProcedure.input(z.any()).mutation(async ({ ctx, input }) => {
+  updatePreference: userProcedure.input(UserPreferenceSchema).mutation(async ({ ctx, input }) => {
     return ctx.userModel.updatePreference(input);
   }),
 
-  updateSettings: userProcedure
-    .input(z.object({}).passthrough())
-    .mutation(async ({ ctx, input }) => {
-      const { keyVaults, ...res } = input as Partial<UserSettings>;
+  updateSettings: userProcedure.input(UserSettingsSchema).mutation(async ({ ctx, input }) => {
+    const { keyVaults, ...res } = input as Partial<UserSettings>;
 
-      // Encrypt keyVaults
-      let encryptedKeyVaults: string | null = null;
+    // Encrypt keyVaults
+    let encryptedKeyVaults: string | null = null;
 
-      if (keyVaults) {
-        // TODO: better to add a validation
-        const data = JSON.stringify(keyVaults);
-        const gateKeeper = await KeyVaultsGateKeeper.initWithEnvKey();
+    if (keyVaults) {
+      // TODO: better to add a validation
+      const data = JSON.stringify(keyVaults);
+      const gateKeeper = await KeyVaultsGateKeeper.initWithEnvKey();
 
-        encryptedKeyVaults = await gateKeeper.encrypt(data);
-      }
+      encryptedKeyVaults = await gateKeeper.encrypt(data);
+    }
 
-      const nextValue = { ...res, keyVaults: encryptedKeyVaults };
+    const nextValue = { ...res, keyVaults: encryptedKeyVaults };
 
-      return ctx.userModel.updateSetting(nextValue);
-    }),
+    return ctx.userModel.updateSetting(nextValue);
+  }),
 });
 
 export type UserRouter = typeof userRouter;

package/src/services/message/server.ts

@@ -21,10 +21,6 @@ export class ServerService implements IMessageService {
     });
   };
 
-  batchCreateMessages: IMessageService['batchCreateMessages'] = async (messages) => {
-    return lambdaClient.message.batchCreateMessages.mutate(messages);
-  };
-
   getMessages: IMessageService['getMessages'] = async (sessionId, topicId, groupId) => {
     const data = await lambdaClient.message.getMessages.query({
       groupId,

package/src/services/message/type.ts

@@ -5,7 +5,6 @@ import {
   ChatTranslate,
   CreateMessageParams,
   CreateMessageResult,
-  DBMessageItem,
   ModelRankItem,
   UIChatMessage,
   UpdateMessageParams,
@@ -19,7 +18,6 @@ import type { HeatmapsProps } from '@lobehub/charts';
 export interface IMessageService {
   createMessage(data: CreateMessageParams): Promise<string>;
   createNewMessage(data: CreateMessageParams): Promise<CreateMessageResult>;
-  batchCreateMessages(messages: DBMessageItem[]): Promise<any>;
 
   getMessages(sessionId: string, topicId?: string, groupId?: string): Promise<UIChatMessage[]>;
   getGroupMessages(groupId: string, topicId?: string): Promise<UIChatMessage[]>;