fix: 收口依赖兼容与会话撤销

为 miniprogram-ci 和 Jimp 依赖增加兼容 patch 与 smoke test;修复平台模板管理员路由漏配;收紧模板契约校验;为 admin/customer 增加 token 撤销和集中会话存储;同步品牌切换角色、doctor source hash、多屏宽截图证据和 CI 构建门禁。
This commit is contained in:
que01 committed 2026-10-18 23:43:25 +08:00
1 parent 4f0b50c7f1
commit 3017e3eb49
65 files changed
+1623 -975

No files matched your search

+8 -2
View File
@@ -12,6 +12,7 @@ import {
} from "@ant-design/icons";
import { useLocation, useNavigate } from "react-router-dom";
import { createApiClient } from "../lib/api.js";
import { saveAdminSession } from "../lib/auth-storage.js";
import { BrandMark } from "../components/BrandMark.js";
import { StatusTag } from "../components/StatusTag.js";
import {
@@ -43,7 +44,7 @@ export function Dashboard({
}: {
onLogout: () => void;
role: string;
platformTemplateRole: string;
platformTemplateRole: "none" | "template_admin";
}) {
const navigate = useNavigate();
const location = useLocation();
@@ -58,7 +59,12 @@ export function Dashboard({
const switchBrand = async (brandId: string) => {
try {
const result = await createApiClient().switchAdminBrand(brandId);
localStorage.setItem("adminToken", result.token);
saveAdminSession({
token: result.token,
role: result.role,
platformTemplateRole,
mustChangePassword: false,
});
window.location.reload();
} catch (error) {
message.error(error instanceof Error ? error.message : "品牌切换失败");
+14 -12
View File
@@ -3,16 +3,17 @@ import { ChangePassword, Login } from "../features/auth/AuthPages.js";
import { Dashboard } from "./Dashboard.js";
import { AdminRouter } from "./AdminRouter.js";
import { adminMessage as message } from "../components/AdminMessage.js";
import { createApiClient } from "../lib/api.js";
import { clearAdminSession, readAdminSession } from "../lib/auth-storage.js";
export function Root() {
const [loggedIn, setLoggedIn] = useState(Boolean(localStorage.getItem("adminToken")));
const [role, setRole] = useState(localStorage.getItem("adminRole") || "owner");
const initialSession = readAdminSession();
const [loggedIn, setLoggedIn] = useState(initialSession.loggedIn);
const [role, setRole] = useState(initialSession.role);
const [platformTemplateRole, setPlatformTemplateRole] = useState(
localStorage.getItem("adminPlatformTemplateRole") || "none",
);
const [mustChangePassword, setMustChangePassword] = useState(
localStorage.getItem("adminMustChangePassword") === "true",
initialSession.platformTemplateRole,
);
const [mustChangePassword, setMustChangePassword] = useState(initialSession.mustChangePassword);
React.useEffect(() => {
const expire = () => {
message.warning("登录状态已失效,请重新登录");
@@ -21,12 +22,13 @@ export function Root() {
window.addEventListener("admin-auth-expired", expire);
return () => window.removeEventListener("admin-auth-expired", expire);
}, []);
const logout = () => {
localStorage.removeItem("adminToken");
localStorage.removeItem("adminRole");
localStorage.removeItem("adminPlatformTemplateRole");
localStorage.removeItem("adminMustChangePassword");
setLoggedIn(false);
const logout = async () => {
try {
await createApiClient().logoutAdmin();
} finally {
clearAdminSession();
setLoggedIn(false);
}
};
if (!loggedIn)
return (
+4 -5
View File
@@ -1,7 +1,8 @@
import { CloudUploadOutlined, DeleteOutlined, PictureOutlined } from "@ant-design/icons";
import { Alert, Button, Image, Popconfirm, Spin, Upload, message } from "antd";
import { useEffect, useMemo, useState } from "react";
import { apiBaseUrl, createApiClient } from "../lib/api.js";
import { apiBaseUrl, authenticatedFetch, createApiClient } from "../lib/api.js";
import { readAdminToken } from "../lib/auth-storage.js";
interface ImageUrlFieldProps {
id?: string;
@@ -54,13 +55,11 @@ export function ImageUrlField({ id, value, onChange, placeholder, scope }: Image
const uploadUrl = isLocalUpload
? `${apiBaseUrl.replace(/\/$/, "")}${presign.uploadUrl}`
: presign.uploadUrl;
const response = await fetch(uploadUrl, {
const response = await authenticatedFetch(uploadUrl, {
method: "PUT",
headers: {
"content-type": file.type,
...(isLocalUpload
? { authorization: `Bearer ${localStorage.getItem("adminToken") ?? ""}` }
: {}),
...(isLocalUpload ? { authorization: `Bearer ${readAdminToken() ?? ""}` } : {}),
},
body: file,
});
+3 -5
View File
@@ -1,5 +1,6 @@
import { useState } from "react";
import { createApiClient } from "../../lib/api.js";
import { markAdminPasswordChanged, saveAdminSession } from "../../lib/auth-storage.js";
import { BrandMark } from "../../components/BrandMark.js";
import { adminMessage as message } from "../../components/AdminMessage.js";
import { AdminButton } from "../../components/AdminButton.js";
@@ -21,10 +22,7 @@ export function Login({
setLoading(true);
try {
const result = await createApiClient().loginAdmin(values.username, values.password);
localStorage.setItem("adminToken", result.token);
localStorage.setItem("adminRole", result.role);
localStorage.setItem("adminPlatformTemplateRole", result.platformTemplateRole);
localStorage.setItem("adminMustChangePassword", String(result.mustChangePassword));
saveAdminSession(result);
onLogin(result);
} catch (error) {
message.error(error instanceof Error ? error.message : "登录失败");
@@ -81,7 +79,7 @@ export function ChangePassword({ onComplete }: { onComplete: () => void }) {
setLoading(true);
try {
await createApiClient().changeAdminPassword(values.currentPassword, values.newPassword);
localStorage.setItem("adminMustChangePassword", "false");
markAdminPasswordChanged();
message.success("密码已更新");
onComplete();
} catch (error) {
+3 -2
View File
@@ -1,4 +1,5 @@
import { ApiClient } from "@personal-brand/api-client";
import { clearAdminSession, readAdminToken } from "./auth-storage.js";
export const apiBaseUrl = import.meta.env.VITE_API_BASE_URL ?? "/api";
export async function authenticatedFetch(
@@ -7,13 +8,13 @@ export async function authenticatedFetch(
): Promise<Response> {
const response = await fetch(input, init);
if (response.status === 401) {
localStorage.removeItem("adminToken");
clearAdminSession();
window.dispatchEvent(new Event("admin-auth-expired"));
}
return response;
}
export function createApiClient(): ApiClient {
const token = localStorage.getItem("adminToken");
const token = readAdminToken();
return new ApiClient({
baseUrl: apiBaseUrl,
...(token ? { token } : {}),
+48
View File
@@ -0,0 +1,48 @@
export type StoredAdminSession = {
token: string;
role: string;
platformTemplateRole: "none" | "template_admin";
mustChangePassword: boolean;
};
const tokenKey = "adminToken";
const roleKey = "adminRole";
const platformRoleKey = "adminPlatformTemplateRole";
const mustChangePasswordKey = "adminMustChangePassword";
export function saveAdminSession(session: StoredAdminSession): void {
localStorage.setItem(tokenKey, session.token);
localStorage.setItem(roleKey, session.role);
localStorage.setItem(platformRoleKey, session.platformTemplateRole);
localStorage.setItem(mustChangePasswordKey, String(session.mustChangePassword));
}
export function readAdminToken(): string | null {
return localStorage.getItem(tokenKey);
}
export function readAdminSession(): {
loggedIn: boolean;
role: string;
platformTemplateRole: "none" | "template_admin";
mustChangePassword: boolean;
} {
return {
loggedIn: Boolean(localStorage.getItem(tokenKey)),
role: localStorage.getItem(roleKey) || "owner",
platformTemplateRole:
localStorage.getItem(platformRoleKey) === "template_admin" ? "template_admin" : "none",
mustChangePassword: localStorage.getItem(mustChangePasswordKey) === "true",
};
}
export function markAdminPasswordChanged(): void {
localStorage.setItem(mustChangePasswordKey, "false");
}
export function clearAdminSession(): void {
localStorage.removeItem(tokenKey);
localStorage.removeItem(roleKey);
localStorage.removeItem(platformRoleKey);
localStorage.removeItem(mustChangePasswordKey);
}