Skip to content

Commit

Permalink
Update with get_user
Browse files Browse the repository at this point in the history
  • Loading branch information
silentworks committed Nov 16, 2023
1 parent 88cc1ff commit 5ba853f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions app/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
15 changes: 8 additions & 7 deletions app/supabase.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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):
Expand Down

0 comments on commit 5ba853f

Please sign in to comment.