fix: Pyright errors and format

KShivendu · KShivendu · commit 8c516bf49b01 · 2023-07-06T12:55:13.000+05:30
diff --git a/supertokens_python/recipe/thirdparty/providers/bitbucket.py b/supertokens_python/recipe/thirdparty/providers/bitbucket.py
@@ -14,100 +14,33 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Union
-
-from httpx import AsyncClient
 from supertokens_python.recipe.thirdparty.provider import Provider
-from supertokens_python.recipe.thirdparty.types import (
-    AccessTokenAPI,
-    AuthorisationRedirectAPI,
-    UserInfo,
-    UserInfoEmail,
-)
+from .custom import GenericProvider, NewProvider
+from ..provider import Provider, ProviderInput
 
-if TYPE_CHECKING:
-    from supertokens_python.framework.request import BaseRequest
 
+# TODO Implement when it's done in Node PR
+class BitbucketImpl(GenericProvider):
+    pass
 
-class Bitbucket(Provider):
-    def __init__(
-        self,
-        client_id: str,
-        client_secret: str,
-        scope: Union[None, List[str]] = None,
-        authorisation_redirect: Union[
-            None, Dict[str, Union[str, Callable[[BaseRequest], str]]]
-        ] = None,
-        is_default: bool = False,
-    ):
-        super().__init__("bitbucket", is_default)
-        self.client_id = client_id
-        self.client_secret = client_secret
-        self.scopes = ["account", "email"] if scope is None else list(set(scope))
-        self.access_token_api_url = "https://bitbucket.org/site/oauth2/access_token"
-        self.authorisation_redirect_url = "https://bitbucket.org/site/oauth2/authorize"
-        self.authorisation_redirect_params = {}
-        if authorisation_redirect is not None:
-            self.authorisation_redirect_params = authorisation_redirect
 
-    async def get_profile_info(
-        self, auth_code_response: Dict[str, Any], user_context: Dict[str, Any]
-    ) -> UserInfo:
-        access_token: str = auth_code_response["access_token"]
-        headers = {"Authorization": f"Bearer {access_token}"}
-        async with AsyncClient() as client:
-            response = await client.get(  # type: ignore
-                url="https://api.bitbucket.org/2.0/user",
-                headers=headers,
-            )
-            user_info = response.json()
-            user_id = user_info["uuid"]
-            email_res = await client.get(  # type: ignore
-                url="https://api.bitbucket.org/2.0/user/emails",
-                headers=headers,
-            )
-            email_data = email_res.json()
-            email = None
-            is_verified = False
-            for email_info in email_data["values"]:
-                if email_info.get("is_primary"):
-                    email = email_info["email"]
-                    is_verified = email_info["is_confirmed"]
-                    break
+# TODO Finish when it's done in Node PR
+def Bitbucket(input: ProviderInput) -> Provider:  # pylint: disable=redefined-builtin
+    if input.config.name is None:
+        input.config.name = "Bitbucket"
 
-            if email is None:
-                return UserInfo(user_id)
-            return UserInfo(user_id, UserInfoEmail(email, is_verified))
+    if input.config.authorization_endpoint is None:
+        input.config.authorization_endpoint = (
+            "https://bitbucket.org/site/oauth2/authorize"
+        )
 
-    def get_authorisation_redirect_api_info(
-        self, user_context: Dict[str, Any]
-    ) -> AuthorisationRedirectAPI:
-        params = {
-            "scope": " ".join(self.scopes),
-            "response_type": "code",
-            "client_id": self.client_id,
-            "access_type": "offline",
-            **self.authorisation_redirect_params,
-        }
-        return AuthorisationRedirectAPI(self.authorisation_redirect_url, params)
+    if input.config.token_endpoint is None:
+        input.config.token_endpoint = "https://bitbucket.org/site/oauth2/access_token"
 
-    def get_access_token_api_info(
-        self,
-        redirect_uri: str,
-        auth_code_from_request: str,
-        user_context: Dict[str, Any],
-    ) -> AccessTokenAPI:
-        params = {
-            "client_id": self.client_id,
-            "client_secret": self.client_secret,
-            "grant_type": "authorization_code",
-            "code": auth_code_from_request,
-            "redirect_uri": redirect_uri,
-        }
-        return AccessTokenAPI(self.access_token_api_url, params)
+    if input.config.user_info_endpoint is None:
+        input.config.user_info_endpoint = "https://api.bitbucket.org/2.0/user"
 
-    def get_redirect_uri(self, user_context: Dict[str, Any]) -> Union[None, str]:
-        return None
+    # TODO overrides and working of this
+    # once done in Node PR
 
-    def get_client_id(self, user_context: Dict[str, Any]) -> str:
-        return self.client_id
+    return NewProvider(input, BitbucketImpl)
diff --git a/supertokens_python/recipe/thirdparty/providers/gitlab.py b/supertokens_python/recipe/thirdparty/providers/gitlab.py
@@ -14,93 +14,16 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Union
-
-from supertokens_python.normalised_url_domain import NormalisedURLDomain
-
-from httpx import AsyncClient
 from supertokens_python.recipe.thirdparty.provider import Provider
