@huaqiu/dsh-auth 0.3.15 → 0.3.17

package/lib/client.js

@@ -89,6 +89,18 @@ window.__ModuleLoader__.load({
 						headers: { accept: "application/json" }
 					});
 					if (!res.ok) throw new Error(`auth login trigger failed: HTTP ${res.status}`);
+				},
+				async fetchUserInfo() {
+					try {
+						const res = await doFetch(`${base}/user-info`, {
+							method: "GET",
+							headers: { accept: "application/json" }
+						});
+						if (!res.ok) return null;
+						return (await res.json()).userInfo ?? null;
+					} catch {
+						return null;
+					}
 				}
 			};
 		}
@@ -767,6 +779,11 @@ window.__ModuleLoader__.load({
 					if (hostMode && !hostSessionLoaded) await resolveHost();
 					return hostMode ? hostSession : hostSession ?? storage.get();
 				},
+				getUserProfile: async () => {
+					if (hostMode && !hostSessionLoaded) await resolveHost();
+					if (!await auth.getAccessToken()) return null;
+					return transport.fetchUserInfo();
+				},
 				login: async (options) => {
 					if (hostMode) {
 						const prevToken = hostSession?.token;
@@ -780,9 +797,10 @@ window.__ModuleLoader__.load({
 				},
 				logout: async () => {
 					if (hostMode) {
-						hostSession = null;
-						storage.clear();
-						emit(null);
+						await transport.pushLogout();
+						hostSessionLoaded = false;
+						await resolveHost();
+						emit(hostSession);
 						return;
 					}
 					storage.clear();
@@ -934,6 +952,17 @@ window.__ModuleLoader__.load({
 			listeners.add(callback);
 			return () => listeners.delete(callback);
 		}
+		/**
+		* Merge the rich eda.cn profile (nickname + headimage) into the store —
+		* sidebar components call this after `auth.getUserProfile()` in host mode.
+		* The trigger then renders the real name/photo instead of the bare HQ icon.
+		*/
+		function setProfile(profile) {
+			setState({
+				...state,
+				profile: profile ?? void 0
+			});
+		}
 		/** Register the node re-sync hook (wired in apply(); called by the login card on mount). */
 		function registerAuthSync(fn) {
 			syncNow = fn;
@@ -1293,14 +1322,36 @@ window.__ModuleLoader__.load({
 			const menuRef = (0, react.useRef)(null);
 			const palette = dark ? DARK_PALETTE : LIGHT_PALETTE;
 			const authenticated = authState.authenticated;
-			const avatar = authenticated && !avatarBroken ? authState.avatar : void 0;
 			const showLabel = wide !== false;
 			const hostMode = auth?.isHostMode?.() ?? false;
 			const targetHost = hostMode ? getHqEdge()?.context?.getTargetHost?.() ?? "" : "";
 			if (hostMode && targetHost === "hq-eda") return null;
+			const profile = authState.profile;
+			(0, react.useEffect)(() => {
+				if (!hostMode || targetHost === "hq-eda") return;
+				if (!authenticated) {
+					setProfile(null);
+					return;
+				}
+				let cancelled = false;
+				auth?.getUserProfile?.().then((info) => {
+					if (cancelled) return;
+					setProfile(info);
+				}).catch(() => {});
+				return () => {
+					cancelled = true;
+				};
+			}, [
+				hostMode,
+				targetHost,
+				authenticated
+			]);
+			const displayName = profile?.nickname ?? authState.nickname;
+			const displayAvatar = profile?.headimage ?? authState.avatar;
+			const avatar = authenticated && !avatarBroken ? displayAvatar : void 0;
 			(0, react.useEffect)(() => {
 				setAvatarBroken(false);
-			}, [authState.avatar]);
+			}, [displayAvatar]);
 			(0, react.useEffect)(() => {
 				if (!authenticated) setMenuOpen(false);
 			}, [authenticated]);
@@ -1367,7 +1418,7 @@ window.__ModuleLoader__.load({
 					window.open(buildProfileUrl(info), "_blank", "noopener,noreferrer");
 				})();
 			};
-			const label = authenticated ? authState.nickname ?? t("sidebar.account") : t("sidebar.login");
+			const label = authenticated ? displayName ?? t("sidebar.account") : t("sidebar.login");
 			const title = authenticated ? t("sidebar.accountTitle") : t("sidebar.loginTitle");
 			const triggerBackground = menuOpen || hovered ? palette.hover : "transparent";
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -1434,13 +1485,13 @@ window.__ModuleLoader__.load({
 					role: "menu",
 					style: menuStyle,
 					children: [
-						authState.nickname ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						displayName ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 							style: {
 								...MENU_HEADER_BASE,
 								color: palette.muted
 							},
-							title: authState.nickname,
-							children: authState.nickname
+							title: displayName,
+							children: displayName
 						}) : null,
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(MenuItem, {
 							label: t("menu.profile"),
@@ -1455,7 +1506,7 @@ window.__ModuleLoader__.load({
 							palette,
 							onSelect: () => {
 								setMenuOpen(false);
-								auth.logout();
+								auth.logout().catch(() => {});
 							}
 						})
 					]