@lobehub/lobehub 2.0.0-next.3 → 2.0.0-next.30

package/src/features/PluginsUI/Render/BuiltinType/index.test.tsx

@@ -1,22 +1,19 @@
 import { render, screen } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
 
-import { DalleManifest } from '@/tools/dalle';
-import { BuiltinToolsRenders } from '@/tools/renders';
-
 import BuiltinType from './index';
 
-// Mock Render component and useParseContent hook
+// Mock renders module
 vi.mock('@/tools/renders', () => ({
   BuiltinToolsRenders: {
-    dalle3: vi.fn(() => <div>Test Renderer</div>),
-    [DalleManifest.identifier]: vi.fn(() => <div>{DalleManifest.identifier}</div>),
+    'lobe-web-browsing': vi.fn(({ content }) => <div>WebBrowsingRender: {content}</div>),
+    'lobe-code-interpreter': vi.fn(({ content }) => <div>CodeInterpreterRender: {content}</div>),
   },
 }));
 
-// Mock Loading component
-vi.mock('../Loading', () => ({
-  default: vi.fn(() => <div>Loading...</div>),
+// Mock useParseContent hook
+vi.mock('../useParseContent', () => ({
+  useParseContent: vi.fn((content) => ({ data: content })),
 }));
 
 describe('BuiltinType', () => {
@@ -25,29 +22,41 @@ describe('BuiltinType', () => {
     expect(container).toBeEmptyDOMElement();
   });
 
-  it('should not render anything if content is not JSON and no identifier', () => {
-    const { container } = render(<BuiltinType content="..." id="123" />);
-    expect(container).toBeEmptyDOMElement();
-  });
-
   it('should not render anything if identifier is unknown', () => {
     const { container } = render(<BuiltinType content="{}" id="123" identifier="unknown" />);
     expect(container).toBeEmptyDOMElement();
   });
 
-  describe('DALL·E', () => {
-    it('should render the correct renderer if identifier is dalle3', () => {
-      render(<BuiltinType content='{"some":"data"}' id="123" identifier="dalle3" />);
-      expect(BuiltinToolsRenders.dalle3).toHaveBeenCalled();
-      expect(screen.getByText('Test Renderer')).toBeInTheDocument();
-    });
-
-    it('should render the correct renderer if is DALL·E ', () => {
-      render(
-        <BuiltinType content='{"some":"data"}' id="123" identifier={DalleManifest.identifier} />,
-      );
-      expect(BuiltinToolsRenders.dalle3).toHaveBeenCalled();
-      expect(screen.getByText(DalleManifest.identifier)).toBeInTheDocument();
-    });
+  it('should render the correct renderer for web browsing', () => {
+    const content = '{"query":"test"}';
+    render(<BuiltinType content={content} id="123" identifier="lobe-web-browsing" />);
+    expect(screen.getByText(`WebBrowsingRender: ${content}`)).toBeInTheDocument();
+  });
+
+  it('should render the correct renderer for code interpreter', () => {
+    const content = '{"code":"print(1)"}';
+    render(<BuiltinType content={content} id="123" identifier="lobe-code-interpreter" />);
+    expect(screen.getByText(`CodeInterpreterRender: ${content}`)).toBeInTheDocument();
+  });
+
+  it('should pass correct props to renderer', () => {
+    const content = '{"test":"data"}';
+    const args = '{"arg":"value"}';
+    const pluginState = { state: 'value' };
+    const pluginError = { error: 'test' };
+
+    render(
+      <BuiltinType
+        content={content}
+        id="msg-123"
+        identifier="lobe-web-browsing"
+        arguments={args}
+        pluginState={pluginState}
+        pluginError={pluginError}
+        apiName="testApi"
+      />,
+    );
+
+    expect(screen.getByText(`WebBrowsingRender: ${content}`)).toBeInTheDocument();
   });
 });

package/src/features/Portal/Artifacts/Body/index.tsx

@@ -3,7 +3,7 @@ import { memo, useEffect, useMemo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
-import { chatPortalSelectors, chatSelectors } from '@/store/chat/selectors';
+import { chatPortalSelectors, messageStateSelectors } from '@/store/chat/selectors';
 import { ArtifactDisplayMode } from '@/store/chat/slices/portal/initialState';
 import { ArtifactType } from '@/types/artifact';
 
@@ -24,7 +24,7 @@ const ArtifactsUI = memo(() => {
     return [
       messageId,
       s.portalArtifactDisplayMode,
-      chatSelectors.isMessageGenerating(messageId)(s),
+      messageStateSelectors.isMessageGenerating(messageId)(s),
       chatPortalSelectors.artifactType(s),
       chatPortalSelectors.artifactCode(messageId)(s),
       chatPortalSelectors.artifactCodeLanguage(s),

package/src/helpers/isCanUseFC.ts

@@ -1,13 +1,5 @@
-import { isDeprecatedEdition } from '@/const/version';
 import { aiModelSelectors, getAiInfraStoreState } from '@/store/aiInfra';
-import { getUserStoreState } from '@/store/user';
-import { modelProviderSelectors } from '@/store/user/selectors';
 
 export const isCanUseFC = (model: string, provider: string): boolean => {
-  // TODO: remove isDeprecatedEdition condition in V2.0
-  if (isDeprecatedEdition) {
-    return modelProviderSelectors.isModelEnabledFunctionCall(model)(getUserStoreState());
-  }
-
   return aiModelSelectors.isModelSupportToolUse(model, provider)(getAiInfraStoreState()) || false;
 };

package/src/hooks/useEnabledChatModels.ts

@@ -1,18 +1,10 @@
 import isEqual from 'fast-deep-equal';
 
-import { isDeprecatedEdition } from '@/const/version';
 import { useAiInfraStore } from '@/store/aiInfra';
-import { useUserStore } from '@/store/user';
-import { modelProviderSelectors } from '@/store/user/selectors';
 import { EnabledProviderWithModels } from '@/types/aiProvider';
 
 export const useEnabledChatModels = (): EnabledProviderWithModels[] => {
-  const enabledList = useUserStore(modelProviderSelectors.modelProviderListForModelSelect, isEqual);
   const enabledChatModelList = useAiInfraStore((s) => s.enabledChatModelList, isEqual);
 
-  if (isDeprecatedEdition) {
-    return enabledList;
-  }
-
   return enabledChatModelList || [];
 };

package/src/hooks/useInterceptingRoutes.test.ts

@@ -10,21 +10,27 @@ import { useSessionStore } from '@/store/session';
 import { useOpenChatSettings } from './useInterceptingRoutes';
 
 // Mocks
+const mockPush = vi.fn((href) => href);
 vi.mock('next/navigation', () => ({
   useRouter: vi.fn(() => ({
-    push: vi.fn((href) => href),
+    push: mockPush,
     replace: vi.fn((href) => href),
   })),
 }));
 vi.mock('nextjs-toploader/app', () => ({
   useRouter: vi.fn(() => ({
-    push: vi.fn((href) => href),
+    push: mockPush,
     replace: vi.fn((href) => href),
   })),
 }));
 vi.mock('@/hooks/useQuery', () => ({
   useQuery: vi.fn(() => ({})),
 }));
+vi.mock('@/hooks/useQueryRoute', () => ({
+  useQueryRoute: vi.fn(() => ({
+    push: mockPush,
+  })),
+}));
 vi.mock('@/hooks/useIsMobile', () => ({
   useIsMobile: vi.fn(),
 }));
@@ -36,20 +42,32 @@ vi.mock('@/store/global', () => ({
     setState: vi.fn(),
   },
 }));
+let isDeprecatedEdition = false;
+vi.mock('@/const/version', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/const/version')>();
+  return {
+    ...actual,
+    get isDeprecatedEdition() {
+      return isDeprecatedEdition;
+    },
+  };
+});
 
 describe('useOpenChatSettings', () => {
   it('should handle inbox session id correctly', () => {
+    isDeprecatedEdition = true;
     vi.mocked(useSessionStore).mockReturnValue(INBOX_SESSION_ID);
     const { result } = renderHook(() => useOpenChatSettings());
 
     expect(result.current()).toBe('/settings?active=agent'); // Assuming openSettings returns a function
+    isDeprecatedEdition = false;
   });
 
   it('should handle mobile route for chat settings', () => {
     vi.mocked(useSessionStore).mockReturnValue('123');
     vi.mocked(useIsMobile).mockReturnValue(true);
     const { result } = renderHook(() => useOpenChatSettings(ChatSettingsTabs.Meta));
-    expect(result.current()).toBe('/chat/settings?session=123');
+    expect(result.current()).toBe('/chat/settings');
   });
 
   it('should handle desktop route for chat settings with session and tab', () => {

package/src/hooks/useModelContextWindowTokens.ts

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

package/src/hooks/useModelHasContextWindowToken.ts

@@ -1,19 +1,10 @@
-import { isDeprecatedEdition } from '@/const/version';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/slices/chat';
 import { aiModelSelectors, useAiInfraStore } from '@/store/aiInfra';
-import { useUserStore } from '@/store/user';
-import { modelProviderSelectors } from '@/store/user/selectors';
 
 export const useModelHasContextWindowToken = () => {
   const model = useAgentStore(agentSelectors.currentAgentModel);
   const provider = useAgentStore(agentSelectors.currentAgentModelProvider);
-  const newValue = useAiInfraStore(aiModelSelectors.isModelHasContextWindowToken(model, provider));
 
-  // TODO: remove this in V2.0
-  const oldValue = useUserStore(modelProviderSelectors.isModelHasMaxToken(model));
-  if (isDeprecatedEdition) return oldValue;
-  //
-
-  return newValue;
+  return useAiInfraStore(aiModelSelectors.isModelHasContextWindowToken(model, provider));
 };

package/src/hooks/useModelSupportFiles.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 useModelSupportFiles = (model: string, provider: string) => {
-  const newValue = useAiInfraStore(aiModelSelectors.isModelSupportFiles(model, provider));
-
-  // TODO: remove this in V2.0
-  const oldValue = useUserStore(modelProviderSelectors.isModelEnabledFiles(model));
-  if (isDeprecatedEdition) return oldValue;
-  //
-
-  return newValue;
+  return useAiInfraStore(aiModelSelectors.isModelSupportFiles(model, provider));
 };

package/src/hooks/useModelSupportReasoning.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 useModelSupportReasoning = (model: string, provider: string) => {
-  const newValue = useAiInfraStore(aiModelSelectors.isModelSupportReasoning(model, provider));
-
-  // TODO: remove this in V2.0
-  const oldValue = useUserStore(modelProviderSelectors.isModelEnabledReasoning(model));
-  if (isDeprecatedEdition) return oldValue;
-  //
-
-  return newValue;
+  return useAiInfraStore(aiModelSelectors.isModelSupportReasoning(model, provider));
 };

package/src/hooks/useModelSupportToolUse.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 useModelSupportToolUse = (model: string, provider: string) => {
-  const newValue = useAiInfraStore(aiModelSelectors.isModelSupportToolUse(model, provider));
-
-  // TODO: remove this in V2.0
-  const oldValue = useUserStore(modelProviderSelectors.isModelEnabledFunctionCall(model));
-  if (isDeprecatedEdition) return oldValue;
-  //
-
-  return newValue;
+  return useAiInfraStore(aiModelSelectors.isModelSupportToolUse(model, provider));
 };

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