fix(navbar): refresh auth state

layouts/partials/navbar.html

@@ -276,6 +276,7 @@
 
   const cloudAppUrl = "{{ $cloudAppUrl }}";
   let isUserAuthenticated = false;
+  let isCheckingAuth = false;
   let expiredToken = "";
 
   function removeCookie(cookieName) {
@@ -293,25 +294,51 @@
     return null;
   }
 
-  const checkUserAuth = async () => {
+  function getAccessToken() {
+    const tokenCookie = getCookieValue("provider_token");
+    if (!tokenCookie) {
+      return null;
+    }
+
     try {
-     const token = getCookieValue("provider_token");
-      if (!token || token === expiredToken) { // cookie doesn't exist or has expired (due to user logout)
-        if (isUserAuthenticated) {
-          showSignInButton();
-          isUserAuthenticated = false;
-        }
-      throw new Error("missing or expired cookie");
+      const parsedToken = JSON.parse(atob(tokenCookie));
+      return parsedToken?.access_token || tokenCookie;
+    } catch (error) {
+      return tokenCookie;
     }
-      const re = await fetch(`${cloudAppUrl}/api/identity/users/profile`, {
+  }
+
+  const checkUserAuth = async () => {
+    if (isCheckingAuth) {
+      return;
+    }
+
+    isCheckingAuth = true;
+    try {
+      const accessToken = getAccessToken();
+
+      const requestOptions = {
         method: 'GET',
-        headers: {
-          'Authorization': `Bearer ${token}`,
-        },
-      });
+        credentials: 'include',
+      };
+
+      if (accessToken && accessToken !== expiredToken) {
+        requestOptions.headers = {
+          'Authorization': `Bearer ${accessToken}`,
+        };
+      }
+
+      let re = await fetch(`${cloudAppUrl}/api/identity/users/profile`, requestOptions);
+
+      if (re.status === 401 && accessToken && accessToken !== expiredToken) {
+        expiredToken = accessToken;
+        re = await fetch(`${cloudAppUrl}/api/identity/users/profile`, {
+          method: 'GET',
+          credentials: 'include',
+        });
+      }
 
-      if (re.status === 401) { // cookie has expired
-        expiredToken = token;
+      if (re.status === 401) {
         throw new Error("unauthorized");
       }
       if (re.status !== 200) {
@@ -322,8 +349,9 @@
       updateUI(response);
 
   } catch (error) {
-    // console.error("could not set user details.", error);
     showSignInButton();
+  } finally {
+    isCheckingAuth = false;
   }
 };
   function getAvatarUrl(response) {
@@ -333,7 +361,7 @@
   }
 
   function getUserProfileUrl(response) {
-    const userId = response?.id;
+    const userId = response?.userId || response?.id;
     if (userId) {
       return `${cloudAppUrl}/user/${encodeURIComponent(userId)}`;
     }
@@ -372,5 +400,7 @@
   checkUserAuth();
 
   document.addEventListener('visibilitychange', handleVisibilityChange);
+  window.addEventListener('focus', handleVisibilityChange);
+  window.addEventListener('pageshow', handleVisibilityChange);
   </script>
 </header>