@lobehub/lobehub 2.0.0-next.4 → 2.0.0-next.40

package/src/features/PluginsUI/Render/StandaloneType/Iframe.tsx

@@ -94,9 +94,9 @@ const IFrameRender = memo<IFrameRenderProps>(({ url, id, payload, width = 600, h
   });
 
   // when plugin update state, we should update it to the message pluginState key
-  const updatePluginState = useChatStore((s) => s.updatePluginState);
+  const optimisticUpdatePluginState = useChatStore((s) => s.optimisticUpdatePluginState);
   useOnPluginStateUpdate((key, value) => {
-    updatePluginState(id, { [key]: value });
+    optimisticUpdatePluginState(id, { [key]: value });
   });
 
   // when plugin wants to get plugin settings, send it to plugin

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

@@ -4,6 +4,7 @@ import { memo } from 'react';
 
 import BuiltinType from './BuiltinType';
 import DefaultType from './DefaultType';
+import MCP from './MCPType';
 import Markdown from './MarkdownType';
 import Standalone from './StandaloneType';
 
@@ -51,6 +52,22 @@ const PluginRender = memo<PluginRenderProps>(
         );
       }
 
+      // @ts-expect-error need to update types
+      case 'mcp': {
+        return (
+          <MCP
+            apiName={payload?.apiName}
+            arguments={argumentsStr}
+            content={content}
+            id={id}
+            identifier={identifier}
+            loading={loading}
+            pluginError={pluginError}
+            pluginState={pluginState}
+          />
+        );
+      }
+
       case 'markdown': {
         return <Markdown content={content} loading={loading} />;
       }

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/features/Portal/GroupThread/Body/index.tsx

@@ -3,7 +3,7 @@
 import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-import ChatInput from '@/app/[variants]/(main)/chat/(workspace)/@conversation/features/ChatInput';
+import ChatInput from '@/app/[variants]/(main)/chat/components/conversation/features/ChatInput';
 import { useChatGroupStore } from '@/store/chatGroup';
 
 import ThreadChatList from './ThreadChatList';

package/src/features/Portal/Thread/Chat/ChatInput/useSend.ts

