add refresh token logic (wip)

src/backend/routers/auth.py

@@ -46,6 +46,11 @@ def get_strategies() -> list[ListAuthStrategy]:
                     if hasattr(strategy_instance, "get_authorization_endpoint")
                     else None
                 ),
+                "refresh_token_params": (
+                    strategy_instance.get_refresh_token_params()
+                    if hasattr(strategy_instance, "get_refresh_token_params")
+                    else None
+                ),
             }
         )
 
@@ -94,7 +99,7 @@ async def login(request: Request, login: Login, session: DBSessionDep):
             detail=f"Error performing {strategy_name} authentication with payload: {payload}.",
         )
 
-    token = JWTService().create_and_encode_jwt(user)
+    token = JWTService().create_and_encode_jwt(user, strategy_name)
 
     return {"token": token}
 
@@ -188,6 +193,6 @@ async def authorize(
     # Get or create user, then set session user
     user = get_or_create_user(session, userinfo)
 
-    token = JWTService().create_and_encode_jwt(user)
+    token = JWTService().create_and_encode_jwt(user, strategy_name)
 
     return {"token": token}

src/backend/services/auth/jwt.py

@@ -25,7 +25,7 @@ def __init__(self):
 
         self.secret_key = secret_key
 
-    def create_and_encode_jwt(self, user: dict) -> str:
+    def create_and_encode_jwt(self, user: dict, strategy_name: str) -> str:
         """
         Creates a payload based on user info and creates a JWT token.
 
@@ -41,6 +41,7 @@ def create_and_encode_jwt(self, user: dict) -> str:
             "iat": now,
             "exp": now + datetime.timedelta(hours=self.EXPIRY_HOURS),
             "jti": str(uuid.uuid4()),
+            "strategy": strategy_name,
             "context": user,
         }
 

src/backend/services/auth/strategies/base.py

@@ -63,6 +63,14 @@ def get_authorization_endpoint(self, **kwargs: Any):
         """
         ...
 
+    @abstractmethod
+    def get_refresh_token_params(self, **kwargs: Any):
+        """
+        Retrieves the OAuth app's refresh token query parameters,
+        returned in dict format.
+        """
+        ...
+
     @abstractmethod
     async def get_endpoints(self, **kwargs: Any):
         """

src/backend/services/auth/strategies/google_oauth.py

@@ -40,6 +40,9 @@ def get_client_id(self):
     def get_authorization_endpoint(self):
         return self.AUTHORIZATION_ENDPOINT
 
+    def get_refresh_token_params(self):
+        return {"access_type": "offline", "prompt": "consent"}
+
     async def get_endpoints(self):
         response = requests.get(self.WELL_KNOWN_ENDPOINT)
         endpoints = response.json()
@@ -68,6 +71,10 @@ async def authorize(self, request: Request) -> dict | None:
             authorization_response=str(request.url),
             redirect_uri=self.REDIRECT_URI,
         )
+
+        import pdb
+
+        pdb.set_trace()
         user_info = self.client.get(self.USERINFO_ENDPOINT)
 
         return user_info.json()

src/backend/services/auth/strategies/oidc.py

@@ -42,6 +42,9 @@ def get_client_id(self):
     def get_authorization_endpoint(self):
         return self.AUTHORIZATION_ENDPOINT
 
+    def get_refresh_token_params(self):
+        return None
+
     async def get_endpoints(self):
         response = requests.get(self.WELL_KNOWN_ENDPOINT)
         endpoints = response.json()

src/backend/tests/routers/auth/test_authorization_header.py

@@ -18,7 +18,7 @@ def test_validate_authorization_valid_token(
     session_client: TestClient,
 ):
     user = {"user_id": "test"}
-    token = JWTService().create_and_encode_jwt(user)
+    token = JWTService().create_and_encode_jwt(user, "")
 
     # Use /logout endpoint to test request validator
     response = session_client.get(
@@ -68,7 +68,7 @@ def test_validate_authorization_invalid_token():
 def test_validate_authorization_expired_token():
     user = {"user_id": "test"}
     with freezegun.freeze_time("2024-01-01 00:00:00"):
-        token = JWTService().create_and_encode_jwt(user)
+        token = JWTService().create_and_encode_jwt(user, "")
 
     request_mock = MagicMock(headers={"Authorization": f"Bearer {token}"})
 
@@ -85,7 +85,7 @@ def test_validate_authorization_blacklisted_token(
     session_client: TestClient, session: Session
 ):
     user = {"user_id": "test"}
-    token = JWTService().create_and_encode_jwt(user)
+    token = JWTService().create_and_encode_jwt(user, "")
     decoded = JWTService().decode_jwt(token)
 
     # Create a Blacklist entry

src/backend/tests/routers/auth/test_basic_auth.py

@@ -86,7 +86,7 @@ def test_login_no_payload(session_client: TestClient):
 
 def test_logout_success(session_client: TestClient, session: Session):
     user = {"user_id": "test"}
-    token = JWTService().create_and_encode_jwt(user)
+    token = JWTService().create_and_encode_jwt(user, "")
     decoded = JWTService().decode_jwt(token)
 
     response = session_client.get(