test: Fix failing tests and use url decode for token cookies

Author: KShivendu

tests/Django/test_django.py

@@ -21,6 +21,9 @@
 from django.test import RequestFactory, TestCase
 from supertokens_python import InputAppInfo, SupertokensConfig, init
 from supertokens_python.framework.django import middleware
+from supertokens_python.framework.django.django_response import (
+    DjangoResponse as SuperTokensDjangoWrapper,
+)
 from supertokens_python.recipe import emailpassword, session
 from supertokens_python.recipe.emailpassword.interfaces import APIInterface, APIOptions
 from supertokens_python.recipe.session import SessionContainer
@@ -391,18 +394,11 @@ async def test_optional_session(self):
         assert dict_response["s"] == "empty session"
 
 
-from django.http import HttpResponse
-from supertokens_python.framework.django.django_response import (
-    DjangoResponse as SuperTokensDjangoWrapper,
-)
-
-
-class SupertokensResponseTest(TestCase):
-    def test_remove_header_works(self):
-        response = HttpResponse()
-        st_response = SuperTokensDjangoWrapper(response)
+def test_remove_header_works():
+    response = HttpResponse()
+    st_response = SuperTokensDjangoWrapper(response)
 
-        st_response.set_header("foo", "bar")
-        assert st_response.get_header("foo") == "bar"
-        st_response.remove_header("foo")
-        assert st_response.get_header("foo") is None
+    st_response.set_header("foo", "bar")
+    assert st_response.get_header("foo") == "bar"
+    st_response.remove_header("foo")
+    assert st_response.get_header("foo") is None

tests/test_session.py

@@ -355,7 +355,12 @@ async def get_session_information(
 
 from supertokens_python.recipe.session.exceptions import raise_unauthorised_exception
 from supertokens_python.recipe.session.interfaces import APIInterface, APIOptions
-from tests.utils import extract_all_cookies, get_st_init_args
+from tests.utils import (
+    extract_all_cookies,
+    get_st_init_args,
+    extract_info,
+    assert_info_clears_tokens,
+)
 
 
 async def test_revoking_session_during_refresh_with_revoke_session_with_200(
@@ -402,18 +407,8 @@ async def refresh_post(api_options: APIOptions, user_context: Dict[str, Any]):
     )
 
     assert response.status_code == 200
-    cookies = extract_all_cookies(response)
-
-    assert response.headers["anti-csrf"] != ""
-    assert response.headers["front-token"] != ""
-
-    assert cookies["sAccessToken"]["value"] == ""
-    assert cookies["sRefreshToken"]["value"] == ""
-    assert cookies["sAccessToken"]["expires"] == "Thu, 01 Jan 1970 00:00:00 GMT"
-    assert cookies["sRefreshToken"]["expires"] == "Thu, 01 Jan 1970 00:00:00 GMT"
-
-    assert cookies["sAccessToken"]["domain"] == ""
-    assert cookies["sRefreshToken"]["domain"] == ""
+    info = extract_info(response)
+    assert_info_clears_tokens(info, "cookie")
 
 
 async def test_revoking_session_during_refresh_with_revoke_session_sending_401(
@@ -464,18 +459,8 @@ async def refresh_post(api_options: APIOptions, user_context: Dict[str, Any]):
     )
 
     assert response.status_code == 401
-    cookies = extract_all_cookies(response)
-
-    assert response.headers["anti-csrf"] != ""
-    assert response.headers["front-token"] != ""
-
-    assert cookies["sAccessToken"]["value"] == ""
-    assert cookies["sRefreshToken"]["value"] == ""
-    assert cookies["sAccessToken"]["expires"] == "Thu, 01 Jan 1970 00:00:00 GMT"
-    assert cookies["sRefreshToken"]["expires"] == "Thu, 01 Jan 1970 00:00:00 GMT"
-
-    assert cookies["sAccessToken"]["domain"] == ""
-    assert cookies["sRefreshToken"]["domain"] == ""
+    info = extract_info(response)
+    assert_info_clears_tokens(info, "cookie")
 
 
 async def test_revoking_session_during_refresh_and_throw_unauthorized(

tests/utils.py

@@ -13,13 +13,14 @@
 # under the License.
 import asyncio
 from datetime import datetime, timezone
+from urllib.parse import unquote
 from http.cookies import SimpleCookie
 from os import environ, kill, remove, scandir
 from shutil import rmtree
 from signal import SIGTERM
 from subprocess import DEVNULL, run
 from time import sleep
-from typing import Any, Dict, List, cast, Optional
+from typing import Any, Dict, List, cast
 
 from requests.models import Response
 from yaml import FullLoader, dump, load
@@ -244,8 +245,8 @@ def extract_info(response: Response) -> Dict[str, Any]:
 
     return {
         **cookies,
-        "accessToken": access_token,
-        "refreshToken": refresh_token,
+        "accessToken": None if access_token is None else unquote(access_token),
+        "refreshToken": None if refresh_token is None else unquote(refresh_token),
         "frontToken": response.headers.get("front-token"),
         "status_code": response.status_code,
         "body": response.json(),
@@ -521,9 +522,7 @@ async def __call__(  # pylint: disable=invalid-overridden-method, useless-super-
 }
 
 
-def get_st_init_args(
-    recipe_list: List[Any]
-) -> Dict[str, Any]:
+def get_st_init_args(recipe_list: List[Any]) -> Dict[str, Any]:
     return {**st_init_common_args, "recipe_list": recipe_list}