Skip to content

Commit 45965ef

Browse files
committed
fixes e2e tests for duplicate cookie domain change
1 parent 814180e commit 45965ef

File tree

6 files changed

+31
-23
lines changed

6 files changed

+31
-23
lines changed

tests/frontendIntegration/django2x/polls/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,7 @@ def feature_flags(request: HttpRequest):
604604
"sessionJwt": last_set_enable_jwt,
605605
"sessionClaims": is_version_gte(VERSION, "0.11.0"),
606606
"v3AccessToken": is_version_gte(VERSION, "0.13.0"),
607+
"duplicateCookieHandling": is_version_gte(VERSION, "0.20.0"),
607608
}
608609
)
609610

tests/frontendIntegration/django3x/polls/views.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -420,17 +420,15 @@ async def login_218(request: HttpRequest):
420420
querier = Querier.get_instance()
421421
Querier.api_version = "2.18"
422422

423-
legacy_session_resp = await (
424-
querier.send_post_request(
425-
NormalisedURLPath("/recipe/session"),
426-
{
427-
"userId": user_id,
428-
"enableAntiCsrf": False,
429-
"userDataInJWT": payload,
430-
"userDataInDatabase": {},
431-
},
432-
{},
433-
)
423+
legacy_session_resp = await querier.send_post_request(
424+
NormalisedURLPath("/recipe/session"),
425+
{
426+
"userId": user_id,
427+
"enableAntiCsrf": False,
428+
"userDataInJWT": payload,
429+
"userDataInDatabase": {},
430+
},
431+
{},
434432
)
435433
Querier.api_version = None
436434
front_token = b64encode(
@@ -608,6 +606,7 @@ def feature_flags(request: HttpRequest):
608606
"sessionJwt": last_set_enable_jwt,
609607
"sessionClaims": is_version_gte(VERSION, "0.11.0"),
610608
"v3AccessToken": is_version_gte(VERSION, "0.13.0"),
609+
"duplicateCookieHandling": is_version_gte(VERSION, "0.20.0"),
611610
}
612611
)
613612

tests/frontendIntegration/drf_async/polls/views.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -448,17 +448,15 @@ async def login_218(request: Request): # type: ignore
448448
querier = Querier.get_instance()
449449
Querier.api_version = "2.18"
450450

451-
legacy_session_resp = await (
452-
querier.send_post_request(
453-
NormalisedURLPath("/recipe/session"),
454-
{
455-
"userId": user_id,
456-
"enableAntiCsrf": False,
457-
"userDataInJWT": payload,
458-
"userDataInDatabase": {},
459-
},
460-
{},
461-
)
451+
legacy_session_resp = await querier.send_post_request(
452+
NormalisedURLPath("/recipe/session"),
453+
{
454+
"userId": user_id,
455+
"enableAntiCsrf": False,
456+
"userDataInJWT": payload,
457+
"userDataInDatabase": {},
458+
},
459+
{},
462460
)
463461
Querier.api_version = None
464462
front_token = b64encode(
@@ -671,6 +669,7 @@ def feature_flags(request: Request): # type: ignore
671669
"sessionJwt": last_set_enable_jwt,
672670
"sessionClaims": is_version_gte(VERSION, "0.11.0"),
673671
"v3AccessToken": is_version_gte(VERSION, "0.13.0"),
672+
"duplicateCookieHandling": is_version_gte(VERSION, "0.20.0"),
674673
}
675674
) # type: ignore
676675

tests/frontendIntegration/drf_sync/polls/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,7 @@ def feature_flags(request: Request): # type: ignore
671671
"sessionJwt": last_set_enable_jwt,
672672
"sessionClaims": is_version_gte(VERSION, "0.11.0"),
673673
"v3AccessToken": is_version_gte(VERSION, "0.13.0"),
674+
"duplicateCookieHandling": is_version_gte(VERSION, "0.20.0"),
674675
}
675676
) # type: ignore
676677

tests/frontendIntegration/fastapi-server/app.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ def refresh_attempted_time():
520520
async def refresh(request: Request):
521521
Test.increment_attempted_refresh()
522522
try:
523-
await (verify_session()(request))
523+
await verify_session()(request)
524524
except Exception as e:
525525
raise e
526526

@@ -643,6 +643,7 @@ def feature_flags(_: Request):
643643
"sessionJwt": last_set_enable_jwt,
644644
"sessionClaims": is_version_gte(VERSION, "0.11.0"),
645645
"v3AccessToken": is_version_gte(VERSION, "0.13.0"),
646+
"duplicateCookieHandling": is_version_gte(VERSION, "0.20.0"),
646647
}
647648
)
648649

tests/frontendIntegration/flask-server/app.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
from supertokens_python.querier import Querier
5151
from supertokens_python.async_to_sync_wrapper import sync
5252

53+
5354
protected_prop_name = {
5455
"sub",
5556
"iat",
@@ -654,6 +655,7 @@ def feature_flags():
654655
"sessionJwt": last_set_enable_jwt,
655656
"sessionClaims": is_version_gte(VERSION, "0.11.0"),
656657
"v3AccessToken": is_version_gte(VERSION, "0.13.0"),
658+
"duplicateCookieHandling": is_version_gte(VERSION, "0.20.0"),
657659
}
658660
)
659661

@@ -693,5 +695,10 @@ def test_error():
693695
return Response("test error message", status=status_code)
694696

695697

698+
@app.errorhandler(Exception) # type: ignore
699+
def handle_exception(e): # type: ignore
700+
return Response(str(e), status=500) # type: ignore
701+
702+
696703
if __name__ == "__main__":
697704
app.run(host="0.0.0.0", port=int(get_app_port()), threaded=True)

0 commit comments

Comments
 (0)