Merge branch 'hngprojects:dev' into fix/reset-password

hngprojects · Aug 13, 2024 · 59063d4 · 59063d4
2 parents 3449d20 + 700ef58
commit 59063d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/api/v1/routes/auth.py b/api/v1/routes/auth.py
@@ -274,7 +274,7 @@ def request_magic_link(
 ):
     user = user_service.fetch_by_email(db=db, email=request.email)
     magic_link_token = user_service.create_access_token(user_id=user.id)
-    magic_link = f"https://anchor-python.teams.hng.tech/login?token={magic_link_token}"
+    magic_link = f"https://anchor-python.teams.hng.tech/magic-link/verify?token={magic_link_token}"
 
     background_tasks.add_task(
         send_magic_link,

diff --git a/api/v1/services/organisation.py b/api/v1/services/organisation.py
@@ -312,7 +312,7 @@ def retrieve_user_organizations(self, user: User,
         """
         user_organisations = db.query(Organisation).join(
             user_organisation_association,
-            user_organisation_association.c.user_id == user.id
+            Organisation.id == user_organisation_association.c.organisation_id
         ).filter(
             user_organisation_association.c.user_id == user.id
         ).all()