Merge branch 'develop' of https://github.com/BidingCC/BuildingAI into develop

Author: cai7737

packages/@buildingai/web/http/src/core/http-client.ts

@@ -94,6 +94,15 @@ function toHttpError(error: unknown): HttpError {
     });
 }
 
+function isAccessError(error: HttpError): boolean {
+    const responseData =
+        error.details && typeof error.details === "object" && "data" in error.details
+            ? (error.details.data as { code?: unknown } | undefined)
+            : undefined;
+    const businessCode = error.code ?? responseData?.code;
+    return String(businessCode) === "40203";
+}
+
 export class HttpClient {
     private readonly axios: AxiosInstance;
     private readonly options: HttpClientOptions;
@@ -189,7 +198,11 @@ export class HttpClient {
             }
 
             const httpError = toHttpError(error);
-            if (!silent) this.options.hooks?.onError?.(httpError);
+            if (!silent && isAccessError(httpError)) {
+                await this.options.hooks?.onAccessError?.(httpError);
+            } else if (!silent) {
+                this.options.hooks?.onError?.(httpError);
+            }
             throw httpError;
         }
     }

packages/@buildingai/web/http/src/core/types.ts

@@ -69,6 +69,7 @@ export interface RetryOptions {
 export interface HttpHooks {
     getAccessToken?: () => string | undefined | Promise<string | undefined>;
     onAuthError?: (error: unknown) => void | Promise<void>;
+    onAccessError?: (error: HttpError) => void | Promise<void>;
     /**
      * Called when request received 401 and you want to refresh token.
      * Return true to indicate refresh succeeded and request should be retried.

packages/@buildingai/web/services/src/base.ts

@@ -3,6 +3,8 @@ import { useAuthStore } from "@buildingai/stores";
 import type { AxiosError } from "axios";
 import { toast } from "sonner";
 
+import { getFirstConsoleMenuPath, hasConsoleAccess, WEB_HOME_PATH } from "./shared/console-access";
+
 const isDev = import.meta.env.DEV;
 const devBase = import.meta.env.VITE_DEVELOP_APP_BASE_URL;
 const prodBase = import.meta.env.VITE_PRODUCTION_APP_BASE_URL;
@@ -33,6 +35,17 @@ async function handleAuthError(error: unknown): Promise<void> {
     location.replace(`/login?redirect=${location.pathname}`);
 }
 
+async function handleAccessError(): Promise<void> {
+    const userInfo = useAuthStore.getState().auth.userInfo;
+    const target = hasConsoleAccess(userInfo)
+        ? getFirstConsoleMenuPath(userInfo?.menus ?? [])
+        : WEB_HOME_PATH;
+
+    if (location.pathname !== target) {
+        location.replace(target);
+    }
+}
+
 export const apiHttpClient = createHttpClient({
     baseURL: isDev ? devBase : prodBase,
     pathPrefix: import.meta.env.VITE_APP_WEB_API_PREFIX || "/api",
@@ -42,6 +55,7 @@ export const apiHttpClient = createHttpClient({
             return useAuthStore.getState().auth.token || "";
         },
         onAuthError: handleAuthError,
+        onAccessError: handleAccessError,
         onError: handleHttpError,
     },
 });
@@ -55,6 +69,7 @@ export const consoleHttpClient = createHttpClient({
             return useAuthStore.getState().auth.token || "";
         },
         onAuthError: handleAuthError,
+        onAccessError: handleAccessError,
         onError: handleHttpError,
     },
 });
@@ -106,6 +121,7 @@ export function createPluginHttpClients(pluginIdentifier?: string) {
                 return useAuthStore.getState().auth.token || "";
             },
             onAuthError: handlePluginAuthError,
+            onAccessError: handleAccessError,
             onError: handleHttpError,
         },
     });
@@ -119,6 +135,7 @@ export function createPluginHttpClients(pluginIdentifier?: string) {
                 return useAuthStore.getState().auth.token || "";
             },
             onAuthError: handlePluginAuthError,
+            onAccessError: handleAccessError,
             onError: handleHttpError,
         },
     });

packages/@buildingai/web/services/src/shared/console-access.ts

@@ -0,0 +1,50 @@
+import type { MenuItem, UserInfo } from "@buildingai/web-types";
+
+export const CONSOLE_HOME_PATH = "/console/dashboard";
+export const WEB_HOME_PATH = "/";
+
+function isEnabled(status: number | string | boolean | undefined | null): boolean {
+    if (typeof status === "boolean") return status;
+    if (typeof status === "number") return status === 1;
+    if (typeof status === "string") {
+        return ["1", "true", "yes", "y", "on", "enabled", "enable", "active"].includes(
+            status.toLowerCase().trim(),
+        );
+    }
+    return false;
+}
+
+export function hasConsoleAccess(userInfo?: Pick<UserInfo, "permissions" | "isRoot"> | null) {
+    return !!userInfo && (isEnabled(userInfo.permissions) || isEnabled(userInfo.isRoot));
+}
+
+function normalizePath(path: string) {
+    return path.replace(/\/+/g, "/").replace(/\/$/, "") || "/";
+}
+
+function collectConsoleMenuPaths(items: MenuItem[], parentPath = "", out: string[] = []) {
+    for (const item of items) {
+        const currentPath = item.path
+            ? [parentPath, item.path].filter(Boolean).join("/")
+            : parentPath;
+
+        if (item.type === 2 && item.path && item.path !== "#") {
+            out.push(normalizePath(`/console/${currentPath}`));
+        }
+
+        if (item.children?.length) {
+            collectConsoleMenuPaths(item.children, currentPath, out);
+        }
+    }
+
+    return out;
+}
+
+export function getConsoleMenuPaths(menus: MenuItem[] = []) {
+    return collectConsoleMenuPaths(menus);
+}
+
+export function getFirstConsoleMenuPath(menus: MenuItem[] = []) {
+    const paths = getConsoleMenuPaths(menus);
+    return paths.find((path) => path === CONSOLE_HOME_PATH) ?? paths[0] ?? CONSOLE_HOME_PATH;
+}

packages/@buildingai/web/services/src/shared/index.ts

@@ -1,5 +1,6 @@
 export { createPluginHttpClients } from "../base";
 export * from "./config";
+export * from "./console-access";
 export * from "./upload";
 export * from "./upload-oss";
 export * from "./user";

packages/client/src/components/ask-assistant-ui/hooks/use-chat-stream.ts

@@ -239,6 +239,14 @@ export function useChatStream(options: UseChatStreamOptions): UseChatStreamRetur
     ) => {
       if (status === "streaming") return;
       if (!content.trim() && (!files || files.length === 0)) return;
+      if (!token) {
+        const redirect = `${location.pathname}${location.search}`;
+        navigate(`/login?redirect=${encodeURIComponent(redirect)}`, {
+          replace: true,
+          state: { redirect },
+        });
+        return;
+      }
       setStatusOverride(null);
       pendingParentIdRef.current = parentId !== undefined ? parentId : lastMessageDbIdRef.current;
 
@@ -257,7 +265,7 @@ export function useChatStream(options: UseChatStreamOptions): UseChatStreamRetur
         ...(fileParts && { files: fileParts }),
       });
     },
-    [sendMessage, status, lastMessageDbIdRef],
+    [sendMessage, status, token, location.pathname, location.search, navigate, lastMessageDbIdRef],
   );
 
   const streamingMessageId =

packages/client/src/layouts/console/index.tsx

@@ -1,3 +1,9 @@
+import {
+  getConsoleMenuPaths,
+  getFirstConsoleMenuPath,
+  hasConsoleAccess,
+  WEB_HOME_PATH,
+} from "@buildingai/services/shared";
 import { useAuthStore } from "@buildingai/stores";
 import NotFoundPage from "@buildingai/ui/components/exception/not-found-page";
 import { ScrollArea } from "@buildingai/ui/components/ui/scroll-area";
@@ -6,7 +12,7 @@ import type { MenuItem } from "@buildingai/web-types";
 import type { ComponentType } from "react";
 import { useMemo } from "react";
 import type { RouteObject } from "react-router-dom";
-import { useRoutes } from "react-router-dom";
+import { Navigate, useLocation, useRoutes } from "react-router-dom";
 
 import AccessMenuIndexPage from "@/pages/console/access/menu";
 import AccessPermissionIndexPage from "@/pages/console/access/permission";
@@ -267,6 +273,28 @@ function ConsoleRoutes() {
 }
 
 export default function ConsoleLayout({ children }: { children?: React.ReactNode }) {
+  const location = useLocation();
+  const { userInfo } = useAuthStore((state) => state.auth);
+  const menuPaths = useMemo(() => getConsoleMenuPaths(userInfo?.menus ?? []), [userInfo?.menus]);
+  const firstConsolePath = useMemo(
+    () => getFirstConsoleMenuPath(userInfo?.menus ?? []),
+    [userInfo?.menus],
+  );
+
+  if (!userInfo) return null;
+
+  if (!hasConsoleAccess(userInfo)) {
+    return <Navigate to={WEB_HOME_PATH} replace />;
+  }
+
+  const currentPath = location.pathname.replace(/\/$/, "") || WEB_HOME_PATH;
+  const shouldRedirectToFirstMenu =
+    currentPath === "/console" ||
+    (menuPaths.length > 0 ? !menuPaths.includes(currentPath) : currentPath !== firstConsolePath);
+
+  if (shouldRedirectToFirstMenu && currentPath !== firstConsolePath) {
+    return <Navigate to={firstConsolePath} replace />;
+  }
   return (
     <SidebarProvider storageKey="layout-console-sidebar" className="bd-console-layout h-dvh">
       <AppSidebar />

packages/client/src/pages/login/index.tsx

@@ -1,18 +1,41 @@
+import {
+  getFirstConsoleMenuPath,
+  hasConsoleAccess,
+  WEB_HOME_PATH,
+} from "@buildingai/services/shared";
 import { useAuthStore, useConfigStore } from "@buildingai/stores";
 import SvgIcons from "@buildingai/ui/components/svg-icons";
 import { Navigate, useSearchParams } from "react-router-dom";
 
 import { LoginForm } from "./_components/login-form";
 
+function isAbsoluteHttpUrl(target: string) {
+  return /^https?:\/\//i.test(target);
+}
+
+function isConsoleTarget(target: string) {
+  if (!target) return false;
+  const pathname = isAbsoluteHttpUrl(target) ? new URL(target).pathname : target;
+  return pathname === "/console" || pathname.startsWith("/console/");
+}
+
 const LoginPage = () => {
   const [searchParams] = useSearchParams();
+  const { userInfo } = useAuthStore((state) => state.auth);
   const { isLogin } = useAuthStore((state) => state.authActions);
   const { websiteConfig } = useConfigStore((state) => state.config);
   const redirect = searchParams.get("redirect") ?? "";
 
   if (isLogin()) {
-    const target = redirect || "/console/dashboard";
-    if (target.startsWith("http")) {
+    if (!userInfo) return null;
+
+    if (!hasConsoleAccess(userInfo)) {
+      const target = redirect && !isConsoleTarget(redirect) ? redirect : WEB_HOME_PATH;
+      return <Navigate to={target} replace />;
+    }
+
+    const target = redirect || getFirstConsoleMenuPath(userInfo.menus ?? []);
+    if (isAbsoluteHttpUrl(target)) {
       const url = new URL(target);
       if (url.port && url.pathname.includes("/extension/")) {
         const token = useAuthStore.getState().auth.token;