feat: persist current workspace in user sessions

2026-03-31 15:17:07 +03:00
parent 84f4437ce0
commit 86b61523bd
15 changed files with 331 additions and 57 deletions
@@ -24,9 +24,29 @@
  }

  function primaryMembership(session) {
-    return session && session.memberships && session.memberships.length
-      ? session.memberships[0]
-      : null;
+    if (!(session && session.memberships && session.memberships.length)) {
+      return null;
+    }
+    if (session.current_workspace_id) {
+      var currentMembership = session.memberships.find(function(item) {
+        return item.workspace && item.workspace.id === session.current_workspace_id;
+      });
+      if (currentMembership) {
+        return currentMembership;
+      }
+    }
+    if (window.getCurrentWorkspace) {
+      var currentWorkspace = window.getCurrentWorkspace();
+      if (currentWorkspace) {
+        var matched = session.memberships.find(function(item) {
+          return item.workspace && item.workspace.id === currentWorkspace.id;
+        });
+        if (matched) {
+          return matched;
+        }
+      }
+    }
+    return session.memberships[0];
  }

  function initials(displayName, email) {
@@ -138,6 +158,7 @@
  window.CrankAuth = {
    fetchSession: fetchSession,
    replaceSession: replaceSession,
+    getCachedSession: function() { return sessionCache; },
    guardProtectedPage: guardProtectedPage,
    guardLoginPage: guardLoginPage,
    login: login,