@lobehub/chat 1.79.8 → 1.79.9

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

@@ -1,36 +1,114 @@
 'use client';
 
-import { Button, Card, Typography } from 'antd';
+import { Icon } from '@lobehub/ui';
+import { Button, Card, Divider, Typography } from 'antd';
 import { createStyles } from 'antd-style';
+import { Link2Icon, ServerIcon } from 'lucide-react';
+import Image from 'next/image';
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Center, Flexbox } from 'react-layout-kit';
 
-type ClientProps = {
+import { ProductLogo } from '@/components/Branding';
+
+interface ClientProps {
   clientId: string;
-  error?: {
-    message: string;
-    title: string;
+  clientMetadata: {
+    clientName?: string;
+    logo?: string;
   };
+
+  redirectUri?: string;
   scopes: string[];
   uid: string;
-};
+}
 
 const { Title, Text, Paragraph } = Typography;
 
 const useStyles = createStyles(({ css, token }) => ({
-  error: css`
-    text-align: center;
+  authButton: css`
+    width: 100%;
+    height: 40px;
+    border-radius: ${token.borderRadius}px;
+    font-weight: 500;
+  `,
+  cancelButton: css`
+    width: 100%;
+    height: 40px;
+    border-color: ${token.colorBorderSecondary};
+    border-radius: ${token.borderRadius}px;
+
+    font-weight: 500;
+    color: ${token.colorTextBase};
+
+    background-color: transparent;
+  `,
+  card: css`
+    width: 100%;
+    max-width: 500px;
+    border-color: ${token.colorBorderSecondary};
+    border-radius: 12px;
+
+    background-color: ${token.colorBgContainer};
+  `,
+  connector: css`
+    width: 40px;
+    height: 40px;
+  `,
+  connectorLine: css`
+    width: 32px;
+    height: 1px;
+    background-color: ${token.colorBorderSecondary};
+  `,
+  container: css`
+    width: 100%;
+    min-height: 100vh;
+    color: ${token.colorTextBase};
+    background-color: ${token.colorBgLayout};
+  `,
+  icon: css`
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    width: 64px;
+    height: 64px;
+    border: 1px solid ${token.colorBorderSecondary};
+    border-radius: 16px;
+
+    background-color: ${token.colorBgElevated};
+  `,
+  iconContainer: css`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  `,
+  lobeIcon: css`
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    width: 64px;
+    height: 64px;
+    border-radius: 50%;
+
+    background-color: ${token.colorBgElevated};
   `,
   scope: css`
     margin-block: 8px;
     padding: 12px;
-    border-radius: 4px;
-    background: ${token.colorFillTertiary};
+    border-radius: 6px;
+    background: ${token.colorFillQuaternary};
   `,
   scopes: css`
     width: 100%;
-    margin-block: 16px;
+  `,
+  title: css`
+    margin-block-end: ${token.marginLG}px;
+    color: ${token.colorTextBase};
+    text-align: center;
   `,
 }));
 
@@ -38,60 +116,109 @@ const useStyles = createStyles(({ css, token }) => ({
  * 获取 Scope 的描述
  */
 function getScopeDescription(scope: string, t: any): string {
-  return t(`consent.scope.${scope}`, scope);
+  return t(`consent.scope.${scope.replace(':', '-')}`, scope);
 }
 
-const ConsentClient = memo(({ uid, clientId, scopes, error }: ClientProps) => {
-  const { styles } = useStyles();
-  const { t } = useTranslation('oauth');
+const ConsentClient = memo<ClientProps>(
+  ({ uid, clientId, scopes, clientMetadata, redirectUri }) => {
+    const { styles, theme } = useStyles();
+    const { t } = useTranslation('oauth');
 
-  // 如果有错误，显示错误信息
-  if (error) {
+    const clientDisplayName = clientMetadata?.clientName || clientId;
     return (
-      <Center height="100vh">
-        <div className={styles.error}>
-          <Title level={2}>{error.title}</Title>
-          <Paragraph>{error.message}</Paragraph>
-        </div>
-      </Center>
-    );
-  }
-
-  return (
-    <Center height="100vh">
-      <Card style={{ maxWidth: 500, width: '100%' }}>
-        <Flexbox gap={24}>
-          <Title level={3} style={{ margin: 0 }}>
-            {t('consent.title')}
+      <Center className={styles.container} gap={16}>
+        <Flexbox gap={40}>
+          <Flexbox align={'center'} gap={12} horizontal justify={'center'}>
+            <div className={styles.icon}>
+              {clientMetadata?.logo ? (
+                <Image
+                  alt={clientDisplayName}
+                  height={56}
+                  src={clientMetadata?.logo}
+                  unoptimized
+                  width={56}
+                />
+              ) : (
+                <Icon icon={ServerIcon} />
+              )}
+            </div>
+            <div className={styles.connectorLine} />
+            <Center className={styles.connector}>
+              <Icon icon={Link2Icon} style={{ color: theme.colorTextSecondary, fontSize: 20 }} />
+            </Center>
+            <div className={styles.connectorLine} />
+            <div className={styles.lobeIcon}>
+              <ProductLogo height={48} style={{ objectFit: 'cover' }} width={48} />
+            </div>
+          </Flexbox>
+
+          <Title className={styles.title} level={3}>
+            {t('consent.title', { clientName: clientDisplayName })}
           </Title>
-          <Paragraph>{t('consent.description', { clientId })}</Paragraph>
+        </Flexbox>
+        <Card className={styles.card}>
+          <Flexbox gap={8}>
+            <Flexbox gap={12}>
+              <Paragraph>{t('consent.description', { clientName: clientDisplayName })}</Paragraph>
 
-          <div className={styles.scopes}>
-            <Paragraph>{t('consent.permissionsTitle')}</Paragraph>
-            {scopes.map((scope) => (
-              <div className={styles.scope} key={scope}>
-                <Text>{getScopeDescription(scope, t)}</Text>
+              <div className={styles.scopes}>
+                <Paragraph type={'secondary'}>{t('consent.permissionsTitle')}</Paragraph>
+                {scopes.map((scope) => (
+                  <div className={styles.scope} key={scope}>
+                    <Text>{getScopeDescription(scope, t)}</Text>
+                  </div>
+                ))}
               </div>
-            ))}
-          </div>
-
-          <form action="/oidc/consent" method="post">
-            <input name="uid" type="hidden" value={uid} />
-            <Flexbox gap={12} horizontal justify="flex-end">
-              <Button htmlType="submit" name="consent" value="deny">
-                {t('consent.buttons.deny')}
-              </Button>
-              <Button htmlType="submit" name="consent" type="primary" value="accept">
-                {t('consent.buttons.accept')}
-              </Button>
+
+              <Divider dashed />
+              <Flexbox gap={16}>
+                <form action="/oidc/consent" method="post" style={{ width: '100%' }}>
+                  <input name="uid" type="hidden" value={uid} />
+                  <Flexbox gap={12} horizontal>
+                    <Button
+                      className={styles.cancelButton}
+                      htmlType="submit"
+                      name="consent"
+                      value="deny"
+                    >
+                      {t('consent.buttons.deny')}
+                    </Button>
+                    <Button
+                      className={styles.authButton}
+                      htmlType="submit"
+                      name="consent"
+                      type="primary"
+                      value="accept"
+                    >
+                      {t('consent.buttons.accept')}
+                    </Button>
+                  </Flexbox>
+                </form>
+                <Center>
+                  <div style={{ color: theme.colorTextTertiary, fontSize: 12, height: '18px' }}>
+                    {t('consent.redirectUri')}
+                  </div>
+                  <div>
+                    <div
+                      style={{
+                        color: theme.colorTextSecondary,
+                        fontSize: 12,
+                        height: '18px',
+                      }}
+                    >
+                      {redirectUri}
+                    </div>
+                  </div>
+                </Center>
+              </Flexbox>
             </Flexbox>
-          </form>
-        </Flexbox>
-      </Card>
-    </Center>
-  );
-});
+          </Flexbox>
+        </Card>
+      </Center>
+    );
+  },
+);
 
 ConsentClient.displayName = 'ConsentClient';
 
-export { ConsentClient };
+export default ConsentClient;

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

@@ -0,0 +1,46 @@
+'use client';
+
+import { Typography } from 'antd';
+import { createStyles } from 'antd-style';
+import React, { memo } from 'react';
+import { Center } from 'react-layout-kit';
+
+interface ClientProps {
+  error: {
+    message: string;
+    title: string;
+  };
+}
+
+const { Title, Paragraph } = Typography;
+
+const useStyles = createStyles(({ css, token }) => ({
+  container: css`
+    width: 100%;
+    min-height: 100vh;
+    color: ${token.colorTextBase};
+    background-color: ${token.colorBgLayout};
+  `,
+  error: css`
+    text-align: center;
+  `,
+}));
+
+const ConsentClientError = memo<ClientProps>(({ error }) => {
+  const { styles } = useStyles();
+
+  return (
+    <Center className={styles.container}>
+      <div className={styles.error}>
+        <Title level={2} style={{ color: 'inherit' }}>
+          {error.title}
+        </Title>
+        <Paragraph style={{ color: 'inherit' }}>{error.message}</Paragraph>
+      </div>
+    </Center>
+  );
+});
+
+ConsentClientError.displayName = 'ConsentClientError';
+
+export default ConsentClientError;

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

@@ -3,11 +3,9 @@ import { notFound } from 'next/navigation';
 import { oidcEnv } from '@/envs/oidc';
 import { OIDCService } from '@/server/services/oidc';
 
-import { ConsentClient } from './Client';
+import ConsentClient from './Client';
+import ConsentClientError from './ClientError';
 
-/**
- * Consent 授权页面
- */
 const InteractionPage = async (props: { params: Promise<{ uid: string }> }) => {
   if (!oidcEnv.ENABLE_OIDC) return notFound();
 
@@ -23,14 +21,11 @@ const InteractionPage = async (props: { params: Promise<{ uid: string }> }) => {
     // 支持 login 和 consent 类型的交互
     if (details.prompt.name !== 'consent' && details.prompt.name !== 'login') {
       return (
-        <ConsentClient
-          clientId=""
+        <ConsentClientError
           error={{
             message: `不支持的交互类型: ${details.prompt.name}`,
             title: '不支持的交互类型',
           }}
-          scopes={[]}
-          uid={params.uid}
         />
       );
     }
@@ -39,8 +34,21 @@ const InteractionPage = async (props: { params: Promise<{ uid: string }> }) => {
     const clientId = (details.params.client_id as string) || 'unknown';
     const scopes = (details.params.scope as string)?.split(' ') || [];
 
+    const clientDetail = await oidcService.getClientMetadata(clientId);
+
     // 渲染客户端组件，无论是 login 还是 consent 类型
-    return <ConsentClient clientId={clientId} scopes={scopes} uid={params.uid} />;
+    return (
+      <ConsentClient
+        clientId={clientId}
+        clientMetadata={{
+          clientName: clientDetail?.client_name,
+          logo: clientDetail?.logo_uri,
+        }}
+        redirectUri={details.params.redirect_uri as string}
+        scopes={scopes}
+        uid={params.uid}
+      />
+    );
   } catch (error) {
     console.error('Error handling OIDC interaction:', error);
     // 确保错误处理能正确显示
@@ -48,23 +56,13 @@ const InteractionPage = async (props: { params: Promise<{ uid: string }> }) => {
     // 检查是否是 'interaction session not found' 错误，可以给用户更友好的提示
     if (errorMessage.includes('interaction session not found')) {
       return (
-        <ConsentClient
-          clientId=""
+        <ConsentClientError
           error={{ message: '授权会话已过期或无效，请重新发起授权流程。', title: '授权会话无效' }}
-          scopes={[]}
-          uid={params.uid} // uid 可能已失效，但仍传递给 Client
         />
       );
     }
 
-    return (
-      <ConsentClient
-        clientId=""
-        error={{ message: errorMessage, title: '发生错误' }}
-        scopes={[]}
-        uid={params.uid}
-      />
-    );
+    return <ConsentClientError error={{ message: errorMessage, title: '发生错误' }} />;
   }
 };
 

package/src/components/Branding/ProductLogo/index.tsx

@@ -5,7 +5,12 @@ import { isCustomBranding } from '@/const/version';
 
 import CustomLogo from './Custom';
 
-export const ProductLogo = memo<LobeHubProps>((props) => {
+interface ProductLogoProps extends LobeHubProps {
+  height?: number;
+  width?: number;
+}
+
+export const ProductLogo = memo<ProductLogoProps>((props) => {
   if (isCustomBranding) {
     return <CustomLogo {...props} />;
   }

package/src/config/aiModels/openai.ts

@@ -8,6 +8,66 @@ import {
 } from '@/types/aiModel';
 
 export const openaiChatModels: AIChatModelCard[] = [
+  {
+    abilities: {
+      functionCall: true,
+      vision: true,
+    },
+    contextWindowTokens: 1_047_576,
+    description:
+      'GPT-4.1 是我们用于复杂任务的旗舰模型。它非常适合跨领域解决问题。',
+    displayName: 'GPT-4.1',
+    enabled: true,
+    id: 'gpt-4.1',
+    maxOutput: 32_768,
+    pricing: {
+      cachedInput: 0.5,
+      input: 2,
+      output: 8,
+    },
+    releasedAt: '2025-04-14',
+    type: 'chat',
+  },
+  {
+    abilities: {
+      functionCall: true,
+      vision: true,
+    },
+    contextWindowTokens: 1_047_576,
+    description:
+      'GPT-4.1 mini 提供了智能、速度和成本之间的平衡，使其成为许多用例中有吸引力的模型。',
+    displayName: 'GPT-4.1 mini',
+    enabled: true,
+    id: 'gpt-4.1-mini',
+    maxOutput: 32_768,
+    pricing: {
+      cachedInput: 0.1,
+      input: 0.4,
+      output: 1.6,
+    },
+    releasedAt: '2025-04-14',
+    type: 'chat',
+  },
+  {
+    abilities: {
+      functionCall: true,
+      vision: true,
+    },
+    contextWindowTokens: 1_047_576,
+    description:
+      'GPT-4.1 mini 提供了智能、速度和成本之间的平衡，使其成为许多用例中有吸引力的模型。',
+    displayName: 'GPT-4.1 nano',
+    enabled: true,
+    id: 'gpt-4.1-nano',
+    maxOutput: 32_768,
+    pricing: {
+      cachedInput: 0.025,
+      input: 0.1,
+      output: 0.4,
+    },
+    releasedAt: '2025-04-14',
+    type: 'chat',
+  },
   {
     abilities: {
       functionCall: true,
@@ -36,7 +96,6 @@ export const openaiChatModels: AIChatModelCard[] = [
     description:
       'o1-mini是一款针对编程、数学和科学应用场景而设计的快速、经济高效的推理模型。该模型具有128K上下文和2023年10月的知识截止日期。',
     displayName: 'OpenAI o1-mini',
-    enabled: true,
     id: 'o1-mini',
     maxOutput: 65_536,
     pricing: {
@@ -75,7 +134,6 @@ export const openaiChatModels: AIChatModelCard[] = [
     description:
       'o1是OpenAI新的推理模型，适用于需要广泛通用知识的复杂任务。该模型具有128K上下文和2023年10月的知识截止日期。',
     displayName: 'OpenAI o1-preview',
-    enabled: true,
     id: 'o1-preview',
     maxOutput: 32_768,
     pricing: {
@@ -94,8 +152,7 @@ export const openaiChatModels: AIChatModelCard[] = [
     description:
       'GPT-4.5 的研究预览版，它是我们迄今为止最大、最强大的 GPT 模型。它拥有广泛的世界知识，并能更好地理解用户意图，使其在创造性任务和自主规划方面表现出色。GPT-4.5 可接受文本和图像输入，并生成文本输出（包括结构化输出）。支持关键的开发者功能，如函数调用、批量 API 和流式输出。在需要创造性、开放式思考和对话的任务（如写作、学习或探索新想法）中，GPT-4.5 表现尤为出色。知识截止日期为 2023 年 10 月。',
     displayName: 'GPT-4.5 Preview',
-    enabled: true,
-    id: 'gpt-4.5-preview',
+    id: 'gpt-4.5-preview', // deprecated on 2025-07-14
     maxOutput: 16_384,
     pricing: {
       cachedInput: 37.5,
@@ -114,7 +171,6 @@ export const openaiChatModels: AIChatModelCard[] = [
     description:
       'GPT-4o mini是OpenAI在GPT-4 Omni之后推出的最新模型，支持图文输入并输出文本。作为他们最先进的小型模型，它比其他近期的前沿模型便宜很多，并且比GPT-3.5 Turbo便宜超过60%。它保持了最先进的智能，同时具有显著的性价比。GPT-4o mini在MMLU测试中获得了 82% 的得分，目前在聊天偏好上排名高于 GPT-4。',
     displayName: 'GPT-4o mini',
-    enabled: true,
     id: 'gpt-4o-mini',
     maxOutput: 16_384,
     pricing: {
@@ -136,6 +192,7 @@ export const openaiChatModels: AIChatModelCard[] = [
     displayName: 'GPT-4o 1120',
     id: 'gpt-4o-2024-11-20',
     pricing: {
+      cachedInput: 1.25,
       input: 2.5,
       output: 10,
     },
@@ -151,7 +208,6 @@ export const openaiChatModels: AIChatModelCard[] = [
     description:
       'ChatGPT-4o 是一款动态模型，实时更新以保持当前最新版本。它结合了强大的语言理解与生成能力，适合于大规模应用场景，包括客户服务、教育和技术支持。',
     displayName: 'GPT-4o',
-    enabled: true,
     id: 'gpt-4o',
     pricing: {
       cachedInput: 1.25,
@@ -161,23 +217,6 @@ export const openaiChatModels: AIChatModelCard[] = [
     releasedAt: '2024-05-13',
     type: 'chat',
   },
-  {
-    abilities: {
-      functionCall: true,
-      vision: true,
-    },
-    contextWindowTokens: 128_000,
-    description:
-      'ChatGPT-4o 是一款动态模型，实时更新以保持当前最新版本。它结合了强大的语言理解与生成能力，适合于大规模应用场景，包括客户服务、教育和技术支持。',
-    displayName: 'GPT-4o 0806',
-    id: 'gpt-4o-2024-08-06',
-    pricing: {
-      input: 2.5,
-      output: 10,
-    },
-    releasedAt: '2024-08-06',
-    type: 'chat',
-  },
   {
     abilities: {
       functionCall: true,
@@ -345,8 +384,7 @@ export const openaiChatModels: AIChatModelCard[] = [
     description:
       'GPT-4 提供了一个更大的上下文窗口，能够处理更长的文本输入，适用于需要广泛信息整合和数据分析的场景。',
     displayName: 'GPT-4 32K',
-    id: 'gpt-4-32k',
-    // Will be discontinued on June 6, 2025
+    id: 'gpt-4-32k', // deprecated on 2025-06-06
     legacy: true,
     pricing: {
       input: 60,
@@ -354,22 +392,6 @@ export const openaiChatModels: AIChatModelCard[] = [
     },
     type: 'chat',
   },
-  {
-    abilities: {
-      functionCall: true,
-    },
-    contextWindowTokens: 32_768,
-    description:
-      'GPT-4 提供了一个更大的上下文窗口，能够处理更长的文本输入，适用于需要广泛信息整合和数据分析的场景。',
-    displayName: 'GPT-4 32K 0613',
-    id: 'gpt-4-32k-0613',
-    pricing: {
-      input: 60,
-      output: 120,
-    },
-    releasedAt: '2023-06-13',
-    type: 'chat',
-  },
   {
     abilities: {
       functionCall: true,

package/src/database/server/models/__tests__/adapter.test.ts

@@ -1,20 +1,16 @@
-import type { AdapterUser } from '@auth/core/adapters';
 import { eq } from 'drizzle-orm/expressions';
-import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { getTestDBInstance } from '@/database/core/dbForTest';
 import { users } from '@/database/schemas';
 import {
   oidcAccessTokens,
-  oidcAuthorizationCodes,
   oidcClients,
   oidcDeviceCodes,
-  oidcGrants,
   oidcInteractions,
   oidcRefreshTokens,
   oidcSessions,
 } from '@/database/schemas/oidc';
-import { LobeChatDatabase } from '@/database/type';
 import { DrizzleAdapter } from '@/libs/oidc-provider/adapter';
 
 let serverDB = await getTestDBInstance();

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

@@ -1,4 +1,5 @@
 import debug from 'debug';
+import { sql } from 'drizzle-orm';
 import { eq } from 'drizzle-orm/expressions';
 
 import {
@@ -161,6 +162,24 @@ class OIDCAdapter {
     if (payload.accountId) {
       record.userId = payload.accountId;
       log('[%s] Setting userId: %s', this.name, payload.accountId);
+    } else {
+      try {
+        const { getUserAuth } = await import('@/utils/server/auth');
+        try {
+          const { userId } = await getUserAuth();
+          if (userId) {
+            payload.accountId = userId;
+            record.userId = userId;
+            log('[%s] Setting userId from auth context: %s', this.name, userId);
+          }
+        } catch (authError) {
+          log('[%s] Error getting userId from auth context: %O', this.name, authError);
+          // 如果获取 userId 失败，继续处理而不抛出错误
+        }
+      } catch (importError) {
+        log('[%s] Error importing auth module: %O', this.name, importError);
+        // 如果导入模块失败，继续处理而不抛出错误
+      }
     }
 
     if (payload.clientId) {
@@ -180,6 +199,7 @@ class OIDCAdapter {
 
     try {
       log('[%s] Executing upsert DB operation', this.name);
+
       await this.db
         .insert(table)
         .values(record as any)
@@ -335,7 +355,34 @@ class OIDCAdapter {
    */
   async findByUid(uid: string): Promise<any> {
     log('[Interaction] findByUid called - uid: %s', uid);
+    const table = this.getTable();
+    if (this.name === 'Session') {
+      try {
+        const jsonbUidEq = sql`${(table as any).data}->>'uid' = ${uid}`;
+        // @ts-ignore
+        const results = await this.db.select().from(table).where(jsonbUidEq).limit(1);
+        log('[Session] Find by data.uid query results: %O', results);
 
+        if (!results || results.length === 0) {
+          log('[Session] No record found by data.uid: %s', uid);
+          return undefined;
+        }
+
+        const model = results[0] as any;
+        // 检查过期
+        if (model.expiresAt && model.expiresAt < new Date()) {
+          log('[Session] Record found by data.uid but expired: %s', uid);
+          await this.destroy(model.id); // 仍然使用主键 id 删除
+          return undefined;
+        }
+
+        log('[Session] Successfully found by data.uid and returning record data for uid %s', uid);
+        return model.data;
+      } catch (error) {
+        log('[Session] ERROR during findSessionByUid operation for %s: %O', uid, error);
+        console.error(`[OIDC Adapter] Error finding Session by uid:`, error);
+      }
+    }
     // 复用 find 方法实现
     log('[Interaction] Delegating to find() method');
     return this.find(uid);