From 9b6fed0e42a658780762b8ee10953f35dc100394 Mon Sep 17 00:00:00 2001
From: Andrew Smith <a.smith@silentworks.co.uk>
Date: Thu, 16 Nov 2023 12:21:38 +0000
Subject: [PATCH] Update with get_user

---
 app/decorators.py |  4 ++--
 app/supabase.py   | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/decorators.py b/app/decorators.py
index 691991d..06bd235 100644
--- a/app/decorators.py
+++ b/app/decorators.py
@@ -2,14 +2,14 @@
 from typing import Union
 from flask import redirect, session, url_for, request
 from gotrue.errors import AuthApiError, AuthRetryableError
-from gotrue.types import User
+from gotrue.types import UserResponse
 from app.supabase import get_profile_by_user, supabase
 
 
 def login_required(f):
     @wraps(f)
     def decorated(*args, **kwargs):
-        user: Union[User, None] = None
+        user: Union[UserResponse, None] = None
         try:
             user = supabase.auth.get_user()
         except AuthApiError as exception:
diff --git a/app/supabase.py b/app/supabase.py
index a648046..59d430a 100644
--- a/app/supabase.py
+++ b/app/supabase.py
@@ -27,7 +27,8 @@ def get_supabase() -> Client:
 
 def user_context_processor():
     try:
-        user = supabase.auth.get_user()
+        resp = supabase.auth.get_user()
+        user = resp.user if resp is not None else None
         return dict(user=user, app_name=app_name)
     except (AuthApiError, AuthRetryableError):
         return dict(user=None, app_name=app_name)
@@ -58,8 +59,8 @@ def get_profile(user_or_slug: Union[User, str]):
 
 
 def get_profile_by_user():
-    user = supabase.auth.get_user()
-    return get_profile(user)
+    resp = supabase.auth.get_user()
+    return get_profile(resp.user)
 
 
 def get_profile_by_slug(slug: str):
@@ -90,8 +91,8 @@ def get_notes(user_or_user_id: Union[User, str], public_only: bool = False):
 
 
 def get_notes_by_user():
-    user = supabase.auth.get_user()
-    return get_notes(user)
+    resp = supabase.auth.get_user()
+    return get_notes(resp.user)
 
 
 def get_all_notes_by_user_id(user_id: str):
@@ -135,8 +136,8 @@ def get_note(user_or_slug: Union[User, str], id: str):
 
 
 def get_note_by_user_and_id(id: str):
-    user = supabase.auth.get_user()
-    return get_note(user, id)
+    resp = supabase.auth.get_user()
+    return get_note(resp.user, id)
 
 
 def get_note_by_slug(slug: str):