@lobehub/lobehub 2.0.0-next.2 → 2.0.0-next.20

package/src/hooks/useModelSupportVision.ts

@@ -1,15 +1,5 @@
-import { isDeprecatedEdition } from '@/const/version';
 import { aiModelSelectors, useAiInfraStore } from '@/store/aiInfra';
-import { useUserStore } from '@/store/user';
-import { modelProviderSelectors } from '@/store/user/selectors';
 
 export const useModelSupportVision = (model: string, provider: string) => {
-  const newValue = useAiInfraStore(aiModelSelectors.isModelSupportVision(model, provider));
-
-  // TODO: remove this in V2.0
-  const oldValue = useUserStore(modelProviderSelectors.isModelEnabledVision(model));
-  if (isDeprecatedEdition) return oldValue;
-  //
-
-  return newValue;
+  return useAiInfraStore(aiModelSelectors.isModelSupportVision(model, provider));
 };

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

@@ -4,13 +4,10 @@ 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 },
@@ -41,23 +38,12 @@ const Clerk = memo(({ children }: PropsWithChildren) => {
     return origins.length ? origins : undefined;
   }, []);
 
-  const updatedAppearance = useMemo(
-    () => ({
-      ...appearance,
-      elements: {
-        ...appearance.elements,
-        ...(!enableClerkSignUp ? { footerAction: { display: 'none' } } : {}),
-      },
-    }),
-    [appearance, enableClerkSignUp],
-  );
-
   return (
     <ClerkProvider
       allowedRedirectOrigins={allowedRedirectOrigins}
-      appearance={updatedAppearance}
+      appearance={appearance}
       localization={localization}
-      signUpUrl={!enableClerkSignUp ? '/login' : '/signup'} // Redirect sign-up to sign-in if disabled
+      signUpUrl="/signup"
     >
       {children}
       <UserUpdater />

package/src/libs/next-auth/auth.config.ts

@@ -1,6 +1,5 @@
 import type { NextAuthConfig } from 'next-auth';
 
-import { getServerDBConfig } from '@/config/db';
 import { getAuthConfig } from '@/envs/auth';
 
 import { LobeNextAuthDbAdapter } from './adapter';
@@ -14,8 +13,6 @@ const {
   NEXT_PUBLIC_ENABLE_NEXT_AUTH,
 } = getAuthConfig();
 
-const { NEXT_PUBLIC_ENABLED_SERVER_SERVICE } = getServerDBConfig();
-
 export const initSSOProviders = () => {
   return NEXT_PUBLIC_ENABLE_NEXT_AUTH
     ? NEXT_AUTH_SSO_PROVIDERS.split(/[,，]/).map((provider) => {
@@ -30,7 +27,7 @@ export const initSSOProviders = () => {
 
 // Notice this is only an object, not a full Auth.js instance
 export default {
-  adapter: NEXT_PUBLIC_ENABLED_SERVER_SERVICE ? LobeNextAuthDbAdapter() : undefined,
+  adapter: NEXT_PUBLIC_ENABLE_NEXT_AUTH ? LobeNextAuthDbAdapter() : undefined,
   callbacks: {
     // Note: Data processing order of callback: authorize --> jwt --> session
     async jwt({ token, user }) {
@@ -58,10 +55,10 @@ export default {
     signIn: '/next-auth/signin',
   },
   providers: initSSOProviders(),
-  secret: NEXT_AUTH_SECRET,
+  secret: NEXT_AUTH_SECRET ?? process.env.AUTH_SECRET,
   session: {
     // Force use JWT if server service is disabled
-    strategy: NEXT_PUBLIC_ENABLED_SERVER_SERVICE ? NEXT_AUTH_SSO_SESSION_STRATEGY : 'jwt',
+    strategy: NEXT_AUTH_SSO_SESSION_STRATEGY,
   },
   trustHost: process.env?.AUTH_TRUST_HOST ? process.env.AUTH_TRUST_HOST === 'true' : true,
 } satisfies NextAuthConfig;

package/src/libs/next-auth/sso-providers/auth0.ts

@@ -1,7 +1,5 @@
 import Auth0 from 'next-auth/providers/auth0';
 
-import { authEnv } from '@/envs/auth';
-
 import { CommonProviderConfig } from './sso.config';
 
 const provider = {
@@ -11,11 +9,6 @@ const provider = {
     // Specify auth scope, at least include 'openid email'
     // all scopes in Auth0 ref: https://auth0.com/docs/get-started/apis/scopes/openid-connect-scopes#standard-claims
     authorization: { params: { scope: 'openid email profile' } },
-    // TODO(NextAuth ENVs Migration): Remove once nextauth envs migration time end
-    clientId: authEnv.AUTH0_CLIENT_ID ?? process.env.AUTH_AUTH0_ID,
-    clientSecret: authEnv.AUTH0_CLIENT_SECRET ?? process.env.AUTH_AUTH0_SECRET,
-    issuer: authEnv.AUTH0_ISSUER ?? process.env.AUTH_AUTH0_ISSUER,
-    // Remove End
     profile(profile) {
       return {
         email: profile.email,

package/src/libs/next-auth/sso-providers/authelia.ts

@@ -1,7 +1,5 @@
 import type { OIDCConfig } from '@auth/core/providers';
 
-import { authEnv } from '@/envs/auth';
-
 import { CommonProviderConfig } from './sso.config';
 
 export type AutheliaProfile = {
@@ -21,10 +19,10 @@ const provider = {
     ...CommonProviderConfig,
     authorization: { params: { scope: 'openid email profile' } },
     checks: ['state', 'pkce'],
-    clientId: authEnv.AUTHELIA_CLIENT_ID ?? process.env.AUTH_AUTHELIA_ID,
-    clientSecret: authEnv.AUTHELIA_CLIENT_SECRET ?? process.env.AUTH_AUTHELIA_SECRET,
+    clientId: process.env.AUTH_AUTHELIA_ID,
+    clientSecret: process.env.AUTH_AUTHELIA_SECRET,
     id: 'authelia',
-    issuer: authEnv.AUTHELIA_ISSUER ?? process.env.AUTH_AUTHELIA_ISSUER,
+    issuer: process.env.AUTH_AUTHELIA_ISSUER,
     name: 'Authelia',
     profile(profile) {
       return {

package/src/libs/next-auth/sso-providers/authentik.ts

@@ -1,7 +1,5 @@
 import Authentik from 'next-auth/providers/authentik';
 
-import { authEnv } from '@/envs/auth';
-
 import { CommonProviderConfig } from './sso.config';
 
 const provider = {
@@ -11,11 +9,6 @@ const provider = {
     // Specify auth scope, at least include 'openid email'
     // all scopes in Authentik ref: https://goauthentik.io/docs/providers/oauth2
     authorization: { params: { scope: 'openid email profile' } },
-    // TODO(NextAuth ENVs Migration): Remove once nextauth envs migration time end
-    clientId: authEnv.AUTHENTIK_CLIENT_ID ?? process.env.AUTH_AUTHENTIK_ID,
-    clientSecret: authEnv.AUTHENTIK_CLIENT_SECRET ?? process.env.AUTH_AUTHENTIK_SECRET,
-    issuer: authEnv.AUTHENTIK_ISSUER ?? process.env.AUTH_AUTHENTIK_ISSUER,
-    // Remove end
     // TODO(NextAuth): map unique user id to `providerAccountId` field
     //  profile(profile) {
     //   return {

package/src/libs/next-auth/sso-providers/cloudflare-zero-trust.ts

@@ -1,7 +1,5 @@
 import type { OIDCConfig } from '@auth/core/providers';
 
-import { authEnv } from '@/envs/auth';
-
 import { CommonProviderConfig } from './sso.config';
 
 export type CloudflareZeroTrustProfile = {
@@ -16,11 +14,10 @@ const provider = {
     ...CommonProviderConfig,
     authorization: { params: { scope: 'openid email profile' } },
     checks: ['state', 'pkce'],
-    clientId: authEnv.CLOUDFLARE_ZERO_TRUST_CLIENT_ID ?? process.env.AUTH_CLOUDFLARE_ZERO_TRUST_ID,
-    clientSecret:
-      authEnv.CLOUDFLARE_ZERO_TRUST_CLIENT_SECRET ?? process.env.AUTH_CLOUDFLARE_ZERO_TRUST_SECRET,
+    clientId: process.env.AUTH_CLOUDFLARE_ZERO_TRUST_ID,
+    clientSecret: process.env.AUTH_CLOUDFLARE_ZERO_TRUST_SECRET,
     id: 'cloudflare-zero-trust',
-    issuer: authEnv.CLOUDFLARE_ZERO_TRUST_ISSUER ?? process.env.AUTH_CLOUDFLARE_ZERO_TRUST_ISSUER,
+    issuer: process.env.AUTH_CLOUDFLARE_ZERO_TRUST_ISSUER,
     name: 'Cloudflare Zero Trust',
     profile(profile) {
       return {

package/src/libs/next-auth/sso-providers/cognito.ts

@@ -2,11 +2,7 @@ import Cognito from 'next-auth/providers/cognito';
 
 const provider = {
   id: 'cognito',
-  provider: Cognito({
-    clientId: process.env.AUTH_COGNITO_ID,
-    clientSecret: process.env.AUTH_COGNITO_SECRET,
-    issuer: process.env.AUTH_COGNITO_ISSUER,
-  }),
+  provider: Cognito({}),
 };
 
 export default provider;

package/src/libs/next-auth/sso-providers/generic-oidc.ts

@@ -1,7 +1,5 @@
 import type { OIDCConfig } from '@auth/core/providers';
 
-import { authEnv } from '@/envs/auth';
-
 import { CommonProviderConfig } from './sso.config';
 
 export type GenericOIDCProfile = {
@@ -19,10 +17,10 @@ const provider = {
     ...CommonProviderConfig,
     authorization: { params: { scope: 'email openid profile' } },
     checks: ['state', 'pkce'],
-    clientId: authEnv.GENERIC_OIDC_CLIENT_ID ?? process.env.AUTH_GENERIC_OIDC_ID,
-    clientSecret: authEnv.GENERIC_OIDC_CLIENT_SECRET ?? process.env.AUTH_GENERIC_OIDC_SECRET,
+    clientId: process.env.AUTH_GENERIC_OIDC_ID,
+    clientSecret: process.env.AUTH_GENERIC_OIDC_SECRET,
     id: 'generic-oidc',
-    issuer: authEnv.GENERIC_OIDC_ISSUER ?? process.env.AUTH_GENERIC_OIDC_ISSUER,
+    issuer: process.env.AUTH_GENERIC_OIDC_ISSUER,
     name: 'Generic OIDC',
     profile(profile) {
       return {

package/src/libs/next-auth/sso-providers/github.ts

@@ -1,7 +1,5 @@
 import GitHub from 'next-auth/providers/github';
 
-import { authEnv } from '@/envs/auth';
-
 import { CommonProviderConfig } from './sso.config';
 
 const provider = {
@@ -10,10 +8,6 @@ const provider = {
     ...CommonProviderConfig,
     // Specify auth scope, at least include 'openid email'
     authorization: { params: { scope: 'read:user user:email' } },
-    // TODO(NextAuth ENVs Migration): Remove once nextauth envs migration time end
-    clientId: authEnv.GITHUB_CLIENT_ID ?? process.env.AUTH_GITHUB_ID,
-    clientSecret: authEnv.GITHUB_CLIENT_SECRET ?? process.env.AUTH_GITHUB_SECRET,
-    // Remove end
     profile: (profile) => {
       return {
         email: profile.email,

package/src/libs/next-auth/sso-providers/google.ts

@@ -12,8 +12,6 @@ const provider = {
           'openid https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email openid',
       },
     },
-    clientId: process.env.AUTH_GOOGLE_CLIENT_ID,
-    clientSecret: process.env.AUTH_GOOGLE_CLIENT_SECRET,
   }),
 };
 

package/src/libs/next-auth/sso-providers/index.ts

@@ -1,7 +1,6 @@
 import Auth0 from './auth0';
 import Authelia from './authelia';
 import Authentik from './authentik';
-import AzureAD from './azure-ad';
 import Casdoor from './casdoor';
 import CloudflareZeroTrust from './cloudflare-zero-trust';
 import Cognito from './cognito';
@@ -19,7 +18,6 @@ import Zitadel from './zitadel';
 export const ssoProviders = [
   Auth0,
   Authentik,
-  AzureAD,
   GenericOIDC,
   Github,
   Zitadel,

package/src/libs/next-auth/sso-providers/keycloak.ts

@@ -8,9 +8,6 @@ const provider = {
     ...CommonProviderConfig,
     // Specify auth scope, at least include 'openid email'
     authorization: { params: { scope: 'openid email profile' } },
-    clientId: process.env.AUTH_KEYCLOAK_ID,
-    clientSecret: process.env.AUTH_KEYCLOAK_SECRET,
-    issuer: process.env.AUTH_KEYCLOAK_ISSUER,
     profile(profile) {
       return {
         email: profile.email,

package/src/libs/next-auth/sso-providers/logto.ts

@@ -1,7 +1,5 @@
 import { OIDCConfig, OIDCUserConfig } from '@auth/core/providers';
 
-import { authEnv } from '@/envs/auth';
-
 import { CommonProviderConfig } from './sso.config';
 
 interface LogtoProfile extends Record<string, any> {
@@ -41,9 +39,9 @@ const provider = {
     },
     // You can get the issuer value from the Logto Application Details page,
     // in the field "Issuer endpoint"
-    clientId: authEnv.LOGTO_CLIENT_ID ?? process.env.AUTH_LOGTO_ID,
-    clientSecret: authEnv.LOGTO_CLIENT_SECRET ?? process.env.AUTH_LOGTO_SECRET,
-    issuer: authEnv.LOGTO_ISSUER ?? process.env.AUTH_LOGTO_ISSUER,
+    clientId: process.env.AUTH_LOGTO_ID,
+    clientSecret: process.env.AUTH_LOGTO_SECRET,
+    issuer: process.env.AUTH_LOGTO_ISSUER,
   }),
 };
 

package/src/libs/next-auth/sso-providers/okta.ts

@@ -7,10 +7,6 @@ const provider = {
   provider: Okta({
     ...CommonProviderConfig,
     authorization: { params: { scope: 'openid email profile' } },
-    clientId: process.env.AUTH_OKTA_ID,
-    clientSecret: process.env.AUTH_OKTA_SECRET,
-    issuer: process.env.AUTH_OKTA_ISSUER,
-    // Remove End
     profile(profile) {
       return {
         email: profile.email,

package/src/libs/next-auth/sso-providers/zitadel.ts

@@ -1,17 +1,10 @@
 import Zitadel from 'next-auth/providers/zitadel';
 
-import { authEnv } from '@/envs/auth';
-
 const provider = {
   id: 'zitadel',
   provider: Zitadel({
     // Available scopes in ZITADEL: https://zitadel.com/docs/apis/openidoauth/scopes
     authorization: { params: { scope: 'openid email profile' } },
-    // TODO(NextAuth ENVs Migration): Remove once nextauth envs migration time end
-    clientId: authEnv.ZITADEL_CLIENT_ID ?? process.env.AUTH_ZITADEL_ID,
-    clientSecret: authEnv.ZITADEL_CLIENT_SECRET ?? process.env.AUTH_ZITADEL_SECRET,
-    issuer: authEnv.ZITADEL_ISSUER ?? process.env.AUTH_ZITADEL_ISSUER,
-    // Remove end
     // TODO(NextAuth): map unique user id to `providerAccountId` field
     // profile(profile) {
     //   return {

package/src/libs/oidc-provider/provider.ts

@@ -340,7 +340,7 @@ export const createOIDCProvider = async (db: LobeChatDatabase): Promise<Provider
 
     // 8. 令牌有效期
     ttl: {
-      AccessToken: 25 * 3600, // 25 hour
+      AccessToken: 7 * 24 * 3600, // 7 days
       AuthorizationCode: 600, // 10 minutes
       DeviceCode: 600, // 10 minutes (if enabled)
 

package/src/libs/trpc/client/index.ts

@@ -1,5 +1,4 @@
 export { asyncClient } from './async';
 export * from './desktop';
-export { edgeClient } from './edge';
 export * from './lambda';
 export * from './tools';

package/src/libs/trpc/client/lambda.ts

@@ -22,10 +22,12 @@ const errorHandlingLink: TRPCLink<LambdaRouter> = () => {
         complete: () => observer.complete(),
         error: async (err) => {
           // Check if this is an abort error and should be ignored
-          const isAbortError = err.message.includes('aborted') || err.name === 'AbortError' || 
-                              err.cause?.name === 'AbortError' || 
-                              err.message.includes('signal is aborted without reason');
-          
+          const isAbortError =
+            err.message.includes('aborted') ||
+            err.name === 'AbortError' ||
+            err.cause?.name === 'AbortError' ||
+            err.message.includes('signal is aborted without reason');
+
           const showError = (op.context?.showNotification as boolean) ?? true;
           const status = err.data?.httpStatus as number;
 
@@ -50,7 +52,8 @@ const errorHandlingLink: TRPCLink<LambdaRouter> = () => {
               }
 
               default: {
-                fetchErrorNotification.error({ errorMessage: err.message, status });
+                if (fetchErrorNotification)
+                  fetchErrorNotification.error({ errorMessage: err.message, status });
               }
             }
           }

package/src/libs/trpc/lambda/context.ts

@@ -80,7 +80,10 @@ export const createLambdaContext = async (request: NextRequest): Promise<LambdaC
   const isMockUser = process.env.ENABLE_MOCK_DEV_USER === '1';
 
   if (process.env.NODE_ENV === 'development' && (isDebugApi || isMockUser)) {
-    return { userId: process.env.MOCK_DEV_USER_ID };
+    return {
+      authorizationHeader: request.headers.get(LOBE_CHAT_AUTH_HEADER),
+      userId: process.env.MOCK_DEV_USER_ID,
+    };
   }
 
   log('createLambdaContext called for request');

package/src/locales/default/oauth.ts

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

package/src/server/globalConfig/index.ts

@@ -1,4 +1,3 @@
-import { enableNextAuth } from '@/const/auth';
 import { isDesktop } from '@/const/version';
 import { appEnv, getAppConfig } from '@/envs/app';
 import { authEnv } from '@/envs/auth';
@@ -10,7 +9,6 @@ import { parseSystemAgent } from '@/server/globalConfig/parseSystemAgent';
 import { GlobalServerConfig } from '@/types/serverConfig';
 import { cleanObject } from '@/utils/object';
 
-import { genServerLLMConfig } from './_deprecated';
 import { genServerAiProvidersConfig } from './genServerAiProviderConfig';
 import { parseAgentConfig } from './parseDefaultAgent';
 import { parseFilesConfig } from './parseFilesConfig';
@@ -62,30 +60,9 @@ export const getServerGlobalConfig = async () => {
     enableUploadFileToServer: !!fileEnv.S3_SECRET_ACCESS_KEY,
     enabledAccessCode: ACCESS_CODES?.length > 0,
 
-    enabledOAuthSSO: enableNextAuth,
     image: cleanObject({
       defaultImageNum: imageEnv.AI_IMAGE_DEFAULT_IMAGE_NUM,
     }),
-    /**
-     * @deprecated
-     */
-    languageModel: genServerLLMConfig({
-      azure: {
-        enabledKey: 'ENABLED_AZURE_OPENAI',
-        withDeploymentName: true,
-      },
-      bedrock: {
-        enabledKey: 'ENABLED_AWS_BEDROCK',
-        modelListKey: 'AWS_BEDROCK_MODEL_LIST',
-      },
-      giteeai: {
-        enabledKey: 'ENABLED_GITEE_AI',
-        modelListKey: 'GITEE_AI_MODEL_LIST',
-      },
-      ollama: {
-        fetchOnClient: !process.env.OLLAMA_PROXY_URL,
-      },
-    }),
     oAuthSSOProviders: authEnv.NEXT_AUTH_SSO_PROVIDERS.trim().split(/[,，]/),
     systemAgent: parseSystemAgent(appEnv.SYSTEM_AGENT),
     telemetry: {

package/src/server/modules/AssistantStore/index.ts

@@ -93,7 +93,7 @@ export class AssistantStore {
       },
     });
     if (!res.ok) {
-      res = await fetch(this.getAgentUrl(DEFAULT_LANG), {
+      res = await fetch(this.getAgentUrl(identifier, DEFAULT_LANG), {
         cache: 'force-cache',
         next: {
           revalidate: CacheRevalidate.Details,

package/src/server/modules/ModelRuntime/trace.ts

@@ -42,6 +42,16 @@ export const createTraceOptions = (
     startTime: new Date(),
   });
 
+  const headers = new Headers();
+
+  if (trace?.id) {
+    headers.set(LOBE_CHAT_TRACE_ID, trace.id);
+  }
+
+  if (generation?.id) {
+    headers.set(LOBE_CHAT_OBSERVATION_ID, generation.id);
+  }
+
   return {
     callback: {
       onCompletion: async ({ text, thinking, usage, grounding, toolsCalling }) => {
@@ -94,9 +104,6 @@ export const createTraceOptions = (
         });
       },
     } as ChatStreamCallbacks,
-    headers: {
-      [LOBE_CHAT_OBSERVATION_ID]: generation?.id,
-      [LOBE_CHAT_TRACE_ID]: trace?.id,
-    },
+    headers: headers,
   };
 };

package/src/server/routers/desktop/mcp.ts

@@ -2,8 +2,6 @@ import { GetStreamableMcpServerManifestInputSchema } from '@lobechat/types';
 import debug from 'debug';
 import { z } from 'zod';
 
-import { isServerMode } from '@/const/version';
-import { passwordProcedure } from '@/libs/trpc/edge';
 import { authedProcedure, router } from '@/libs/trpc/lambda';
 import { mcpService } from '@/server/services/mcp';
 
@@ -24,7 +22,7 @@ const stdioParamsSchema = z.object({
   type: z.literal('stdio').default('stdio'),
 });
 
-const mcpProcedure = isServerMode ? authedProcedure : passwordProcedure;
+const mcpProcedure = authedProcedure;
 
 export const mcpRouter = router({
   getStdioMcpServerManifest: mcpProcedure.input(stdioParamsSchema).query(async ({ input }) => {

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));