@@ -17,7 +17,7 @@ export const useSendThreadMessage = () => {
   const canNotSend = useChatStore(threadSelectors.isSendButtonDisabledByMessage);
   const generating = useChatStore((s) => threadSelectors.isThreadAIGenerating(s));
   const stop = useChatStore((s) => s.stopGenerateMessage);
-  const [sendMessage, updateInputMessage] = useChatStore((s) => [
+  const [sendMessage, updateMessageInput] = useChatStore((s) => [
     s.sendThreadMessage,
     s.updateThreadInputMessage,
   ]);
@@ -54,11 +54,11 @@ export const useSendThreadMessage = () => {
 
     if (!shouldContinue) return;
 
-    updateInputMessage(inputMessage);
+    updateMessageInput(inputMessage);
 
     sendMessage({ message: inputMessage, ...params });
 
-    updateInputMessage('');
+    updateMessageInput('');
     threadInputEditor.clearContent();
     threadInputEditor.focus();
   };

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/useHotkeys/chatScope.ts

@@ -2,12 +2,12 @@ import isEqual from 'fast-deep-equal';
 import { useEffect } from 'react';
 import { useHotkeysContext } from 'react-hotkeys-hook';
 
-import { useSend } from '@/app/[variants]/(main)/chat/(workspace)/@conversation/features/ChatInput/useSend';
+import { useSend } from '@/app/[variants]/(main)/chat/components/conversation/features/ChatInput/useSend';
 import { useClearCurrentMessages } from '@/features/ChatInput/ActionBar/Clear';
 import { useOpenChatSettings } from '@/hooks/useInterceptingRoutes';
 import { useActionSWR } from '@/libs/swr';
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
+import { displayMessageSelectors } from '@/store/chat/selectors';
 import { useGlobalStore } from '@/store/global';
 import { systemStatusSelectors } from '@/store/global/selectors';
 import { HotkeyEnum, HotkeyScopeEnum } from '@/types/hotkey';
@@ -32,14 +32,22 @@ export const useOpenChatSettingsHotkey = () => {
 };
 
 export const useRegenerateMessageHotkey = () => {
-  const regenerateMessage = useChatStore((s) => s.regenerateMessage);
-  const lastMessage = useChatStore(chatSelectors.latestMessage, isEqual);
+  const [regenerateUserMessage, regenerateAssistantMessage] = useChatStore((s) => [
+    s.regenerateUserMessage,
+    s.regenerateAssistantMessage,
+  ]);
+  const lastMessage = useChatStore((s) => displayMessageSelectors.mainAIChats(s).at(-1), isEqual);
 
-  const disable = !lastMessage || lastMessage.id === 'default' || lastMessage.role === 'system';
+  const disable = !lastMessage;
 
   return useHotkeyById(
     HotkeyEnum.RegenerateMessage,
-    () => !disable && regenerateMessage(lastMessage.id),
+    () => {
+      if (!lastMessage) return;
+      if (lastMessage.role === 'user') return regenerateUserMessage(lastMessage.id);
+
+      return regenerateAssistantMessage(lastMessage.id);
+    },
     {
       enableOnContentEditable: true,
       enabled: !disable,
@@ -49,7 +57,7 @@ export const useRegenerateMessageHotkey = () => {
 
 export const useDeleteAndRegenerateMessageHotkey = () => {
   const delAndRegenerateMessage = useChatStore((s) => s.delAndRegenerateMessage);
-  const lastMessage = useChatStore(chatSelectors.latestMessage, isEqual);
+  const lastMessage = useChatStore((s) => displayMessageSelectors.mainAIChats(s).at(-1), isEqual);
 
   const disable = !lastMessage || lastMessage.id === 'default' || lastMessage.role === 'system';
 
@@ -65,7 +73,7 @@ export const useDeleteAndRegenerateMessageHotkey = () => {
 
 export const useDeleteLastMessageHotkey = () => {
   const deleteMessage = useChatStore((s) => s.deleteMessage);
-  const lastMessage = useChatStore(chatSelectors.latestMessage, isEqual);
+  const lastMessage = useChatStore((s) => displayMessageSelectors.mainAIChats(s).at(-1), isEqual);
 
   const disable = !lastMessage || lastMessage.id === 'default' || lastMessage.role === 'system';
 

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/mcp/client.ts

@@ -15,6 +15,7 @@ import {
   McpPrompt,
   McpResource,
   McpTool,
+  ToolCallResult,
   createMCPError,
 } from './types';
 
@@ -374,12 +375,12 @@ export class MCPClient {
     return manifest;
   }
 
-  async callTool(toolName: string, args: any) {
+  async callTool(toolName: string, args: any): Promise<ToolCallResult> {
     log('Calling tool: %s with args: %O, timeout: %O', toolName, args, MCP_TOOL_TIMEOUT);
     const result = await this.mcp.callTool({ arguments: args, name: toolName }, undefined, {
       timeout: MCP_TOOL_TIMEOUT,
     });
     log('Tool call result: %O', result);
-    return result;
+    return result as ToolCallResult;
   }
 }

package/src/libs/mcp/types.ts

@@ -30,6 +30,77 @@ export interface McpPrompt {
   name: string;
 }
 
+/**
+ * MCP Tool Call Result Types
+ */
+export interface TextContent {
+  _meta?: any;
+  text: string;
+  type: 'text';
+}
+
+export interface ImageContent {
+  _meta?: any;
+  data: string;
+  // base64
+  mimeType: string;
+  type: 'image';
+}
+
+export interface AudioContent {
+  _meta?: any;
+  data: string;
+  // base64
+  mimeType: string;
+  type: 'audio';
+}
+
+export interface ResourceContent {
+  _meta?: any;
+  resource: {
+    _meta?: any;
+    blob?: string;
+    mimeType?: string;
+    text?: string;
+    uri: string;
+  };
+  type: 'resource';
+}
+
+export interface ResourceLinkContent {
+  _meta?: any;
+  description?: string;
+  icons?: Array<{
+    mimeType?: string;
+    sizes?: string[];
+    src: string;
+  }>;
+  name: string;
+  title?: string;
+  type: 'resource_link';
+  uri: string;
+}
+
+export type ToolCallContent =
+  | TextContent
+  | ImageContent
+  | AudioContent
+  | ResourceContent
+  | ResourceLinkContent;
+
+export interface ToolCallResult {
+  content: ToolCallContent[];
+  isError?: boolean;
+  structuredContent?: any;
+}
+
+export interface MCPToolCallResult {
+  content: string;
+  error?: any;
+  state: ToolCallResult;
+  success: boolean;
+}
+
 /**
  * MCP 认证配置接口
  * 支持第一阶段的手动配置和未来的 OAuth 2.1 自动化流程

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;