@allbluecn/web-app 0.11.0 → 0.11.2

package/src/components/knowledge/knowledge-toolbar.tsx

@@ -339,8 +339,8 @@ export function KnowledgeToolbar({ kb, onUpdate, breadcrumb, docType, treeCollap
                     >
                       {kb.name}
                     </BreadcrumbLink>
-                    <BreadcrumbSeparator />
                   </BreadcrumbItem>
+                  <BreadcrumbSeparator />
                   <BreadcrumbItem>
                     <DropdownMenu>
                       <DropdownMenuTrigger className="flex items-center text-sm text-muted-foreground hover:text-foreground">
@@ -357,8 +357,8 @@ export function KnowledgeToolbar({ kb, onUpdate, breadcrumb, docType, treeCollap
                         ))}
                       </DropdownMenuContent>
                     </DropdownMenu>
-                    <BreadcrumbSeparator />
                   </BreadcrumbItem>
+                  <BreadcrumbSeparator />
                   {breadcrumb.slice(-2).map((item, index, arr) => {
                     const isLast = index === arr.length - 1
                     return (
@@ -368,16 +368,14 @@ export function KnowledgeToolbar({ kb, onUpdate, breadcrumb, docType, treeCollap
                             {item.title}
                           </BreadcrumbPage>
                         ) : (
-                          <>
-                            <BreadcrumbLink
-                              className="text-sm font-semibold cursor-pointer hover:text-foreground"
-                              onClick={() => onNavigate?.(item.id)}
-                            >
-                              {item.title}
-                            </BreadcrumbLink>
-                            <BreadcrumbSeparator />
-                          </>
+                          <BreadcrumbLink
+                            className="text-sm font-semibold cursor-pointer hover:text-foreground"
+                            onClick={() => onNavigate?.(item.id)}
+                          >
+                            {item.title}
+                          </BreadcrumbLink>
                         )}
+                        {!isLast && <BreadcrumbSeparator />}
                       </BreadcrumbItem>
                     )
                   })}
@@ -391,8 +389,8 @@ export function KnowledgeToolbar({ kb, onUpdate, breadcrumb, docType, treeCollap
                     >
                       {kb.name}
                     </BreadcrumbLink>
-                    <BreadcrumbSeparator />
                   </BreadcrumbItem>
+                  <BreadcrumbSeparator />
                   {breadcrumb.map((item, index) => {
                     const isLast = index === breadcrumb.length - 1
                     return (
@@ -402,16 +400,14 @@ export function KnowledgeToolbar({ kb, onUpdate, breadcrumb, docType, treeCollap
                             {item.title}
                           </BreadcrumbPage>
                         ) : (
-                          <>
-                            <BreadcrumbLink
-                              className="text-sm font-semibold cursor-pointer hover:text-foreground"
-                              onClick={() => onNavigate?.(item.id)}
-                            >
-                              {item.title}
-                            </BreadcrumbLink>
-                            <BreadcrumbSeparator />
-                          </>
+                          <BreadcrumbLink
+                            className="text-sm font-semibold cursor-pointer hover:text-foreground"
+                            onClick={() => onNavigate?.(item.id)}
+                          >
+                            {item.title}
+                          </BreadcrumbLink>
                         )}
+                        {!isLast && <BreadcrumbSeparator />}
                       </BreadcrumbItem>
                     )
                   })}

package/src/components/layout/sidebar-03/app-sidebar.tsx

@@ -24,7 +24,6 @@ import {
   useSidebar,
 } from "@/components/ui/sidebar";
 import { cn } from "@/lib/utils";
-import { m } from "motion/react";
 import DashboardNavigation from "@/components/layout/sidebar-03/nav-main";
 import { NotificationsBell } from "@/components/layout/sidebar-03/nav-notifications";
 import { NavAnyHub } from "@/components/layout/sidebar-03/nav-anyhub";
@@ -57,15 +56,10 @@ export function DashboardSidebar() {
         {isCollapsed ? (
           <div className="flex flex-col items-center gap-2">
              <LogoIcon className="h-6 w-6" />
-            <m.div
-              className="flex flex-col-reverse items-center gap-1"
-              initial={{ opacity: 0 }}
-              animate={{ opacity: 1 }}
-              transition={{ duration: 0.8 }}
-            >
+            <div className="flex flex-col-reverse items-center gap-1">
               <NotificationsBell />
               <SidebarTrigger />
-            </m.div>
+            </div>
           </div>
         ) : (
           <>
@@ -78,17 +72,12 @@ export function DashboardSidebar() {
                 {/* <Badge className="h-4 text-[10px] relative -top-4 -left-9 ">v0</Badge> */}
               </div>
             </a>
-            <m.div
-              className="flex items-center gap-2"
-              initial={{ opacity: 0 }}
-              animate={{ opacity: 1 }}
-              transition={{ duration: 0.8 }}
-            >
+            <div className="flex items-center gap-2">
               <NotificationsBell />
               <AnimatedThemeToggler />
 
               <SidebarTrigger />
-            </m.div>
+            </div>
           </>
         )}
       </SidebarHeader>

package/src/components/notifications/settings-notifications.tsx

@@ -3,7 +3,7 @@
 import { useEffect, useState } from 'react'
 import { useQuery, useQueryClient } from '@tanstack/react-query'
 import { toast } from 'sonner'
-import { Bell } from 'lucide-react'
+import { Bell, Mail } from 'lucide-react'
 import { Field, FieldContent, FieldDescription, FieldLabel } from '@/components/ui/field'
 import { InputGroup, InputGroupInput } from '@/components/ui/input-group'
 import {
@@ -17,6 +17,8 @@ import { Separator } from '@/components/ui/separator'
 import { Switch } from '@/components/ui/switch'
 import { useDebouncedCallback } from '@/lib/pacer'
 import { getNotificationPreferencesFn, updateNotificationPreferencesFn } from '@/server/serverFns/notifications'
+import { getEmailVerifiedStatusFn } from '@/server/serverFns/auth/email-verification'
+import { useSession } from '@/components/shared-kit/auth/auth-client'
 import type {
   CategoryFrequencies,
   NotificationCategory,
@@ -47,12 +49,24 @@ const PREFERENCES_SAVE_DEBOUNCE_MS = 500
 
 export function SettingsNotifications() {
   const queryClient = useQueryClient()
+  const { data: session } = useSession()
+  const userId = session?.user?.id ?? null
 
   const { data: prefsData, isLoading } = useQuery({
     queryKey: ['notifications', 'preferences'],
     queryFn: () => getNotificationPreferencesFn({ data: {} }),
   })
 
+  const { data: emailVerified = null } = useQuery({
+    queryKey: ['email-verified-status', userId ?? 'anonymous'],
+    queryFn: async () => {
+      const r = await getEmailVerifiedStatusFn({ data: {} })
+      return r.verified
+    },
+    enabled: userId !== null,
+    staleTime: 60_000,
+  })
+
   const [prefs, setPrefs] = useState<NotificationPreferences | null>(null)
 
   useEffect(() => {
@@ -137,6 +151,32 @@ export function SettingsNotifications() {
                       />
                     </div>
                   </Field>
+
+                  <Field>
+                    <div className="flex items-center justify-between">
+                      <div className="flex flex-col gap-1">
+                        <div className="flex items-center gap-2">
+                          <Mail className="size-4 text-muted-foreground" />
+                          <FieldLabel htmlFor={`${meta.key}-email`}>
+                            {m.notifications_preferences_emailChannel()}
+                          </FieldLabel>
+                        </div>
+                        <FieldDescription>
+                          {emailVerified === false
+                            ? m.notifications_preferences_emailNeedVerify()
+                            : m.notifications_preferences_emailChannelDesc()}
+                        </FieldDescription>
+                      </div>
+                      <Switch
+                        checked={prefs.emailCategories[meta.key]}
+                        disabled={emailVerified !== true}
+                        id={`${meta.key}-email`}
+                        onCheckedChange={(checked) =>
+                          patch({ emailCategories: { ...prefs.emailCategories, [meta.key]: checked } })
+                        }
+                      />
+                    </div>
+                  </Field>
                 </div>
               )
             })}

package/src/components/settings/personal-team/account/settings-profile.tsx

@@ -17,10 +17,13 @@
 
 "use client";
 
-import { Loader2, Save, Upload } from "lucide-react";
+import { Loader2, MailWarning, Save, Upload } from "lucide-react";
 import { useState } from "react"
+import { useQuery } from "@tanstack/react-query"
 import { cn } from "@/lib/utils";
 import { Button } from "@/components/ui/button";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { toast } from "@/components/ui/sonner";
 import {
   Card,
   CardContent,
@@ -46,6 +49,11 @@ import type {
   AvatarConfig,
   ShapeType,
 } from "@/components/settings/personal-team/account/avatar/avatar-config";
+import { useSession } from "@/components/shared-kit/auth/auth-client";
+import {
+  getEmailVerifiedStatusFn,
+  resendVerificationEmailFn,
+} from "@/server/serverFns/auth/email-verification";
 import { m } from "@/paraglide/messages.js";
 
 export interface SocialLink {
@@ -127,6 +135,37 @@ export default function SettingsProfile({
     newEmail: "",
     currentPassword: "",
   });
+  const [isResendingVerify, setIsResendingVerify] = useState(false);
+
+  const { data: session } = useSession();
+  const userId = session?.user?.id ?? null;
+
+  const { data: verifyStatus } = useQuery({
+    queryKey: ["email-verified-status", userId ?? "anonymous"],
+    queryFn: async () => {
+      const r = await getEmailVerifiedStatusFn({ data: {} });
+      return r.verified;
+    },
+    enabled: userId !== null,
+    staleTime: 60_000,
+  });
+
+  const handleResendVerify = async () => {
+    if (isResendingVerify) return;
+    setIsResendingVerify(true);
+    try {
+      const r = await resendVerificationEmailFn({ data: {} });
+      if (r.alreadyVerified) {
+        toast.success(m.auth_verify_alreadyVerified());
+      } else {
+        toast.success(m.auth_verify_resendSuccess());
+      }
+    } catch (err) {
+      toast.error(err instanceof Error ? err.message : m.settings_profile_emailChangeFailed());
+    } finally {
+      setIsResendingVerify(false);
+    }
+  };
 
   const handleSave = async () => {
     setErrors({});
@@ -363,6 +402,34 @@ export default function SettingsProfile({
               </FieldContent>
             </Field>
 
+            {showEmailVerification && verifyStatus === false && (
+              <Alert className="mt-2">
+                <MailWarning className="size-4" />
+                <AlertTitle>{m.auth_account_emailUnverified()}</AlertTitle>
+                <AlertDescription className="flex items-center gap-2">
+                  <span>{m.auth_account_emailUnverifiedDesc()}</span>
+                  <Button
+                    disabled={isResendingVerify}
+                    onClick={handleResendVerify}
+                    size="sm"
+                    type="button"
+                    variant="outline"
+                  >
+                    {isResendingVerify ? (
+                      <Loader2 className="size-4 animate-spin" />
+                    ) : (
+                      m.auth_account_resendVerify()
+                    )}
+                  </Button>
+                </AlertDescription>
+              </Alert>
+            )}
+            {showEmailVerification && verifyStatus === true && (
+              <p className="text-muted-foreground mt-1 text-xs">
+                {m.auth_account_emailVerified()}
+              </p>
+            )}
+
             {showEmailChangeForm && (
               <div className="flex flex-col gap-4 rounded-lg border bg-muted/30 p-4">
                 <Field>

package/src/lib/__tests__/edition-desktop.test.ts

@@ -0,0 +1,23 @@
+import { describe, expect, it, afterEach, vi } from 'vitest'
+import { isDesktopEdition } from '../edition-desktop'
+
+afterEach(() => {
+  vi.unstubAllEnvs()
+})
+
+describe('isDesktopEdition', () => {
+  it('VITE_DEPLOY_TARGET=desktop → true', () => {
+    vi.stubEnv('VITE_DEPLOY_TARGET', 'desktop')
+    expect(isDesktopEdition()).toBe(true)
+  })
+
+  it('VITE_DEPLOY_TARGET=web → false', () => {
+    vi.stubEnv('VITE_DEPLOY_TARGET', 'web')
+    expect(isDesktopEdition()).toBe(false)
+  })
+
+  it('未注入构建常量 → false（Web 部署默认）', () => {
+    vi.stubEnv('VITE_DEPLOY_TARGET', '')
+    expect(isDesktopEdition()).toBe(false)
+  })
+})

package/src/lib/app-version.ts

@@ -17,7 +17,7 @@
 
 // 版本号由 vite.shared.ts 构建时注入（__APP_VERSION__），无需运行时读取 package.json
 declare const __APP_VERSION__: string
-const APP_VERSION: string = __APP_VERSION__
+export const APP_VERSION: string = __APP_VERSION__
 
 declare const __APP_UPDATE_DATE__: string
 const APP_UPDATE_DATE: string = __APP_UPDATE_DATE__

package/src/lib/auth/auth.config.ts

@@ -23,6 +23,7 @@ import { prisma } from '@allbluecn/database'
 import bcrypt from 'bcryptjs'
 import { getRandomConfig, presetBgColors } from '@/components/settings/personal-team/account/avatar/avatar-config'
 import { resolveIpLocation, getClientIp } from '@allbluecn/kernel'
+import { getResolvedOAuthProviders } from '@/server/oauth-config'
 
 type CachedProfile = {
   username: string
@@ -92,6 +93,109 @@ function pickBgColor(seed: string) {
   return presetBgColors[Math.abs(hash) % presetBgColors.length]
 }
 
+const credentialsProvider = CredentialsProvider({
+  name: 'credentials',
+  credentials: {
+    email: { label: 'Email', type: 'email' },
+    password: { label: 'Password', type: 'password' },
+    ssoToken: { label: 'SSO Token', type: 'text' },
+  },
+  async authorize(credentials, request) {
+    const creds = credentials as { email: string; password: string; remember?: string; stayLoggedIn?: string; ssoToken?: string }
+    if (creds.ssoToken) {
+      const { resolveSsoTokenUser } = await import('./sso-authorize')
+      const user = await resolveSsoTokenUser(creds.ssoToken)
+      if (!user) return null
+      return { id: user.id, email: user.email, name: user.name, role: user.role }
+    }
+    if (!creds.email || !creds.password) return null
+
+    const user = await prisma.user.findUnique({
+      where: { email: creds.email.toLowerCase().trim() },
+      select: { id: true, email: true, username: true, password: true, role: true, status: true },
+    })
+
+    // 用户不存在：userId 为外键，无法记录日志（保持现状）
+    if (!user) return null
+
+    // 安全提取 IP/UA（start-authjs 传递的 request 类型可能不标准，失败不阻塞登录）
+    let ip: string | null = null
+    let userAgent: string | null = null
+    try {
+      const headers = request?.headers as { get?: (name: string) => string | null } | undefined
+      if (headers && typeof headers.get === 'function') {
+        ip = getClientIp(request as Request)
+        userAgent = headers.get('user-agent') || null
+      }
+    } catch {
+      // 忽略：IP/UA 仅用于日志，获取失败不影响登录
+    }
+
+    // 安全记录登录日志（DB 异常不阻塞登录流程）
+    const recordLog = async (success: boolean, message?: string, location?: string) => {
+      try {
+        await prisma.loginLog.create({
+          data: {
+            userId: user.id,
+            ip,
+            userAgent,
+            location: location ?? null,
+            success,
+            ...(message ? { message } : {}),
+          },
+        })
+      } catch (err) {
+        console.error('[auth] 记录登录日志失败:', err instanceof Error ? err.message : String(err))
+      }
+    }
+
+    // 账号状态异常：记录失败原因
+    if (user.status === 'BANNED') {
+      await recordLog(false, '账号已封禁')
+      return null
+    }
+    if (user.status === 'INACTIVE') {
+      await recordLog(false, '账号未激活')
+      return null
+    }
+    if (user.status !== 'ACTIVE') {
+      await recordLog(false, '账号状态异常')
+      return null
+    }
+
+    const isValid = await bcrypt.compare(creds.password, user.password)
+    if (!isValid) {
+      await recordLog(false, '密码错误')
+      return null
+    }
+
+    // 登录成功：记录 IP/UA/地理位置
+    const location = await resolveIpLocation(ip)
+    await recordLog(true, undefined, location)
+    await prisma.user.update({ where: { id: user.id }, data: { lastLoginAt: new Date() } })
+
+    const remember = creds.remember === 'true'
+    const stayLoggedIn = creds.stayLoggedIn === 'true'
+    return {
+      id: user.id,
+      email: user.email,
+      name: user.username,
+      role: user.role,
+      remember,
+      stayLoggedIn,
+    }
+  },
+})
+
+const GOOGLE_PROVIDER_BASE = {
+  authorization: {
+    url: 'https://accounts.google.com/o/oauth2/v2/auth',
+    params: { prompt: 'consent', access_type: 'offline', response_type: 'code' },
+  },
+  token: 'https://oauth2.googleapis.com/token',
+  userinfo: 'https://www.googleapis.com/oauth2/v3/userinfo',
+} as const
+
 export const authConfig: StartAuthJSConfig = {
   basePath: '/api/auth',
   session: { strategy: 'jwt', maxAge: 30 * 24 * 60 * 60 },
@@ -111,109 +215,12 @@ export const authConfig: StartAuthJSConfig = {
     },
   },
   providers: [
-    CredentialsProvider({
-      name: 'credentials',
-      credentials: {
-        email: { label: 'Email', type: 'email' },
-        password: { label: 'Password', type: 'password' },
-        ssoToken: { label: 'SSO Token', type: 'text' },
-      },
-      async authorize(credentials, request) {
-        const creds = credentials as { email: string; password: string; remember?: string; stayLoggedIn?: string; ssoToken?: string }
-        if (creds.ssoToken) {
-          const { resolveSsoTokenUser } = await import('./sso-authorize')
-          const user = await resolveSsoTokenUser(creds.ssoToken)
-          if (!user) return null
-          return { id: user.id, email: user.email, name: user.name, role: user.role }
-        }
-        if (!creds.email || !creds.password) return null
-
-        const user = await prisma.user.findUnique({
-          where: { email: creds.email },
-          select: { id: true, email: true, username: true, password: true, role: true, status: true },
-        })
-
-        // 用户不存在：userId 为外键，无法记录日志（保持现状）
-        if (!user) return null
-
-        // 安全提取 IP/UA（start-authjs 传递的 request 类型可能不标准，失败不阻塞登录）
-        let ip: string | null = null
-        let userAgent: string | null = null
-        try {
-          const headers = request?.headers as { get?: (name: string) => string | null } | undefined
-          if (headers && typeof headers.get === 'function') {
-            ip = getClientIp(request as Request)
-            userAgent = headers.get('user-agent') || null
-          }
-        } catch {
-          // 忽略：IP/UA 仅用于日志，获取失败不影响登录
-        }
-
-        // 安全记录登录日志（DB 异常不阻塞登录流程）
-        const recordLog = async (success: boolean, message?: string, location?: string) => {
-          try {
-            await prisma.loginLog.create({
-              data: {
-                userId: user.id,
-                ip,
-                userAgent,
-                location: location ?? null,
-                success,
-                ...(message ? { message } : {}),
-              },
-            })
-          } catch (err) {
-            console.error('[auth] 记录登录日志失败:', err instanceof Error ? err.message : String(err))
-          }
-        }
-
-        // 账号状态异常：记录失败原因
-        if (user.status === 'BANNED') {
-          await recordLog(false, '账号已封禁')
-          return null
-        }
-        if (user.status === 'INACTIVE') {
-          await recordLog(false, '账号未激活')
-          return null
-        }
-        if (user.status !== 'ACTIVE') {
-          await recordLog(false, '账号状态异常')
-          return null
-        }
-
-        const isValid = await bcrypt.compare(creds.password, user.password)
-        if (!isValid) {
-          await recordLog(false, '密码错误')
-          return null
-        }
-
-        // 登录成功：记录 IP/UA/地理位置
-        const location = await resolveIpLocation(ip)
-        await recordLog(true, undefined, location)
-        await prisma.user.update({ where: { id: user.id }, data: { lastLoginAt: new Date() } })
-
-        const remember = creds.remember === 'true'
-        const stayLoggedIn = creds.stayLoggedIn === 'true'
-        return {
-          id: user.id,
-          email: user.email,
-          name: user.username,
-          role: user.role,
-          remember,
-          stayLoggedIn,
-        }
-      },
-    }),
+    credentialsProvider,
     ...(process.env.AUTH_GOOGLE_ID && process.env.AUTH_GOOGLE_SECRET
       ? [GoogleProvider({
           clientId: process.env.AUTH_GOOGLE_ID,
           clientSecret: process.env.AUTH_GOOGLE_SECRET,
-          authorization: {
-            url: 'https://accounts.google.com/o/oauth2/v2/auth',
-            params: { prompt: 'consent', access_type: 'offline', response_type: 'code' },
-          },
-          token: 'https://oauth2.googleapis.com/token',
-          userinfo: 'https://www.googleapis.com/oauth2/v3/userinfo',
+          ...GOOGLE_PROVIDER_BASE,
         })]
       : []),
   ],
@@ -381,3 +388,20 @@ export const authConfig: StartAuthJSConfig = {
     },
   },
 }
+
+/** 异步工厂：DB OAuth 配置优先（60s 缓存），无则回落 env 静态 authConfig.providers */
+export async function getAuthConfig(): Promise<StartAuthJSConfig> {
+  const resolved = await getResolvedOAuthProviders()
+  const google = resolved.find((p) => p.provider === 'google')
+  const providers = google
+    ? [
+        credentialsProvider,
+        GoogleProvider({
+          clientId: google.clientId,
+          clientSecret: google.clientSecret,
+          ...GOOGLE_PROVIDER_BASE,
+        }),
+      ]
+    : authConfig.providers
+  return { ...authConfig, providers }
+}

package/src/lib/changelog/sdk-versions.ts

@@ -95,15 +95,15 @@ export const SDK_GROUPS: SdkGroup[] = [
     "items": [
       {
         "name": "@allbluecn/web-app",
-        "version": "v0.11.0",
-        "lastUpdate": "Sep 11, 2026",
+        "version": "v0.11.2",
+        "lastUpdate": "Sep 12, 2026",
         "source": "apps/web/package.json",
         "docsUrl": "https://github.com/allbluecn/allblue"
       },
       {
         "name": "@allbluecn/kernel",
-        "version": "v0.6.1",
-        "lastUpdate": "Sep 11, 2026",
+        "version": "v0.8.0",
+        "lastUpdate": "Sep 12, 2026",
         "source": "packages/kernel/package.json",
         "docsUrl": "https://github.com/allbluecn/allblue"
       }

package/src/lib/edition-desktop.ts

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// AllBlue - 理想之海
+// Copyright (C) 2026 AllBlue Contributors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+// beforeLoad 同构执行（SSR + 客户端导航），不能读 process.env；
+// Vite define 已注入 import.meta.env.VITE_DEPLOY_TARGET（见 vite.shared.ts）
+export function isDesktopEdition(): boolean {
+  return import.meta.env.VITE_DEPLOY_TARGET === 'desktop'
+}

package/src/lib/session.ts

@@ -17,7 +17,7 @@
 
 import { getSession } from 'start-authjs'
 import type { AuthSession } from 'start-authjs'
-import { authConfig } from './auth/auth.config'
+import { getAuthConfig } from './auth/auth.config'
 
 export type SessionUser = NonNullable<AuthSession['user']> & {
   id?: string
@@ -41,7 +41,7 @@ export type Session = Omit<AuthSession, 'user'> & { user?: SessionUser | null }
 export async function getCurrentSession(request?: Request): Promise<Session | null> {
   if (!request) return null
   try {
-    return (await getSession(request, authConfig)) as Session | null
+    return (await getSession(request, await getAuthConfig())) as Session | null
   } catch (error) {
     // JWT 解密失败（AUTH_SECRET 轮换 / 跨应用同名 cookie 污染）等效于无 session：
     // 返回 null 走未登录分支；@auth/core 会自行清理坏 cookie。