deploy: update habadashi_login

app.py

@@ -136,7 +136,7 @@ class RequestLoggingMiddleware(BaseHTTPMiddleware):
 
     @staticmethod
     def _resolve_user(request: Request):
-        """User resolution from cookie. org_name is fetched once and cached per user_id."""
+        """User resolution from cookie. Full profile (incl. org_id) fetched once and cached per user_id."""
         token = request.cookies.get("sb_access_token")
         if not token:
             return None
@@ -148,18 +148,33 @@ class RequestLoggingMiddleware(BaseHTTPMiddleware):
             if user_id in _user_profile_cache:
                 return _user_profile_cache[user_id]
 
-            # 初回のみ profiles から org_name を取得
+            # 初回のみ profiles から org_id/org_name/role/display_name を全取得
             email = res.user.email
+            org_id = None
             org_name = None
+            role = None
+            display_name = None
             try:
                 profile_res = supabase.from_("profiles").select(
-                    "organizations(name)"
+                    "email, org_id, role, display_name, organizations(name)"
                 ).eq("id", user_id).single().execute()
-                org_name = (profile_res.data.get("organizations") or {}).get("name")
+                d = profile_res.data or {}
+                org_id = d.get("org_id")
+                org_name = (d.get("organizations") or {}).get("name")
+                role = d.get("role")
+                display_name = d.get("display_name")
+                email = d.get("email") or email
             except Exception as pe:
                 print(f"[ORG_CONTEXT] _resolve_user: profile fetch failed: {pe}")
-            print(f"[ORG_CONTEXT] _resolve_user: first fetch user_id={user_id} email={email} org_name={org_name!r}")
-            user_info = {"user_id": user_id, "email": email, "org_name": org_name}
+            print(f"[ORG_CONTEXT] _resolve_user: first fetch user_id={user_id} email={email} org_id={org_id!r} org_name={org_name!r}")
+            user_info = {
+                "user_id": user_id,
+                "email": email,
+                "display_name": display_name,
+                "role": role,
+                "org_id": org_id,
+                "org_name": org_name,
+            }
             _user_profile_cache[user_id] = user_info
             return user_info
         except Exception:
@@ -197,31 +212,35 @@ def handle_login(email, password):
 
 # --- Authentication Dependency ---
 def get_current_user(request: Request):
-    """Verify token from cookie and fetch user profile"""
+    """Verify token from cookie and fetch user profile (uses _user_profile_cache)"""
     token = request.cookies.get("sb_access_token")
 
     if not token:
         return None
     
     try:
-        # Verify token with Supabase
         res = supabase.auth.get_user(token)
-        user_id = res.user.id
+        user_id = str(res.user.id)
 
-        # Fetch profile from profiles table (with organization name)
+        # キャッシュがあればそれを返す（ミドルウェアが先に取得済みのはず）
+        if user_id in _user_profile_cache:
+            return _user_profile_cache[user_id]
+
+        # キャッシュ未作成の場合（直接アクセス等）はここで取得してキャッシュする
         profile_res = supabase.from_("profiles").select(
             "email, org_id, role, display_name, organizations(name)"
         ).eq("id", user_id).single().execute()
         
-        profile_data = profile_res.data
+        d = profile_res.data or {}
         user_dict = {
-            "user_id": str(user_id),
-            "email": profile_data.get("email"),
-            "display_name": profile_data.get("display_name"),
-            "role": profile_data.get("role"),
-            "org_name": (profile_data.get("organizations") or {}).get("name")
+            "user_id": user_id,
+            "email": d.get("email"),
+            "display_name": d.get("display_name"),
+            "role": d.get("role"),
+            "org_id": d.get("org_id"),
+            "org_name": (d.get("organizations") or {}).get("name"),
         }
-        
+        _user_profile_cache[user_id] = user_dict
         return user_dict
         
     except Exception as e:
@@ -263,22 +282,26 @@ if private_app_dir:
             print(f"[LOGGING] Could not import lib.logging or set_logger_callback: {e}")
         # -------------------------------
 
-        # --- Inject Org Name Getter (for HF dataset namespace) ---
+        # --- Inject Org Context Getter (for HF dataset namespace) ---
         try:
-            from lib.hf_storage import set_org_name_getter
+            from lib.hf_storage import set_org_context_getter
             from supabase_logger import get_user_context
 
             def get_org_for_storage():
-                """現在のリクエストユーザーの組織名を返す（HF dataset のネームスペース用）"""
+                """現在のリクエストユーザーの org_id/org_name を返す（HF dataset のネームスペース用）"""
                 user_ctx = get_user_context()
-                org = user_ctx.get("org_name") if user_ctx and isinstance(user_ctx, dict) else None
-                print(f"[ORG_CONTEXT] get_org_for_storage called: user_ctx_keys={list(user_ctx.keys()) if user_ctx else None} org_name={org!r}")
-                return org or None
-
-            set_org_name_getter(get_org_for_storage)
-            print("[ORG_CONTEXT] Connected org_name getter to hf_storage")
+                if user_ctx and isinstance(user_ctx, dict):
+                    org_id = user_ctx.get("org_id")
+                    org_name = user_ctx.get("org_name")
+                    print(f"[ORG_CONTEXT] get_org_for_storage: org_id={org_id!r} org_name={org_name!r}")
+                    return {"org_id": org_id, "org_name": org_name}
+                print(f"[ORG_CONTEXT] get_org_for_storage: no user_ctx")
+                return None
+
+            set_org_context_getter(get_org_for_storage)
+            print("[ORG_CONTEXT] Connected org_context getter to hf_storage")
         except ImportError as e:
-            print(f"[ORG_CONTEXT] Could not inject org_name getter: {e}")
+            print(f"[ORG_CONTEXT] Could not inject org_context getter: {e}")
         # ---------------------------------------------------------
         
         ver20_app = ver20_blocks