Skip to content

Commit dde50e8

Browse files
KShivenduKShivendu
committed
test: Fix session_functions related types in tests
1 parent ead3bd8 commit dde50e8

File tree

6 files changed

+99
-112
lines changed

6 files changed

+99
-112
lines changed

‎tests/emailpassword/test_emaildelivery.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -627,8 +627,8 @@ def api_side_effect(request: httpx.Request):
627627
).mock(side_effect=api_side_effect)
628628
resp = email_verify_token_request(
629629
driver_config_client,
630-
response["accessToken"]["token"],
631-
response.get("antiCsrf", ""),
630+
response.accessToken.token,
631+
response.antiCsrfToken,
632632
user_id,
633633
True,
634634
)
@@ -691,8 +691,8 @@ def api_side_effect(request: httpx.Request):
691691
).mock(side_effect=api_side_effect)
692692
resp = email_verify_token_request(
693693
driver_config_client,
694-
response["accessToken"]["token"],
695-
response.get("antiCsrf", ""),
694+
response.accessToken.token,
695+
response.antiCsrfToken,
696696
user_id,
697697
True,
698698
)
@@ -751,8 +751,8 @@ async def custom_create_and_send_custom_email(
751751

752752
res = email_verify_token_request(
753753
driver_config_client,
754-
response["accessToken"]["token"],
755-
response.get("antiCsrf", ""),
754+
response.accessToken.token,
755+
response.antiCsrfToken,
756756
user_id,
757757
True,
758758
)
@@ -832,8 +832,8 @@ def api_side_effect(request: httpx.Request):
832832
).mock(side_effect=api_side_effect)
833833
resp = email_verify_token_request(
834834
driver_config_client,
835-
response["accessToken"]["token"],
836-
response.get("antiCsrf", ""),
835+
response.accessToken.token,
836+
response.antiCsrfToken,
837837
user_id,
838838
True,
839839
)
@@ -950,8 +950,8 @@ async def send_email_override(
950950

951951
resp = email_verify_token_request(
952952
driver_config_client,
953-
response["accessToken"]["token"],
954-
response.get("antiCsrf", ""),
953+
response.accessToken.token,
954+
response.antiCsrfToken,
955955
user_id,
956956
True,
957957
)

‎tests/test_session.py

Lines changed: 28 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -92,23 +92,15 @@ async def test_that_once_the_info_is_loaded_it_doesnt_query_again():
9292

9393
response = await create_new_session(s.recipe_implementation, "", False, {}, {})
9494

95-
assert response["session"] is not None
96-
assert response["accessToken"] is not None
97-
assert response["refreshToken"] is not None
98-
assert response["idRefreshToken"] is not None
99-
assert response["antiCsrfToken"] is not None
100-
assert len(response.keys()) == 5
101-
102-
access_token = parse_jwt_without_signature_verification(
103-
response["accessToken"]["token"]
104-
)
95+
assert response.session is not None
96+
assert response.accessToken is not None
97+
assert response.refreshToken is not None
98+
assert response.antiCsrfToken is not None
99+
100+
access_token = parse_jwt_without_signature_verification(response.accessToken.token)
105101

106102
await get_session(
107-
s.recipe_implementation,
108-
access_token,
109-
response["antiCsrfToken"],
110-
True,
111-
response["idRefreshToken"]["token"],
103+
s.recipe_implementation, access_token, response.antiCsrfToken, True, True
112104
)
113105
assert (
114106
AllowedProcessStates.CALLING_SERVICE_IN_VERIFY
@@ -117,64 +109,58 @@ async def test_that_once_the_info_is_loaded_it_doesnt_query_again():
117109

118110
response2 = await refresh_session(
119111
s.recipe_implementation,
120-
response["refreshToken"]["token"],
121-
response["antiCsrfToken"],
112+
response.refreshToken.token,
113+
response.antiCsrfToken,
122114
True,
123115
)
124116

125-
assert response2["session"] is not None
126-
assert response2["accessToken"] is not None
127-
assert response2["refreshToken"] is not None
128-
assert response2["idRefreshToken"] is not None
129-
assert response2["antiCsrfToken"] is not None
130-
assert len(response.keys()) == 5
117+
assert response2.session is not None
118+
assert response2.accessToken is not None
119+
assert response2.refreshToken is not None
120+
assert response2.antiCsrfToken is not None
131121

132122
access_token2 = parse_jwt_without_signature_verification(
133-
response2["accessToken"]["token"]
123+
response2.accessToken.token
134124
)
135125

136126
response3 = await get_session(
137127
s.recipe_implementation,
138128
access_token2,
139-
response2["antiCsrfToken"],
129+
response2.antiCsrfToken,
130+
True,
140131
True,
141-
response["idRefreshToken"]["token"],
142132
)
143133

144134
assert (
145135
AllowedProcessStates.CALLING_SERVICE_IN_VERIFY
146136
in ProcessState.get_instance().history
147137
)
148138

149-
assert response3["session"] is not None
150-
assert response3["accessToken"] is not None
151-
assert len(response3.keys()) == 2
139+
assert response3.session is not None
140+
assert response3.accessToken is not None
152141

153142
ProcessState.get_instance().reset()
154143

155144
access_token3 = parse_jwt_without_signature_verification(
156-
response3["accessToken"]["token"]
145+
response3.accessToken.token
157146
)
158147

159148
response4 = await get_session(
160149
s.recipe_implementation,
161150
access_token3,
162-
response2["antiCsrfToken"],
151+
response2.antiCsrfToken,
152+
True,
163153
True,
164-
response["idRefreshToken"]["token"],
165154
)
166155
assert (
167156
AllowedProcessStates.CALLING_SERVICE_IN_VERIFY
168157
not in ProcessState.get_instance().history
169158
)
170159

171-
assert response4["session"] is not None
172-
assert "accessToken" not in response4
173-
assert len(response4.keys()) == 1
160+
assert response4.session is not None
161+
assert response4.accessToken is None
174162

175-
response5 = await revoke_session(
176-
s.recipe_implementation, response4["session"]["handle"]
177-
)
163+
response5 = await revoke_session(s.recipe_implementation, response4.session.handle)
178164

179165
assert response5 is True
180166

@@ -203,7 +189,7 @@ async def test_creating_many_sessions_for_one_user_and_looping():
203189
new_session = await create_new_session(
204190
s.recipe_implementation, "someUser", False, {"someKey": "someValue"}, {}
205191
)
206-
access_tokens.append(new_session["accessToken"]["token"])
192+
access_tokens.append(new_session.accessToken.token)
207193

208194
session_handles = await get_all_session_handles_for_user("someUser")
209195

@@ -290,17 +276,17 @@ async def test_signout_api_works_even_if_session_is_deleted_after_creation(
290276

291277
response = await create_new_session(s.recipe_implementation, user_id, False, {}, {})
292278

293-
session_handle = response["session"]["handle"]
279+
session_handle = response.session.handle
294280

295281
revoked = await asyncio_revoke_session(session_handle)
296282
assert revoked
297283

298284
signout_response = driver_config_client.post(
299285
url="/auth/signout",
300286
cookies={
301-
"sAccessToken": response["accessToken"]["token"],
287+
"sAccessToken": response.accessToken.token,
302288
},
303-
headers={"anti-csrf": response.get("antiCsrfToken", "")},
289+
headers={"anti-csrf": response.antiCsrfToken or ""},
304290
)
305291

306292
assert signout_response.json() == {"status": "OK"}

‎tests/thirdparty/test_emaildelivery.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from fastapi.requests import Request
2222
from fastapi.testclient import TestClient
2323
from pytest import fixture, mark
24+
2425
from supertokens_python import InputAppInfo, SupertokensConfig, init
2526
from supertokens_python.framework.fastapi import get_middleware
2627
from supertokens_python.ingredients.emaildelivery.types import (
@@ -168,8 +169,8 @@ def api_side_effect(request: httpx.Request):
168169
).mock(side_effect=api_side_effect)
169170
resp = email_verify_token_request(
170171
driver_config_client,
171-
response["accessToken"]["token"],
172-
response.get("antiCsrf", ""),
172+
response.accessToken.token,
173+
response.antiCsrfToken,
173174
user_id,
174175
True,
175176
)
@@ -238,8 +239,8 @@ def api_side_effect(request: httpx.Request):
238239
).mock(side_effect=api_side_effect)
239240
resp = email_verify_token_request(
240241
driver_config_client,
241-
response["accessToken"]["token"],
242-
response.get("antiCsrf", ""),
242+
response.accessToken.token,
243+
response.antiCsrfToken,
243244
user_id,
244245
True,
245246
)
@@ -301,8 +302,8 @@ async def create_and_send_custom_email(
301302

302303
resp = email_verify_token_request(
303304
driver_config_client,
304-
response["accessToken"]["token"],
305-
response.get("antiCsrf", ""),
305+
response.accessToken.token,
306+
response.antiCsrfToken,
306307
user_id,
307308
True,
308309
)
@@ -388,8 +389,8 @@ def api_side_effect(request: httpx.Request):
388389
).mock(side_effect=api_side_effect)
389390
resp = email_verify_token_request(
390391
driver_config_client,
391-
response["accessToken"]["token"],
392-
response.get("antiCsrf", ""),
392+
response.accessToken.token,
393+
response.antiCsrfToken,
393394
user_id,
394395
True,
395396
)
@@ -512,8 +513,8 @@ async def send_email_override(
512513

513514
resp = email_verify_token_request(
514515
driver_config_client,
515-
response["accessToken"]["token"],
516-
response.get("antiCsrf", ""),
516+
response.accessToken.token,
517+
response.antiCsrfToken,
517518
user_id,
518519
True,
519520
)

‎tests/thirdpartyemailpassword/test_email_delivery.py

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -21,48 +21,49 @@
2121
from fastapi.requests import Request
2222
from fastapi.testclient import TestClient
2323
from pytest import fixture, mark
24+
2425
from supertokens_python import InputAppInfo, SupertokensConfig, init
2526
from supertokens_python.framework.fastapi import get_middleware
2627
from supertokens_python.ingredients.emaildelivery import EmailDeliveryInterface
2728
from supertokens_python.ingredients.emaildelivery.types import (
28-
EmailDeliveryConfig,
29-
SMTPSettingsFrom,
30-
SMTPSettings,
3129
EmailContent,
30+
EmailDeliveryConfig,
3231
SMTPServiceInterface,
32+
SMTPSettings,
33+
SMTPSettingsFrom,
3334
)
3435
from supertokens_python.recipe import (
36+
emailverification,
3537
session,
3638
thirdpartyemailpassword,
37-
emailverification,
3839
)
3940
from supertokens_python.recipe.emailpassword.types import User as EPUser
41+
from supertokens_python.recipe.emailverification.emaildelivery.services import (
42+
SMTPService as EVSMTPService,
43+
)
44+
from supertokens_python.recipe.emailverification.types import User as EVUser
45+
from supertokens_python.recipe.emailverification.types import (
46+
VerificationEmailTemplateVars,
47+
)
4048
from supertokens_python.recipe.session import SessionRecipe
4149
from supertokens_python.recipe.session.recipe_implementation import (
4250
RecipeImplementation as SessionRecipeImplementation,
4351
)
4452
from supertokens_python.recipe.session.session_functions import create_new_session
4553
from supertokens_python.recipe.thirdpartyemailpassword import (
46-
InputResetPasswordUsingTokenFeature,
4754
Github,
55+
InputResetPasswordUsingTokenFeature,
4856
)
4957
from supertokens_python.recipe.thirdpartyemailpassword.asyncio import (
5058
thirdparty_sign_in_up,
5159
)
5260
from supertokens_python.recipe.thirdpartyemailpassword.emaildelivery.services import (
5361
SMTPService,
5462
)
55-
from supertokens_python.recipe.emailverification.emaildelivery.services import (
56-
SMTPService as EVSMTPService,
57-
)
5863
from supertokens_python.recipe.thirdpartyemailpassword.types import (
5964
EmailTemplateVars,
6065
PasswordResetEmailTemplateVars,
6166
)
62-
from supertokens_python.recipe.emailverification.types import (
63-
VerificationEmailTemplateVars,
64-
)
65-
from supertokens_python.recipe.emailverification.types import User as EVUser
6667
from tests.utils import (
6768
clean_st,
6869
email_verify_token_request,
@@ -516,8 +517,8 @@ def api_side_effect(request: httpx.Request):
516517
).mock(side_effect=api_side_effect)
517518
resp = email_verify_token_request(
518519
driver_config_client,
519-
response["accessToken"]["token"],
520-
response.get("antiCsrf", ""),
520+
response.accessToken.token,
521+
response.antiCsrfToken,
521522
user_id,
522523
True,
523524
)
@@ -580,8 +581,8 @@ def api_side_effect(request: httpx.Request):
580581
).mock(side_effect=api_side_effect)
581582
resp = email_verify_token_request(
582583
driver_config_client,
583-
response["accessToken"]["token"],
584-
response.get("antiCsrf", ""),
584+
response.accessToken.token,
585+
response.antiCsrfToken,
585586
user_id,
586587
True,
587588
)
@@ -640,8 +641,8 @@ async def custom_create_and_send_custom_email(
640641

641642
res = email_verify_token_request(
642643
driver_config_client,
643-
response["accessToken"]["token"],
644-
response.get("antiCsrf", ""),
644+
response.accessToken.token,
645+
response.antiCsrfToken,
645646
user_id,
646647
True,
647648
)
@@ -721,8 +722,8 @@ def api_side_effect(request: httpx.Request):
721722
).mock(side_effect=api_side_effect)
722723
resp = email_verify_token_request(
723724
driver_config_client,
724-
response["accessToken"]["token"],
725-
response.get("antiCsrf", ""),
725+
response.accessToken.token,
726+
response.antiCsrfToken,
726727
user_id,
727728
True,
728729
)
@@ -839,8 +840,8 @@ async def send_email_override(
839840

840841
resp = email_verify_token_request(
841842
driver_config_client,
842-
response["accessToken"]["token"],
843-
response.get("antiCsrf", ""),
843+
response.accessToken.token,
844+
response.antiCsrfToken,
844845
user_id,
845846
True,
846847
)
@@ -904,8 +905,8 @@ async def custom_create_and_send_custom_email(
904905

905906
res = email_verify_token_request(
906907
driver_config_client,
907-
response["accessToken"]["token"],
908-
response.get("antiCsrf", ""),
908+
response.accessToken.token,
909+
response.antiCsrfToken,
909910
user_id,
910911
True,
911912
)
@@ -967,8 +968,8 @@ async def custom_create_and_send_custom_email(
967968

968969
res = email_verify_token_request(
969970
driver_config_client,
970-
response["accessToken"]["token"],
971-
response.get("antiCsrf", ""),
971+
response.accessToken.token,
972+
response.antiCsrfToken or "",
972973
user_id,
973974
True,
974975
)

0 commit comments

Comments
 (0)