-from supertokens_python.recipe.thirdparty.types import (
-    AccessTokenAPI,
-    AuthorisationRedirectAPI,
-    UserInfo,
-    UserInfoEmail,
-)
-
-if TYPE_CHECKING:
-    from supertokens_python.framework.request import BaseRequest
-
-
-class GitLab(Provider):
-    def __init__(
-        self,
-        client_id: str,
-        client_secret: str,
-        scope: Union[None, List[str]] = None,
-        authorisation_redirect: Union[
-            None, Dict[str, Union[str, Callable[[BaseRequest], str]]]
-        ] = None,
-        gitlab_base_url: str = "https://gitlab.com",
-        is_default: bool = False,
-    ):
-        super().__init__("gitlab", is_default)
-        default_scopes = ["read_user"]
-        if scope is None:
-            scope = default_scopes
-        self.client_id = client_id
-        self.client_secret = client_secret
-        self.scopes = list(set(scope))
-        gitlab_base_url = NormalisedURLDomain(gitlab_base_url).get_as_string_dangerous()
-        self.gitlab_base_url = gitlab_base_url
-        self.access_token_api_url = f"{gitlab_base_url}/oauth/token"
-        self.authorisation_redirect_url = f"{gitlab_base_url}/oauth/authorize"
-        self.authorisation_redirect_params = {}
-        if authorisation_redirect is not None:
-            self.authorisation_redirect_params = authorisation_redirect
-
-    async def get_profile_info(
-        self, auth_code_response: Dict[str, Any], user_context: Dict[str, Any]
-    ) -> UserInfo:
-        access_token: str = auth_code_response["access_token"]
-        headers = {"Authorization": f"Bearer {access_token}"}
-        async with AsyncClient() as client:
-            response = await client.get(f"{self.gitlab_base_url}/api/v4/user", headers=headers)  # type: ignore
-            user_info = response.json()
-            user_id = str(user_info["id"])
-            email = user_info.get("email")
-            if email is None:
-                return UserInfo(user_id)
-            is_email_verified = user_info.get("confirmed_at") is not None
-            return UserInfo(user_id, UserInfoEmail(email, is_email_verified))
+from .custom import GenericProvider, NewProvider
+from ..provider import Provider, ProviderInput
 
-    def get_authorisation_redirect_api_info(
-        self, user_context: Dict[str, Any]
-    ) -> AuthorisationRedirectAPI:
-        params = {
-            "scope": " ".join(self.scopes),
-            "response_type": "code",
-            "client_id": self.client_id,
-            **self.authorisation_redirect_params,
-        }
-        return AuthorisationRedirectAPI(self.authorisation_redirect_url, params)
 
-    def get_access_token_api_info(
-        self,
-        redirect_uri: str,
-        auth_code_from_request: str,
-        user_context: Dict[str, Any],
-    ) -> AccessTokenAPI:
-        params = {
-            "client_id": self.client_id,
-            "client_secret": self.client_secret,
-            "grant_type": "authorization_code",
-            "code": auth_code_from_request,
-            "redirect_uri": redirect_uri,
-        }
-        return AccessTokenAPI(self.access_token_api_url, params)
+# TODO Implement when it's done in Node PR
+class GitlabImpl(GenericProvider):
+    pass
 
-    def get_redirect_uri(self, user_context: Dict[str, Any]) -> Union[None, str]:
-        return None
 
-    def get_client_id(self, user_context: Dict[str, Any]) -> str:
-        return self.client_id
+# TODO Implement when it's done in Node PR
+def Gitlab(input: ProviderInput) -> Provider:  # pylint: disable=redefined-builtin
+    return NewProvider(input, GitlabImpl)
diff --git a/supertokens_python/recipe/thirdpartyemailpassword/recipe.py b/supertokens_python/recipe/thirdpartyemailpassword/recipe.py
@@ -111,6 +111,7 @@ def get_emailpassword_config() -> EmailPasswordConfig:
             Querier.get_instance(EmailPasswordRecipe.recipe_id),
             Querier.get_instance(ThirdPartyRecipe.recipe_id),
             self.config.providers,
+            get_emailpassword_config,
         )
         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,12 +13,13 @@
 # under the License.
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union, Callable
 
 import supertokens_python.recipe.emailpassword.interfaces as EPInterfaces
 from supertokens_python.recipe.thirdparty.interfaces import GetProviderOkResult
 from supertokens_python.recipe.thirdparty.provider import ProviderInput
 from supertokens_python.recipe.thirdparty.types import RawUserInfoFromProvider
+from supertokens_python.recipe.emailpassword.utils import EmailPasswordConfig
 
 if TYPE_CHECKING:
     from supertokens_python.querier import Querier
@@ -54,7 +55,6 @@
 from .third_party_recipe_implementation import (
     RecipeImplementation as DerivedThirdPartyImplementation,
 )
-from supertokens_python.recipe.emailpassword.utils import EmailPasswordConfig
 
 
 class RecipeImplementation(RecipeInterface):
@@ -63,6 +63,7 @@ def __init__(
         emailpassword_querier: Querier,
         thirdparty_querier: Querier,
         providers: List[ProviderInput],
+        get_emailpassword_config: Callable[[], EmailPasswordConfig],
     ):
         super().__init__()
         emailpassword_implementation = EmailPasswordImplementation(

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ def get_emailpassword_config() -> EmailPasswordConfig:`
`111`	`111`	`Querier.get_instance(EmailPasswordRecipe.recipe_id),`
`112`	`112`	`Querier.get_instance(ThirdPartyRecipe.recipe_id),`
`113`	`113`	`self.config.providers,`
	`114`	`+ get_emailpassword_config,`
`114`	`115`	`)`
`115`	`116`	`self.recipe_implementation: RecipeInterface = (`
`116`	`117`	`recipe_implementation`