Merge pull request #367 from supertokens/fix/tp-rework-merge-conflicts

fix: Merge conflicts in thirdparty rework
supertokens · Jul 6, 2023 · 3cc9267 · 3cc9267
2 parents c02bce9 + 4836f16
commit 3cc9267
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 113 deletions.
diff --git a/supertokens_python/recipe/thirdparty/__init__.py b/supertokens_python/recipe/thirdparty/__init__.py
@@ -23,27 +23,9 @@
 
 InputOverrideConfig = utils.InputOverrideConfig
 SignInAndUpFeature = utils.SignInAndUpFeature
-<<<<<<< HEAD
 ProviderInput = provider.ProviderInput
 ProviderConfig = provider.ProviderConfig
 ProviderClientConfig = provider.ProviderClientConfig
-||||||| 37d58eb3
-Apple = providers.Apple
-Discord = providers.Discord
-Facebook = providers.Facebook
-Github = providers.Github
-Google = providers.Google
-GoogleWorkspaces = providers.GoogleWorkspaces
-=======
-Apple = providers.Apple
-Discord = providers.Discord
-Facebook = providers.Facebook
-Github = providers.Github
-Google = providers.Google
-GoogleWorkspaces = providers.GoogleWorkspaces
-Bitbucket = providers.Bitbucket
-GitLab = providers.GitLab
->>>>>>> 0.14
 exceptions = ex
 
 if TYPE_CHECKING:

diff --git a/supertokens_python/recipe/thirdparty/providers/apple.py b/supertokens_python/recipe/thirdparty/providers/apple.py
@@ -17,33 +17,11 @@
 from typing import Any, Dict, Optional
 from jwt import encode  # type: ignore
 from time import time
