merge: current-workspace-session-model

# Conflicts: # TASKS.md # apps/ui/js/auth.js
2026-03-31 16:18:41 +03:00
parent 36075fe0e4 86b61523bd
commit 7b85227fae
15 changed files with 316 additions and 54 deletions
@@ -42,6 +42,14 @@
    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) {
@@ -203,6 +211,7 @@
  window.CrankAuth = {
    fetchSession: fetchSession,
    replaceSession: replaceSession,
+    getCachedSession: function() { return sessionCache; },
    guardProtectedPage: guardProtectedPage,
    guardLoginPage: guardLoginPage,
    login: login,