3 files changed, 22 insertions, 9 deletions
diff --git a/jb/api/auth.py b/jb/api/auth.py
index 3481b30..a92515d 100644
--- a/jb/api/auth.py
+++ b/jb/api/auth.py
@@ -8,7 +8,8 @@ from fastapi import Depends, HTTPException, Request, Response, status
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 
 from jb.config import settings
-from jb.decorators import gr_api_manager
+from jb.dependencies import get_gr_api_manager
+from jb.managers.gr_api import GRApiManager
 from jb.models.auth import User
 
 bearer = HTTPBearer(auto_error=False)
@@ -22,6 +23,7 @@ JWT_AUDIENCE = "jamesbillings67"
 def get_authenticated_user(
     request: Request,
     credentials: Annotated[HTTPAuthorizationCredentials | None, Depends(bearer)],
+    gr_api: Annotated[GRApiManager, Depends(get_gr_api_manager)],
 ) -> User:
     """FastAPI dependency for endpoints requiring a valid session."""
     if settings.session_jwt_secret is None:
@@ -65,7 +67,7 @@ def get_authenticated_user(
         )
     product_user_id = claims.get("sub")
 
-    user = gr_api_manager.get_user(product_user_id=product_user_id)
+    user = gr_api.get_user(product_user_id=product_user_id)
 
     return user
 
@@ -86,4 +88,3 @@ def create_session(product_user_id: str) -> str:
         algorithm="HS256",
     )
 
-
diff --git a/jb/dependencies.py b/jb/dependencies.py
new file mode 100644
index 0000000..b9577bc
--- /dev/null
+++ b/jb/dependencies.py
@@ -0,0 +1,8 @@
+"""FastAPI dependency providers shared by application routes."""
+
+from jb.decorators import gr_api_manager
+from jb.managers.gr_api import GRApiManager
+
+
+def get_gr_api_manager() -> GRApiManager:
+    return gr_api_manager
diff --git a/jb/views/auth.py b/jb/views/auth.py
index 06dbdde..33c9452 100644
--- a/jb/views/auth.py
+++ b/jb/views/auth.py
@@ -18,12 +18,12 @@ from jb.api.auth import (
 )
 from jb.api.magic_token import consume_magic_token, create_magic_token
 from jb.config import settings
-from jb.decorators import gr_api_manager
+from jb.dependencies import get_gr_api_manager
+from jb.managers.gr_api import GRApiManager
 from jb.models.auth import (
-    MagicLinkExchangeRequest,
     AccountLogin,
+    MagicLinkExchangeRequest,
     User,
-    email_to_product_user_id,
 )
 from jb.settings import BASE_HTML
 
@@ -58,13 +58,17 @@ def magic_link_landing_page() -> HTMLResponse:
 
 
 @auth_router.post("/magic-link/exchange", status_code=status.HTTP_204_NO_CONTENT)
-def exchange_magic_link(body: MagicLinkExchangeRequest, response: Response) -> None:
+def exchange_magic_link(
+    body: MagicLinkExchangeRequest,
+    response: Response,
+    gr_api: Annotated[GRApiManager, Depends(get_gr_api_manager)],
+) -> None:
     """Exchange a magic link only after its landing page makes an explicit POST."""
     user_email = consume_magic_token(body.token)
 
-    user = User.model_validate({'email': user_email})
+    user = User.model_validate({"email": user_email})
     # hit thl to make sure this user exists
-    user = gr_api_manager.ensure_user_exists(user)
+    user = gr_api.ensure_user_exists(user)
 
     session_token = create_session(user.product_user_id)
     response.set_cookie(