fix: tests

Author: sattvikc

supertokens_python/recipe/oauth2provider/interfaces.py

@@ -259,11 +259,13 @@ def from_json(json: Dict[str, Any]):
         )
 
     def to_json(self) -> Dict[str, Any]:
-        return {
+        result = {
             "status": "OK",
             "clients": [client.to_json() for client in self.clients],
-            "nextPaginationToken": self.next_pagination_token,
         }
+        if self.next_pagination_token is not None:
+            result["nextPaginationToken"] = self.next_pagination_token
+        return result
 
 
 class GetOAuth2ClientOkResult:
@@ -920,7 +922,7 @@ def to_json(self) -> Dict[str, Any]:
             result["audience"] = self.audience
         if not isinstance(self.grant_types, NotSet):
             result["grantTypes"] = self.grant_types
-        if self.response_types is not None:
+        if not isinstance(self.response_types, NotSet):
             result["responseTypes"] = self.response_types
         if not isinstance(self.client_uri, NotSet):
             result["clientUri"] = self.client_uri

supertokens_python/recipe/oauth2provider/recipe_implementation.py

@@ -25,6 +25,9 @@
 from supertokens_python.recipe.openid.recipe import OpenIdRecipe
 from supertokens_python.recipe.session.interfaces import SessionContainer
 from supertokens_python.recipe.session.jwks import get_latest_keys
+from supertokens_python.recipe.session.jwt import (
+    parse_jwt_without_signature_verification,
+)
 from supertokens_python.recipe.session.recipe import SessionRecipe
 from supertokens_python.types import RecipeUserId, User
 
@@ -543,7 +546,7 @@ async def get_oauth2_clients(
                 clients=[
                     OAuth2Client.from_json(client) for client in response["clients"]
                 ],
-                next_pagination_token=response["nextPaginationToken"],
+                next_pagination_token=response.get("nextPaginationToken"),
             )
 
         return ErrorOAuth2Response(
@@ -632,9 +635,11 @@ async def validate_oauth2_access_token(
         check_database: Optional[bool],
         user_context: Dict[str, Any],
     ) -> Dict[str, Any]:
+        access_token_obj = parse_jwt_without_signature_verification(token)
+
         # Verify token signature using session recipe's JWKS
         session_recipe = SessionRecipe.get_instance()
-        matching_keys = get_latest_keys(session_recipe.config)
+        matching_keys = get_latest_keys(session_recipe.config, access_token_obj.kid)
         err: Optional[Exception] = None
 
         payload: Dict[str, Any] = {}

tests/test-server/oauth2provider.py

@@ -13,7 +13,7 @@ def get_oauth2_clients_api():  # type: ignore
         assert request.json is not None
         print("OAuth2Provider:getOAuth2Clients", request.json)
 
-        data = request.json
+        data = request.json.get("input", {})
         if data is None:
             return jsonify({"status": "MISSING_DATA_ERROR"})
 
@@ -52,9 +52,11 @@ def delete_oauth2_client_api():  # type: ignore
         assert request.json is not None
         print("OAuth2Provider:deleteOAuth2Client", request.json)
 
+        data = request.json.get("input", {})
+
         response = OAuth2Provider.delete_oauth2_client(
-            client_id=request.json["input"],
-            user_context=request.json.get("userContext"),
+            client_id=data.get("clientId"),
+            user_context=data.get("userContext"),
         )
         return jsonify(response.to_json())
 
@@ -75,7 +77,7 @@ def validate_oauth2_access_token_api():  # type: ignore
             check_database=request.json.get("checkDatabase"),
             user_context=request.json.get("userContext"),
         )
-        return jsonify({**response, "status": "OK"})
+        return jsonify({"payload": response, "status": "OK"})
 
     @app.route("/test/oauth2provider/validateoauth2refreshtoken", methods=["POST"])  # type: ignore
     def validate_oauth2_refresh_token_api():  # type: ignore

tests/test-server/session.py

@@ -195,6 +195,31 @@ def merge_into_access_token_payload_on_session_object():  # type: ignore
             }
         )
 
+    @app.route("/test/session/sessionobject/revokesession", methods=["POST"])  # type: ignore
+    def revoke_session():  # type: ignore
+        data = request.json
+        if data is None:
+            return jsonify({"status": "MISSING_DATA_ERROR"})
+
+        log_override_event("sessionobject.revokesession", "CALL", data)
+
+        try:
+            session = convert_session_to_container(data)
+            if not session:
+                raise Exception(
+                    "This should never happen: failed to deserialize session"
+                )
+            ret_val = session.sync_revoke_session(data.get("userContext", {}))
+            response = {
+                "retVal": ret_val,
+                "updatedSession": convert_session_to_json(session),
+            }
+            log_override_event("sessionobject.revokesession", "RES", ret_val)
+            return jsonify(response)
+        except Exception as e:
+            log_override_event("sessionobject.revokesession", "REJ", e)
+            return jsonify({"status": "ERROR", "message": str(e)}), 500
+
     @app.route("/test/session/mergeintoaccesspayload", methods=["POST"])  # type: ignore
     def merge_into_access_payload():  # type: ignore
         data = request.json