@0xchain/header 1.1.0-beta.47 → 1.1.0-beta.48

package/dist/index.js

@@ -5,6 +5,7 @@ import Right, { HeaderSource } from "./lib/Right.js";
 import Logo from "./lib/Logo.js";
 import { cookies } from "next/headers";
 import { HeaderProvider } from "./lib/context.js";
+import { createSessionFromCookieGetter } from "@0xchain/auth";
 import { USER_EVENTS, emitUserEvent, onUserEvent } from "./lib/events.js";
 async function HeaderBar({
   extra,
@@ -21,9 +22,10 @@ async function HeaderBar({
   if (brand !== "CHAINDIGG") {
     try {
       const cookieStore = await cookies();
-      const tokenExpire = cookieStore.get("refresh_token")?.value;
-      const hasTokenExpire = typeof tokenExpire !== "undefined" && tokenExpire !== "";
-      if (hasTokenExpire) {
+      const session = createSessionFromCookieGetter(
+        (key) => cookieStore.get(key)?.value ?? null
+      );
+      if (session.isLoggedIn) {
         try {
           userInfo = await request.get("/v2/users/profile", {
             baseURL: process.env.AUTH_INNER_API_URL

package/dist/lib/Nav.js

@@ -10,8 +10,8 @@ import { useLocale } from "@0xchain/i18n/react";
 import Logout from "./User/Logout.js";
 import { useState, useCallback, useEffect } from "react";
 import SignIn from "./User/SignIn.js";
-import { fetchUserProfile } from "@0xchain/auth";
-import { onUserEvent, USER_EVENTS, cleanUserEvent } from "./events.js";
+import { getRuntimeLoginState } from "@0xchain/auth";
+import { onUserEvent, USER_EVENTS } from "./events.js";
 import { usePathname } from "next/navigation";
 import Explorer from "./Explorer.js";
 import Products from "./Products.js";
@@ -100,22 +100,37 @@ function Nav({ onClick = () => void 0, hideNews = false, hideLogin = false, user
     }
   ];
   const NavList = isChaindigg ? chaindiggNavList : ichaingoNavList;
-  const updateUserInfo = useCallback(() => {
-    return new Promise((resolve) => {
-      fetchUserProfile().then((res) => {
-        setUserInfo(res);
-        setUserKey((/* @__PURE__ */ new Date()).getTime().toString());
-        resolve(res);
+  const updateUserInfo = useCallback(async () => {
+    try {
+      const response = await fetch("/api/auth/profile", {
+        credentials: "include",
+        cache: "no-store"
       });
-    });
+      if (!response.ok) {
+        throw new Error(`Failed to load profile: ${response.status}`);
+      }
+      const res = await response.json();
+      setUserInfo(res || {});
+      setUserKey((/* @__PURE__ */ new Date()).getTime().toString());
+      return res;
+    } catch (error) {
+      console.error(error);
+      setUserInfo({});
+      return null;
+    }
   }, []);
   useEffect(() => {
     if (isChaindigg) return;
-    onUserEvent(USER_EVENTS.PROFILE_UPDATED, updateUserInfo);
+    const cleanProfileUpdated = onUserEvent(USER_EVENTS.PROFILE_UPDATED, updateUserInfo);
+    const cleanLoggedIn = onUserEvent(USER_EVENTS.LOGGED_IN, updateUserInfo);
+    if (!userInfo?.id && getRuntimeLoginState() === true) {
+      updateUserInfo();
+    }
     return () => {
-      cleanUserEvent(USER_EVENTS.PROFILE_UPDATED, updateUserInfo);
+      cleanProfileUpdated();
+      cleanLoggedIn();
     };
-  }, [isChaindigg]);
+  }, [isChaindigg, updateUserInfo, userInfo?.id]);
   if (isChaindigg) {
     return /* @__PURE__ */ jsxs(
       "nav",

package/dist/lib/events.js

@@ -15,12 +15,8 @@ function onUserEvent(eventName, callback) {
   window.addEventListener(eventName, handler);
   return () => window.removeEventListener(eventName, handler);
 }
-function cleanUserEvent(type, handler) {
-  window.removeEventListener(type, handler);
-}
 export {
   USER_EVENTS,
-  cleanUserEvent,
   emitUserEvent,
   onUserEvent
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xchain/header",
-  "version": "1.1.0-beta.47",
+  "version": "1.1.0-beta.48",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -42,19 +42,19 @@
     "tailwind-merge": "3.3.1"
   },
   "dependencies": {
-    "@0xchain/i18n": "1.1.0-beta.46",
-    "@0xchain/auth": "1.1.0-beta.46",
-    "@0xchain/avatar": "1.1.0-beta.46",
-    "@0xchain/link": "1.1.0-beta.46",
-    "@0xchain/translation": "1.1.0-beta.46",
-    "@0xchain/iconfont": "1.1.0-beta.46",
-    "@0xchain/theme-toggle": "1.1.0-beta.46",
-    "@0xchain/ui": "1.1.0-beta.46",
-    "@0xchain/better-link": "1.1.0-beta.46",
-    "@0xchain/with-login": "1.1.0-beta.46",
-    "@0xchain/image": "1.1.0-beta.46",
-    "@0xchain/tooltip": "1.1.0-beta.46",
-    "@0xchain/request": "1.1.0-beta.46"
+    "@0xchain/i18n": "1.1.0-beta.48",
+    "@0xchain/auth": "1.1.0-beta.48",
+    "@0xchain/avatar": "1.1.0-beta.48",
+    "@0xchain/better-link": "1.1.0-beta.48",
+    "@0xchain/link": "1.1.0-beta.48",
+    "@0xchain/translation": "1.1.0-beta.48",
+    "@0xchain/ui": "1.1.0-beta.48",
+    "@0xchain/theme-toggle": "1.1.0-beta.48",
+    "@0xchain/iconfont": "1.1.0-beta.48",
+    "@0xchain/image": "1.1.0-beta.48",
+    "@0xchain/request": "1.1.0-beta.48",
+    "@0xchain/with-login": "1.1.0-beta.48",
+    "@0xchain/tooltip": "1.1.0-beta.48"
   },
   "nx": {
     "tags": [