Skip to content

Commit a9cf3c5

Browse files
committed
fix: Migrate thirdparty interface in tests and fix linter issues
1 parent 10dcdb0 commit a9cf3c5

File tree

10 files changed

+597
-364
lines changed

10 files changed

+597
-364
lines changed

tests/Django/test_django.py

Lines changed: 86 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -429,13 +429,22 @@ async def test_thirdparty_parsing_works(self):
429429
thirdparty.init(
430430
sign_in_and_up_feature=thirdparty.SignInAndUpFeature(
431431
providers=[
432-
thirdparty.Apple(
433-
client_id="4398792-io.supertokens.example.service",
434-
client_key_id="7M48Y4RYDL",
435-
client_team_id="YWQCXGJRJL",
436-
client_private_key="-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgu8gXs+XYkqXD6Ala9Sf/iJXzhbwcoG5dMh1OonpdJUmgCgYIKoZIzj0DAQehRANCAASfrvlFbFCYqn3I2zeknYXLwtH30JuOKestDbSfZYxZNMqhF/OzdZFTV0zc5u5s3eN+oCWbnvl0hM+9IW0UlkdA\n-----END PRIVATE KEY-----",
437-
)
438-
]
432+
thirdparty.ProviderInput(
433+
config=thirdparty.ProviderConfig(
434+
third_party_id="apple",
435+
clients=[
436+
thirdparty.ProviderClientConfig(
437+
client_id="4398792-io.supertokens.example.service",
438+
additional_config={
439+
"keyId": "7M48Y4RYDL",
440+
"teamId": "YWQCXGJRJL",
441+
"privateKey": "-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgu8gXs+XYkqXD6Ala9Sf/iJXzhbwcoG5dMh1OonpdJUmgCgYIKoZIzj0DAQehRANCAASfrvlFbFCYqn3I2zeknYXLwtH30JuOKestDbSfZYxZNMqhF/OzdZFTV0zc5u5s3eN+oCWbnvl0hM+9IW0UlkdA\n-----END PRIVATE KEY-----",
442+
},
443+
),
444+
],
445+
)
446+
),
447+
],
439448
)
440449
),
441450
],
@@ -748,21 +757,44 @@ async def test_search_with_provider_google(self):
748757
thirdparty.init(
749758
sign_in_and_up_feature=thirdparty.SignInAndUpFeature(
750759
providers=[
751-
thirdparty.Apple(
752-
client_id="4398792-io.supertokens.example.service",
753-
client_key_id="7M48Y4RYDL",
754-
client_team_id="YWQCXGJRJL",
755-
client_private_key="-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgu8gXs+XYkqXD6Ala9Sf/iJXzhbwcoG5dMh1OonpdJUmgCgYIKoZIzj0DAQehRANCAASfrvlFbFCYqn3I2zeknYXLwtH30JuOKestDbSfZYxZNMqhF/OzdZFTV0zc5u5s3eN+oCWbnvl0hM+9IW0UlkdA\n-----END PRIVATE KEY-----",
760+
thirdparty.ProviderInput(
761+
config=thirdparty.ProviderConfig(
762+
third_party_id="apple",
763+
clients=[
764+
thirdparty.ProviderClientConfig(
765+
client_id="4398792-io.supertokens.example.service",
766+
additional_config={
767+
"keyId": "7M48Y4RYDL",
768+
"teamId": "YWQCXGJRJL",
769+
"privateKey": "-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgu8gXs+XYkqXD6Ala9Sf/iJXzhbwcoG5dMh1OonpdJUmgCgYIKoZIzj0DAQehRANCAASfrvlFbFCYqn3I2zeknYXLwtH30JuOKestDbSfZYxZNMqhF/OzdZFTV0zc5u5s3eN+oCWbnvl0hM+9IW0UlkdA\n-----END PRIVATE KEY-----",
770+
},
771+
),
772+
],
773+
)
756774
),
757-
thirdparty.Google(
758-
client_id="467101b197249757c71f",
759-
client_secret="e97051221f4b6426e8fe8d51486396703012f5bd",
775+
thirdparty.ProviderInput(
776+
config=thirdparty.ProviderConfig(
777+
third_party_id="google",
778+
clients=[
779+
thirdparty.ProviderClientConfig(
780+
client_id="467101b197249757c71f",
781+
client_secret="e97051221f4b6426e8fe8d51486396703012f5bd",
782+
),
783+
],
784+
)
760785
),
761-
thirdparty.Github(
762-
client_id="1060725074195-kmeum4crr01uirfl2op9kd5acmi9jutn.apps.googleusercontent.com",
763-
client_secret="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",
786+
thirdparty.ProviderInput(
787+
config=thirdparty.ProviderConfig(
788+
third_party_id="github",
789+
clients=[
790+
thirdparty.ProviderClientConfig(
791+
client_id="1060725074195-kmeum4crr01uirfl2op9kd5acmi9jutn.apps.googleusercontent.com",
792+
client_secret="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",
793+
),
794+
],
795+
)
764796
),
765-
]
797+
],
766798
)
767799
),
768800
DashboardRecipe.init(
@@ -819,21 +851,44 @@ async def test_search_with_provider_google_and_phone_one(self):
819851
thirdparty.init(
820852
sign_in_and_up_feature=thirdparty.SignInAndUpFeature(
821853
providers=[
822-
thirdparty.Apple(
823-
client_id="4398792-io.supertokens.example.service",
824-
client_key_id="7M48Y4RYDL",
825-
client_team_id="YWQCXGJRJL",
826-
client_private_key="-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgu8gXs+XYkqXD6Ala9Sf/iJXzhbwcoG5dMh1OonpdJUmgCgYIKoZIzj0DAQehRANCAASfrvlFbFCYqn3I2zeknYXLwtH30JuOKestDbSfZYxZNMqhF/OzdZFTV0zc5u5s3eN+oCWbnvl0hM+9IW0UlkdA\n-----END PRIVATE KEY-----",
854+
thirdparty.ProviderInput(
855+
config=thirdparty.ProviderConfig(
856+
third_party_id="apple",
857+
clients=[
858+
thirdparty.ProviderClientConfig(
859+
client_id="4398792-io.supertokens.example.service",
860+
additional_config={
861+
"keyId": "7M48Y4RYDL",
862+
"teamId": "YWQCXGJRJL",
863+
"privateKey": "-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgu8gXs+XYkqXD6Ala9Sf/iJXzhbwcoG5dMh1OonpdJUmgCgYIKoZIzj0DAQehRANCAASfrvlFbFCYqn3I2zeknYXLwtH30JuOKestDbSfZYxZNMqhF/OzdZFTV0zc5u5s3eN+oCWbnvl0hM+9IW0UlkdA\n-----END PRIVATE KEY-----",
864+
},
865+
),
866+
],
867+
)
827868
),
828-
thirdparty.Google(
829-
client_id="467101b197249757c71f",
830-
client_secret="e97051221f4b6426e8fe8d51486396703012f5bd",
869+
thirdparty.ProviderInput(
870+
config=thirdparty.ProviderConfig(
871+
third_party_id="google",
872+
clients=[
873+
thirdparty.ProviderClientConfig(
874+
client_id="467101b197249757c71f",
875+
client_secret="e97051221f4b6426e8fe8d51486396703012f5bd",
876+
),
877+
],
878+
)
831879
),
832-
thirdparty.Github(
833-
client_id="1060725074195-kmeum4crr01uirfl2op9kd5acmi9jutn.apps.googleusercontent.com",
834-
client_secret="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",
880+
thirdparty.ProviderInput(
881+
config=thirdparty.ProviderConfig(
882+
third_party_id="github",
883+
clients=[
884+
thirdparty.ProviderClientConfig(
885+
client_id="1060725074195-kmeum4crr01uirfl2op9kd5acmi9jutn.apps.googleusercontent.com",
886+
client_secret="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",
887+
),
888+
],
889+
)
835890
),
836-
]
891+
],
837892
)
838893
),
839894
DashboardRecipe.init(

tests/Fastapi/test_fastapi.py

Lines changed: 70 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -942,21 +942,44 @@ async def test_search_with_provider_google(driver_config_client: TestClient):
942942
thirdparty.init(
943943
sign_in_and_up_feature=thirdparty.SignInAndUpFeature(
944944
providers=[
945-
thirdparty.Apple(
946-
client_id="4398792-io.supertokens.example.service",
947-
client_key_id="7M48Y4RYDL",
948-
client_team_id="YWQCXGJRJL",
949-
client_private_key="-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgu8gXs+XYkqXD6Ala9Sf/iJXzhbwcoG5dMh1OonpdJUmgCgYIKoZIzj0DAQehRANCAASfrvlFbFCYqn3I2zeknYXLwtH30JuOKestDbSfZYxZNMqhF/OzdZFTV0zc5u5s3eN+oCWbnvl0hM+9IW0UlkdA\n-----END PRIVATE KEY-----",
945+
thirdparty.ProviderInput(
946+
config=thirdparty.ProviderConfig(
947+
third_party_id="apple",
948+
clients=[
949+
thirdparty.ProviderClientConfig(
950+
client_id="4398792-io.supertokens.example.service",
951+
additional_config={
952+
"keyId": "7M48Y4RYDL",
953+
"teamId": "YWQCXGJRJL",
954+
"privateKey": "-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgu8gXs+XYkqXD6Ala9Sf/iJXzhbwcoG5dMh1OonpdJUmgCgYIKoZIzj0DAQehRANCAASfrvlFbFCYqn3I2zeknYXLwtH30JuOKestDbSfZYxZNMqhF/OzdZFTV0zc5u5s3eN+oCWbnvl0hM+9IW0UlkdA\n-----END PRIVATE KEY-----",
955+
},
956+
),
957+
],
958+
)
950959
),
951-
thirdparty.Google(
952-
client_id="467101b197249757c71f",
953-
client_secret="e97051221f4b6426e8fe8d51486396703012f5bd",
960+
thirdparty.ProviderInput(
961+
config=thirdparty.ProviderConfig(
962+
third_party_id="google",
963+
clients=[
964+
thirdparty.ProviderClientConfig(
965+
client_id="467101b197249757c71f",
966+
client_secret="e97051221f4b6426e8fe8d51486396703012f5bd",
967+
),
968+
],
969+
)
954970
),
955-
thirdparty.Github(
956-
client_id="1060725074195-kmeum4crr01uirfl2op9kd5acmi9jutn.apps.googleusercontent.com",
957-
client_secret="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",
971+
thirdparty.ProviderInput(
972+
config=thirdparty.ProviderConfig(
973+
third_party_id="github",
974+
clients=[
975+
thirdparty.ProviderClientConfig(
976+
client_id="1060725074195-kmeum4crr01uirfl2op9kd5acmi9jutn.apps.googleusercontent.com",
977+
client_secret="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",
978+
),
979+
],
980+
)
958981
),
959-
]
982+
],
960983
)
961984
),
962985
],
@@ -1013,21 +1036,44 @@ async def test_search_with_provider_google_and_phone_1(
10131036
thirdparty.init(
10141037
sign_in_and_up_feature=thirdparty.SignInAndUpFeature(
10151038
providers=[
1016-
thirdparty.Apple(
1017-
client_id="4398792-io.supertokens.example.service",
1018-
client_key_id="7M48Y4RYDL",
1019-
client_team_id="YWQCXGJRJL",
1020-
client_private_key="-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgu8gXs+XYkqXD6Ala9Sf/iJXzhbwcoG5dMh1OonpdJUmgCgYIKoZIzj0DAQehRANCAASfrvlFbFCYqn3I2zeknYXLwtH30JuOKestDbSfZYxZNMqhF/OzdZFTV0zc5u5s3eN+oCWbnvl0hM+9IW0UlkdA\n-----END PRIVATE KEY-----",
1039+
thirdparty.ProviderInput(
1040+
config=thirdparty.ProviderConfig(
1041+
third_party_id="apple",
1042+
clients=[
1043+
thirdparty.ProviderClientConfig(
1044+
client_id="4398792-io.supertokens.example.service",
1045+
additional_config={
1046+
"keyId": "7M48Y4RYDL",
1047+
"teamId": "YWQCXGJRJL",
1048+
"privateKey": "-----BEGIN PRIVATE KEY-----\nMIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQgu8gXs+XYkqXD6Ala9Sf/iJXzhbwcoG5dMh1OonpdJUmgCgYIKoZIzj0DAQehRANCAASfrvlFbFCYqn3I2zeknYXLwtH30JuOKestDbSfZYxZNMqhF/OzdZFTV0zc5u5s3eN+oCWbnvl0hM+9IW0UlkdA\n-----END PRIVATE KEY-----",
1049+
},
1050+
),
1051+
],
1052+
)
10211053
),
1022-
thirdparty.Google(
1023-
client_id="467101b197249757c71f",
1024-
client_secret="e97051221f4b6426e8fe8d51486396703012f5bd",
1054+
thirdparty.ProviderInput(
1055+
config=thirdparty.ProviderConfig(
1056+
third_party_id="google",
1057+
clients=[
1058+
thirdparty.ProviderClientConfig(
1059+
client_id="467101b197249757c71f",
1060+
client_secret="e97051221f4b6426e8fe8d51486396703012f5bd",
1061+
),
1062+
],
1063+
)
10251064
),
1026-
thirdparty.Github(
1027-
client_id="1060725074195-kmeum4crr01uirfl2op9kd5acmi9jutn.apps.googleusercontent.com",
1028-
client_secret="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",
1065+
thirdparty.ProviderInput(
1066+
config=thirdparty.ProviderConfig(
1067+
third_party_id="github",
1068+
clients=[
1069+
thirdparty.ProviderClientConfig(
1070+
client_id="1060725074195-kmeum4crr01uirfl2op9kd5acmi9jutn.apps.googleusercontent.com",
1071+
client_secret="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",
1072+
),
1073+
],
1074+
)
10291075
),
1030-
]
1076+
],
10311077
)
10321078
),
10331079
],

0 commit comments

Comments
 (0)