-<<<<<<< HEAD
 
 from ..provider import (
     Provider,
     ProviderConfigForClientType,
     ProviderInput,
-||||||| 37d58eb3
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Union
-
-from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
-from httpx import AsyncClient
-from jwt import decode, encode
-from jwt.algorithms import RSAAlgorithm
-from supertokens_python.recipe.thirdparty.api.implementation import (
-    get_actual_client_id_from_development_client_id,
-=======
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Union
-from httpx import AsyncClient
-from jwt import decode, encode
-
-# You must have cryptography library installed for these imports to work:
-from jwt.algorithms import RSAAlgorithm
-from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
-
-from supertokens_python.recipe.thirdparty.api.implementation import (
-    get_actual_client_id_from_development_client_id,
->>>>>>> 0.14
 )
 from .custom import GenericProvider, NewProvider
 from .utils import get_actual_client_id_from_development_client_id

diff --git a/supertokens_python/recipe/thirdpartyemailpassword/__init__.py b/supertokens_python/recipe/thirdpartyemailpassword/__init__.py
@@ -29,28 +29,10 @@
 exceptions = ex
 InputResetPasswordUsingTokenFeature = emailpassword.InputResetPasswordUsingTokenFeature
 InputSignUpFeature = emailpassword.InputSignUpFeature
-<<<<<<< HEAD
 ProviderInput = provider.ProviderInput
 ProviderConfig = provider.ProviderConfig
 ProviderClientConfig = provider.ProviderClientConfig
 ProviderConfigForClientType = provider.ProviderConfigForClientType
-||||||| 37d58eb3
-Apple = thirdparty.Apple
-Discord = thirdparty.Discord
-Facebook = thirdparty.Facebook
-Github = thirdparty.Github
-Google = thirdparty.Google
-GoogleWorkspaces = thirdparty.GoogleWorkspaces
-=======
-Apple = thirdparty.Apple
-Discord = thirdparty.Discord
-Facebook = thirdparty.Facebook
-Github = thirdparty.Github
-Google = thirdparty.Google
-GoogleWorkspaces = thirdparty.GoogleWorkspaces
-Bitbucket = thirdparty.Bitbucket
-GitLab = thirdparty.GitLab
->>>>>>> 0.14
 SMTPService = emaildelivery_services.SMTPService
 
 if TYPE_CHECKING:

diff --git a/supertokens_python/recipe/thirdpartyemailpassword/recipe.py b/supertokens_python/recipe/thirdpartyemailpassword/recipe.py
@@ -110,12 +110,7 @@ def get_emailpassword_config() -> EmailPasswordConfig:
         recipe_implementation = RecipeImplementation(
             Querier.get_instance(EmailPasswordRecipe.recipe_id),
             Querier.get_instance(ThirdPartyRecipe.recipe_id),
-<<<<<<< HEAD
             self.config.providers,
-||||||| 37d58eb3
-=======
-            get_emailpassword_config,
->>>>>>> 0.14
         )
         self.recipe_implementation: RecipeInterface = (
             recipe_implementation

diff --git a/supertokens_python/recipe/thirdpartyemailpassword/recipeimplementation/implementation.py b/supertokens_python/recipe/thirdpartyemailpassword/recipeimplementation/implementation.py
@@ -13,13 +13,7 @@
 # under the License.
 from __future__ import annotations
 
-<<<<<<< HEAD
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
-||||||| 37d58eb3
-from typing import TYPE_CHECKING, Any, Dict, List, Union
-=======
-from typing import TYPE_CHECKING, Any, Dict, List, Union, Callable
->>>>>>> 0.14
 
 import supertokens_python.recipe.emailpassword.interfaces as EPInterfaces
 from supertokens_python.recipe.thirdparty.interfaces import GetProviderOkResult
@@ -65,19 +59,10 @@
 
 class RecipeImplementation(RecipeInterface):
     def __init__(
-<<<<<<< HEAD
         self,
         emailpassword_querier: Querier,
         thirdparty_querier: Querier,
         providers: List[ProviderInput],
-||||||| 37d58eb3
-        self, emailpassword_querier: Querier, thirdparty_querier: Union[Querier, None]
-=======
-        self,
-        emailpassword_querier: Querier,
-        thirdparty_querier: Union[Querier, None],
-        get_emailpassword_config: Callable[[], EmailPasswordConfig],
->>>>>>> 0.14
     ):
         super().__init__()
         emailpassword_implementation = EmailPasswordImplementation(

diff --git a/supertokens_python/recipe/thirdpartypasswordless/__init__.py b/supertokens_python/recipe/thirdpartypasswordless/__init__.py
@@ -32,24 +32,6 @@
 exceptions = ex
 ContactConfig = passwordless.ContactConfig
 PhoneOrEmailInput = passwordless.PhoneOrEmailInput
-<<<<<<< HEAD
-||||||| 37d58eb3
-Apple = thirdparty.Apple
-Discord = thirdparty.Discord
-Facebook = thirdparty.Facebook
-Github = thirdparty.Github
-Google = thirdparty.Google
-GoogleWorkspaces = thirdparty.GoogleWorkspaces
-=======
-Apple = thirdparty.Apple
-Discord = thirdparty.Discord
-Facebook = thirdparty.Facebook
-Github = thirdparty.Github
-Google = thirdparty.Google
-GoogleWorkspaces = thirdparty.GoogleWorkspaces
-Bitbucket = thirdparty.Bitbucket
-GitLab = thirdparty.GitLab
->>>>>>> 0.14
 ContactPhoneOnlyConfig = passwordless.ContactPhoneOnlyConfig
 ContactEmailOnlyConfig = passwordless.ContactEmailOnlyConfig
 ContactEmailOrPhoneConfig = passwordless.ContactEmailOrPhoneConfig

diff --git a/tests/thirdpartyemailpassword/test_email_delivery.py b/tests/thirdpartyemailpassword/test_email_delivery.py
@@ -51,15 +51,7 @@
 )
 from supertokens_python.recipe.session.session_functions import create_new_session
 from supertokens_python.recipe.thirdpartyemailpassword import (
-<<<<<<< HEAD
     InputResetPasswordUsingTokenFeature,
-||||||| 37d58eb3
-    InputResetPasswordUsingTokenFeature,
-    Github,
-=======
-    Github,
-    InputResetPasswordUsingTokenFeature,
->>>>>>> 0.14
 )
 from supertokens_python.recipe.thirdpartyemailpassword.asyncio import (
     thirdparty_manually_create_or_update_user,

diff --git a/tests/thirdpartypasswordless/test_emaildelivery.py b/tests/thirdpartypasswordless/test_emaildelivery.py
@@ -61,18 +61,9 @@
     RecipeImplementation as SessionRecipeImplementation,
 )
 from supertokens_python.recipe.session.session_functions import create_new_session
-<<<<<<< HEAD
 from supertokens_python.recipe.emailverification.asyncio import (
     create_email_verification_token,
 )
-||||||| 37d58eb3
-from supertokens_python.recipe.emailverification.asyncio import (
-    create_email_verification_token,
-)
-from supertokens_python.recipe.thirdparty.providers import Github
-=======
-from supertokens_python.recipe.thirdparty.providers import Github
->>>>>>> 0.14
 from supertokens_python.recipe.thirdpartypasswordless.asyncio import (
     passwordlessSigninup,
     thirdparty_manually_create_or_update_user,