@lobehub/lobehub 2.0.0-next.195 → 2.0.0-next.197

package/src/app/(backend)/middleware/auth/utils.test.ts

@@ -1,8 +1,6 @@
 import { type AuthObject } from '@clerk/backend';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { getAppConfig } from '@/envs/app';
-
 import { checkAuthMethod } from './utils';
 
 let enableClerkMock = false;
@@ -26,15 +24,9 @@ vi.mock('@/const/auth', async (importOriginal) => {
   };
 });
 
-vi.mock('@/envs/app', () => ({
-  getAppConfig: vi.fn(),
-}));
-
 describe('checkAuthMethod', () => {
   beforeEach(() => {
-    vi.mocked(getAppConfig).mockReturnValue({
-      ACCESS_CODES: ['validAccessCode'],
-    } as any);
+    vi.clearAllMocks();
   });
 
   it('should pass with valid Clerk auth', () => {
@@ -91,39 +83,7 @@ describe('checkAuthMethod', () => {
     ).not.toThrow();
   });
 
-  it('should pass with no access code required', () => {
-    vi.mocked(getAppConfig).mockReturnValueOnce({
-      ACCESS_CODES: [],
-    } as any);
-
+  it('should pass with no auth params', () => {
     expect(() => checkAuthMethod({})).not.toThrow();
   });
-
-  it('should pass with valid access code', () => {
-    expect(() =>
-      checkAuthMethod({
-        accessCode: 'validAccessCode',
-      }),
-    ).not.toThrow();
-  });
-
-  it('should throw error with invalid access code', () => {
-    try {
-      checkAuthMethod({
-        accessCode: 'invalidAccessCode',
-      });
-    } catch (e) {
-      expect(e).toEqual({
-        errorType: 'InvalidAccessCode',
-      });
-    }
-
-    try {
-      checkAuthMethod({});
-    } catch (e) {
-      expect(e).toEqual({
-        errorType: 'InvalidAccessCode',
-      });
-    }
-  });
 });

package/src/app/(backend)/middleware/auth/utils.ts

@@ -3,28 +3,25 @@ import { AgentRuntimeError } from '@lobechat/model-runtime';
 import { ChatErrorType } from '@lobechat/types';
 
 import { enableBetterAuth, enableClerk, enableNextAuth } from '@/const/auth';
-import { getAppConfig } from '@/envs/app';
 
 interface CheckAuthParams {
-  accessCode?: string;
   apiKey?: string;
   betterAuthAuthorized?: boolean;
   clerkAuth?: AuthObject;
   nextAuthAuthorized?: boolean;
 }
 /**
- * Check if the provided access code is valid, a user API key should be used or the OAuth 2 header is provided.
+ * Check if authentication is valid based on various auth methods.
  *
  * @param {CheckAuthParams} params - Authentication parameters extracted from headers.
- * @param {string} [params.accessCode] - The access code to check.
  * @param {string} [params.apiKey] - The user API key.
  * @param {boolean} [params.betterAuthAuthorized] - Whether the Better Auth session exists.
  * @param {AuthObject} [params.clerkAuth] - Clerk authentication payload from middleware.
  * @param {boolean} [params.nextAuthAuthorized] - Whether the OAuth 2 header is provided.
- * @throws {AgentRuntimeError} If the access code is invalid and no user API key is provided.
+ * @throws {AgentRuntimeError} If authentication fails.
  */
 export const checkAuthMethod = (params: CheckAuthParams) => {
-  const { apiKey, betterAuthAuthorized, nextAuthAuthorized, accessCode, clerkAuth } = params;
+  const { apiKey, betterAuthAuthorized, nextAuthAuthorized, clerkAuth } = params;
   // clerk auth handler
   if (enableClerk) {
     // if there is no userId, means the use is not login, just throw error
@@ -42,15 +39,4 @@ export const checkAuthMethod = (params: CheckAuthParams) => {
 
   // if apiKey exist
   if (apiKey) return;
-
-  const { ACCESS_CODES } = getAppConfig();
-
-  // if accessCode doesn't exist
-  if (!ACCESS_CODES.length) return;
-
-  if (!accessCode || !ACCESS_CODES.includes(accessCode)) {
-    // Avoid logging user-provided credentials (access code) for security reasons
-    console.warn('Invalid access code provided');
-    throw AgentRuntimeError.createError(ChatErrorType.InvalidAccessCode);
-  }
 };

package/src/app/(backend)/webapi/chat/[provider]/route.test.ts

@@ -62,7 +62,6 @@ describe('POST handler', () => {
 
       // 设置 getJWTPayload 和 initModelRuntimeWithUserPayload 的模拟返回值
       vi.mocked(getXorPayload).mockReturnValueOnce({
-        accessCode: 'test-access-code',
         apiKey: 'test-api-key',
         azureApiVersion: 'v1',
       });
@@ -105,7 +104,6 @@ describe('POST handler', () => {
       mockState.enableClerk = true;
 
       vi.mocked(getXorPayload).mockReturnValueOnce({
-        accessCode: 'test-access-code',
         apiKey: 'test-api-key',
         azureApiVersion: 'v1',
       });
@@ -133,7 +131,6 @@ describe('POST handler', () => {
       await POST(request, { params: mockParams });
 
       expect(checkAuthMethod).toBeCalledWith({
-        accessCode: 'test-access-code',
         apiKey: 'test-api-key',
         betterAuthAuthorized: false,
         clerkAuth: {},
@@ -163,7 +160,6 @@ describe('POST handler', () => {
   describe('chat', () => {
     it('should correctly handle chat completion with valid payload', async () => {
       vi.mocked(getXorPayload).mockReturnValueOnce({
-        accessCode: 'test-access-code',
         apiKey: 'test-api-key',
         azureApiVersion: 'v1',
         userId: 'abc',
@@ -193,7 +189,6 @@ describe('POST handler', () => {
     it('should return an error response when chat completion fails', async () => {
       // 设置 getJWTPayload 和 initAgentRuntimeWithUserPayload 的模拟返回值
       vi.mocked(getXorPayload).mockReturnValueOnce({
-        accessCode: 'test-access-code',
         apiKey: 'test-api-key',
         azureApiVersion: 'v1',
       });

package/src/app/(backend)/webapi/models/[provider]/route.test.ts

@@ -41,7 +41,6 @@ describe('GET handler', () => {
       const mockParams = Promise.resolve({ provider: 'google' });
 
       vi.mocked(getXorPayload).mockReturnValueOnce({
-        accessCode: 'test-access-code',
         apiKey: 'test-api-key',
       });
 
@@ -73,7 +72,6 @@ describe('GET handler', () => {
       const mockParams = Promise.resolve({ provider: 'google' });
 
       vi.mocked(getXorPayload).mockReturnValueOnce({
-        accessCode: 'test-access-code',
         apiKey: 'test-api-key',
       });
 
@@ -103,7 +101,6 @@ describe('GET handler', () => {
       const mockParams = Promise.resolve({ provider: 'google' });
 
       vi.mocked(getXorPayload).mockReturnValueOnce({
-        accessCode: 'test-access-code',
         apiKey: 'test-api-key',
       });
 
@@ -128,7 +125,6 @@ describe('GET handler', () => {
       const mockParams = Promise.resolve({ provider: 'google' });
 
       vi.mocked(getXorPayload).mockReturnValueOnce({
-        accessCode: 'test-access-code',
         apiKey: 'test-api-key',
       });
 
@@ -145,7 +141,6 @@ describe('GET handler', () => {
       const mockParams = Promise.resolve({ provider: 'openai' });
 
       vi.mocked(getXorPayload).mockReturnValueOnce({
-        accessCode: 'test-access-code',
         apiKey: 'test-api-key',
       });
 
@@ -165,7 +160,6 @@ describe('GET handler', () => {
       const mockParams = Promise.resolve({ provider: 'openai' });
 
       vi.mocked(getXorPayload).mockReturnValueOnce({
-        accessCode: 'test-access-code',
         apiKey: 'test-api-key',
       });
 

package/src/app/(backend)/webapi/plugin/gateway/route.ts

@@ -1,36 +1,15 @@
 import { AgentRuntimeError } from '@lobechat/model-runtime';
-import { ChatErrorType, type ErrorType, TraceNameMap } from '@lobechat/types';
-import { getXorPayload } from '@lobechat/utils/server';
+import { ChatErrorType, TraceNameMap } from '@lobechat/types';
 import type { PluginRequestPayload } from '@lobehub/chat-plugin-sdk';
 import { createGatewayOnEdgeRuntime } from '@lobehub/chat-plugins-gateway';
 
-import { LOBE_CHAT_AUTH_HEADER, OAUTH_AUTHORIZED, enableNextAuth } from '@/const/auth';
+import { LOBE_CHAT_AUTH_HEADER } from '@/const/auth';
 import { LOBE_CHAT_TRACE_ID } from '@/const/trace';
 import { getAppConfig } from '@/envs/app';
 import { TraceClient } from '@/libs/traces';
 import { parserPluginSettings } from '@/server/services/pluginGateway/settings';
-import { createErrorResponse } from '@/utils/errorResponse';
 import { getTracePayload } from '@/utils/trace';
 
-const checkAuth = (accessCode: string | null, oauthAuthorized: boolean | null) => {
-  const { ACCESS_CODES, PLUGIN_SETTINGS } = getAppConfig();
-
-  // if there is no plugin settings, just skip the auth
-  if (!PLUGIN_SETTINGS) return { auth: true };
-
-  // If authorized by oauth
-  if (oauthAuthorized && enableNextAuth) return { auth: true };
-
-  // if accessCode doesn't exist
-  if (!ACCESS_CODES.length) return { auth: true };
-
-  if (!accessCode || !ACCESS_CODES.includes(accessCode)) {
-    return { auth: false, error: ChatErrorType.InvalidAccessCode };
-  }
-
-  return { auth: true };
-};
-
 const { PLUGINS_INDEX_URL: pluginsIndexUrl, PLUGIN_SETTINGS } = getAppConfig();
 
 const defaultPluginSettings = parserPluginSettings(PLUGIN_SETTINGS);
@@ -42,15 +21,6 @@ export const POST = async (req: Request) => {
   const authorization = req.headers.get(LOBE_CHAT_AUTH_HEADER);
   if (!authorization) throw AgentRuntimeError.createError(ChatErrorType.Unauthorized);
 
-  const oauthAuthorized = !!req.headers.get(OAUTH_AUTHORIZED);
-  const payload = getXorPayload(authorization);
-
-  const result = checkAuth(payload.accessCode!, oauthAuthorized);
-
-  if (!result.auth) {
-    return createErrorResponse(result.error as ErrorType);
-  }
-
   // TODO: need to be replace by better telemetry system
   // add trace
   const tracePayload = getTracePayload(req);

package/src/app/[variants]/(main)/settings/common/features/Common/Common.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { Form, type FormGroupItemType, Icon, ImageSelect, InputPassword } from '@lobehub/ui';
+import { Form, type FormGroupItemType, Icon, ImageSelect } from '@lobehub/ui';
 import { Select, Skeleton } from '@lobehub/ui';
 import { Segmented, Switch } from 'antd';
 import isEqual from 'fast-deep-equal';
@@ -14,8 +14,6 @@ import { isDesktop } from '@/const/version';
 import { localeOptions } from '@/locales/resources';
 import { useGlobalStore } from '@/store/global';
 import { systemStatusSelectors } from '@/store/global/selectors';
-import { useServerConfigStore } from '@/store/serverConfig';
-import { serverConfigSelectors } from '@/store/serverConfig/selectors';
 import { useUserStore } from '@/store/user';
 import { settingsSelectors } from '@/store/user/selectors';
 import { type LocaleMode } from '@/types/locale';
@@ -23,7 +21,6 @@ import { type LocaleMode } from '@/types/locale';
 const Common = memo(() => {
   const { t } = useTranslation('setting');
 
-  const showAccessCodeConfig = useServerConfigStore(serverConfigSelectors.enabledAccessCode);
   const general = useUserStore((s) => settingsSelectors.currentSettings(s).general, isEqual);
   const themeMode = useGlobalStore(systemStatusSelectors.themeMode);
   const language = useGlobalStore(systemStatusSelectors.language);
@@ -137,18 +134,6 @@ const Common = memo(() => {
         name: 'contextMenuMode',
       },
 
-      {
-        children: (
-          <InputPassword
-            autoComplete={'new-password'}
-            placeholder={t('settingSystem.accessCode.placeholder')}
-          />
-        ),
-        desc: t('settingSystem.accessCode.desc'),
-        hidden: !showAccessCodeConfig,
-        label: t('settingSystem.accessCode.title'),
-        name: 'password',
-      },
       {
         children: (
           <Select

package/src/features/ChatInput/ActionBar/Token/TokenTag.tsx

@@ -52,6 +52,7 @@ const Token = memo<TokenTagProps>(({ total: messageString }) => {
     chatConfigByIdSelectors.getEnableHistoryCountById(agentId)(s),
     // need to re-render by search mode
     chatConfigByIdSelectors.isEnableSearchById(agentId)(s),
+    chatConfigByIdSelectors.getUseModelBuiltinSearchById(agentId)(s),
   ]);
 
   const maxTokens = useModelContextWindowTokens(model, provider);

package/src/features/LibraryModal/AssignKnowledgeBase/List.tsx

@@ -114,19 +114,18 @@ export const List = memo(() => {
           totalCount={data!.length}
         />
       ) : (
-        <div style={{ flex: 1, overflow: 'hidden' }}>
-          <div style={{ height: '100%', overflowY: 'auto' }}>
-            <div style={{ paddingInline: 16 }}>
-              <VirtuosoMasonry
-                ItemContent={MasonryItemWrapper}
-                columnCount={columnCount}
-                context={masonryContext}
-                data={data || []}
-                style={{
-                  gap: '16px',
-                }}
-              />
-            </div>
+        <div style={{ height: '100%', position: 'relative' }}>
+          <div style={{ inset: 0, position: 'absolute' }}>
+            <VirtuosoMasonry
+              ItemContent={MasonryItemWrapper}
+              columnCount={columnCount}
+              context={masonryContext}
+              data={data || []}
+              style={{
+                gap: '16px',
+                height: '100%',
+              }}
+            />
           </div>
         </div>
       )}

package/src/features/ResourceManager/components/Explorer/MasonryView/index.tsx

@@ -87,6 +87,7 @@ const MasonryView = memo<MasonryViewProps>(
             data={data || []}
             style={{
               gap: '16px',
+              overflow: 'hidden',
             }}
           />
           {isLoadingMore && (

package/src/locales/default/setting.ts

@@ -442,9 +442,6 @@ export default {
   'settingOpening.openingQuestions.title': 'Opening Questions',
   'settingOpening.title': 'Opening Settings',
   'settingPlugin.title': 'Skill List',
-  'settingSystem.accessCode.desc': 'Encryption access is enabled by the administrator',
-  'settingSystem.accessCode.placeholder': 'Enter access password',
-  'settingSystem.accessCode.title': 'Access Password',
   'settingSystem.oauth.info.desc': 'Logged in',
   'settingSystem.oauth.info.title': 'Account Information',
   'settingSystem.oauth.signin.action': 'Sign In',

package/src/server/routers/lambda/__tests__/file.test.ts

@@ -245,7 +245,35 @@ describe('fileRouter', () => {
       );
     });
 
-    it('should handle getFileMetadata errors', async () => {
+    it('should fallback to input size when getFileMetadata fails', async () => {
+      mockFileModelCheckHash.mockResolvedValue({ isExist: false });
+      mockFileModelCreate.mockResolvedValue({ id: 'new-file-id' });
+      mockFileServiceGetFileMetadata.mockRejectedValue(new Error('File not found in S3'));
+
+      const result = await caller.createFile({
+        hash: 'test-hash',
+        fileType: 'text',
+        name: 'test.txt',
+        size: 100,
+        url: 'files/non-existent.txt',
+        metadata: {},
+      });
+
+      expect(result).toEqual({
+        id: 'new-file-id',
+        url: 'https://lobehub.com/f/new-file-id',
+      });
+
+      // Verify create was called with input size as fallback
+      expect(mockFileModelCreate).toHaveBeenCalledWith(
+        expect.objectContaining({
+          size: 100,
+        }),
+        true,
+      );
+    });
+
+    it('should throw error when getFileMetadata fails and input size is less than 1', async () => {
       mockFileModelCheckHash.mockResolvedValue({ isExist: false });
       mockFileServiceGetFileMetadata.mockRejectedValue(new Error('File not found in S3'));
 
@@ -254,11 +282,56 @@ describe('fileRouter', () => {
           hash: 'test-hash',
           fileType: 'text',
           name: 'test.txt',
-          size: 100,
+          size: 0,
           url: 'files/non-existent.txt',
           metadata: {},
         }),
-      ).rejects.toThrow('File not found in S3');
+      ).rejects.toThrow('File size must be at least 1 byte');
+    });
+
+    it('should use input size when getFileMetadata returns contentLength less than 1', async () => {
+      mockFileModelCheckHash.mockResolvedValue({ isExist: false });
+      mockFileModelCreate.mockResolvedValue({ id: 'new-file-id' });
+      mockFileServiceGetFileMetadata.mockResolvedValue({
+        contentLength: 0,
+        contentType: 'text/plain',
+      });
+
+      await caller.createFile({
+        hash: 'test-hash',
+        fileType: 'text',
+        name: 'test.txt',
+        size: 100,
+        url: 'files/test.txt',
+        metadata: {},
+      });
+
+      // Verify create was called with input size since contentLength < 1
+      expect(mockFileModelCreate).toHaveBeenCalledWith(
+        expect.objectContaining({
+          size: 100,
+        }),
+        true,
+      );
+    });
+
+    it('should throw error when both getFileMetadata contentLength and input size are less than 1', async () => {
+      mockFileModelCheckHash.mockResolvedValue({ isExist: false });
+      mockFileServiceGetFileMetadata.mockResolvedValue({
+        contentLength: 0,
+        contentType: 'text/plain',
+      });
+
+      await expect(
+        caller.createFile({
+          hash: 'test-hash',
+          fileType: 'text',
+          name: 'test.txt',
+          size: 0,
+          url: 'files/test.txt',
+          metadata: {},
+        }),
+      ).rejects.toThrow('File size must be at least 1 byte');
     });
   });
 

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

@@ -64,7 +64,19 @@ export const fileRouter = router({
         }
       }
 
-      const { contentLength: actualSize } = await ctx.fileService.getFileMetadata(input.url);
+      let actualSize = input.size;
+      try {
+        const { contentLength } = await ctx.fileService.getFileMetadata(input.url);
+        if (contentLength >= 1) {
+          actualSize = contentLength;
+        }
+      } catch {
+        // If metadata fetch fails, use original size from input
+      }
+
+      if (actualSize < 1) {
+        throw new TRPCError({ code: 'BAD_REQUEST', message: 'File size must be at least 1 byte' });
+      }
 
       const { id } = await ctx.fileModel.create(
         {

package/src/services/config.ts

@@ -8,7 +8,7 @@ import { exportService } from './export';
 
 class ConfigService {
   exportAll = async () => {
-    const { data, url } = await exportService.exportData();
+    const { data, url, schemaHash } = await exportService.exportData();
     const filename = `${dayjs().format('YYYY-MM-DD-hh-mm')}_${BRANDING_NAME}-data.json`;
 
     // if url exists, means export data from server and upload the data to S3
@@ -18,24 +18,10 @@ class ConfigService {
       return;
     }
 
-    // or export to file with the data
-    const result = await this.createDataStructure(data, 'postgres');
+    const result: ImportPgDataStructure = { data, mode: 'postgres', schemaHash };
 
     exportJSONFile(result, filename);
   };
-
-  private createDataStructure = async (
-    data: any,
-    mode: 'pglite' | 'postgres',
-  ): Promise<ImportPgDataStructure> => {
-    const { default: json } = await import('@/database/core/migrations.json');
-    const latestHash = json.at(-1)?.hash;
-    if (!latestHash) {
-      throw new Error('Not find database sql hash');
-    }
-
-    return { data, mode, schemaHash: latestHash };
-  };
 }
 
 export const configService = new ConfigService();

package/packages/database/src/core/dbForTest.ts

@@ -1,43 +0,0 @@
-import { Pool as NeonPool, neonConfig } from '@neondatabase/serverless';
-import { drizzle as neonDrizzle } from 'drizzle-orm/neon-serverless';
-import * as migrator from 'drizzle-orm/neon-serverless/migrator';
-import { drizzle as nodeDrizzle } from 'drizzle-orm/node-postgres';
-import * as nodeMigrator from 'drizzle-orm/node-postgres/migrator';
-import { join } from 'node:path';
-import { Pool as NodePool } from 'pg';
-import ws from 'ws';
-
-import { serverDBEnv } from '@/config/db';
-
-import * as schema from '../schemas';
-
-const migrationsFolder = join(__dirname, '../../migrations');
-
-export const getTestDBInstance = async () => {
-  let connectionString = serverDBEnv.DATABASE_TEST_URL;
-
-  if (!connectionString) {
-    throw new Error(`You are try to use database, but "DATABASE_TEST_URL" is not set correctly`);
-  }
-
-  if (serverDBEnv.DATABASE_DRIVER === 'node') {
-    const client = new NodePool({ connectionString });
-
-    const db = nodeDrizzle(client, { schema });
-
-    await nodeMigrator.migrate(db, { migrationsFolder });
-
-    return db;
-  }
-
-  // https://github.com/neondatabase/serverless/blob/main/CONFIG.md#websocketconstructor-typeof-websocket--undefined
-  neonConfig.webSocketConstructor = ws;
-
-  const client = new NeonPool({ connectionString });
-
-  const db = neonDrizzle(client, { schema });
-
-  await migrator.migrate(db, { migrationsFolder });
-
-  return db;
-};