deploy: update habadashi_login
Browse files
app.py
CHANGED
|
@@ -133,16 +133,24 @@ class RequestLoggingMiddleware(BaseHTTPMiddleware):
|
|
| 133 |
|
| 134 |
@staticmethod
|
| 135 |
def _resolve_user(request: Request):
|
| 136 |
-
"""
|
| 137 |
token = request.cookies.get("sb_access_token")
|
| 138 |
if not token:
|
| 139 |
return None
|
| 140 |
try:
|
| 141 |
res = supabase.auth.get_user(token)
|
| 142 |
-
|
| 143 |
-
|
| 144 |
-
|
| 145 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 146 |
except Exception:
|
| 147 |
return None
|
| 148 |
|
|
|
|
| 133 |
|
| 134 |
@staticmethod
|
| 135 |
def _resolve_user(request: Request):
|
| 136 |
+
"""User resolution from cookie with org_name from profiles table."""
|
| 137 |
token = request.cookies.get("sb_access_token")
|
| 138 |
if not token:
|
| 139 |
return None
|
| 140 |
try:
|
| 141 |
res = supabase.auth.get_user(token)
|
| 142 |
+
user_id = str(res.user.id)
|
| 143 |
+
email = res.user.email
|
| 144 |
+
org_name = None
|
| 145 |
+
try:
|
| 146 |
+
profile_res = supabase.from_("profiles").select(
|
| 147 |
+
"organizations(name)"
|
| 148 |
+
).eq("id", user_id).single().execute()
|
| 149 |
+
org_name = (profile_res.data.get("organizations") or {}).get("name")
|
| 150 |
+
except Exception as pe:
|
| 151 |
+
print(f"[ORG_CONTEXT] _resolve_user: profile fetch failed: {pe}")
|
| 152 |
+
print(f"[ORG_CONTEXT] _resolve_user: user_id={user_id} email={email} org_name={org_name!r}")
|
| 153 |
+
return {"user_id": user_id, "email": email, "org_name": org_name}
|
| 154 |
except Exception:
|
| 155 |
return None
|
| 156 |
|