Merge branch '0.12' into feat/dashboard-analytics

nkshah2 · nkshah2 · commit 0a7087e5633e · 2023-03-30T18:24:14.000+05:30
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,10 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## unreleased
 
+## [0.12.4] - 2023-03-29
 ### Changed
-
 - Update all example apps to initialise dashboard recipe
 
+### Added
+- Login with gitlab (single tenant only) and bitbucket
+
 ## [0.12.3] - 2023-02-27
 - Adds APIs and logic to the dashboard recipe to enable email password based login
 ## [0.12.2] - 2023-02-23
diff --git a/coreDriverInterfaceSupported.json b/coreDriverInterfaceSupported.json
@@ -10,6 +10,7 @@
     "2.15",
     "2.16",
     "2.17",
-    "2.18"
+    "2.18",
+    "2.19"
   ]
-}
+}
diff --git a/html/supertokens_python/constants.html b/html/supertokens_python/constants.html
@@ -50,8 +50,9 @@ <h1 class="title">Module <code>supertokens_python.constants</code></h1>
     &#34;2.16&#34;,
     &#34;2.17&#34;,
     &#34;2.18&#34;,
+    &#34;2.19&#34;,
 ]
-VERSION = &#34;0.12.3&#34;
+VERSION = &#34;0.12.4&#34;
 TELEMETRY = &#34;/telemetry&#34;
 USER_COUNT = &#34;/users/count&#34;
 USER_DELETE = &#34;/user/remove&#34;
diff --git a/html/supertokens_python/recipe/thirdparty/index.html b/html/supertokens_python/recipe/thirdparty/index.html
@@ -57,6 +57,8 @@ <h1 class="title">Module <code>supertokens_python.recipe.thirdparty</code></h1>
 Github = providers.Github
 Google = providers.Google
 GoogleWorkspaces = providers.GoogleWorkspaces
+Bitbucket = providers.Bitbucket
+GitLab = providers.GitLab
 exceptions = ex
 
 if TYPE_CHECKING:
diff --git a/html/supertokens_python/recipe/thirdparty/provider.html b/html/supertokens_python/recipe/thirdparty/provider.html
@@ -145,9 +145,11 @@ <h3>Ancestors</h3>
 <h3>Subclasses</h3>
 <ul class="hlist">
 <li><a title="supertokens_python.recipe.thirdparty.providers.apple.Apple" href="providers/apple.html#supertokens_python.recipe.thirdparty.providers.apple.Apple">Apple</a></li>
+<li><a title="supertokens_python.recipe.thirdparty.providers.bitbucket.Bitbucket" href="providers/bitbucket.html#supertokens_python.recipe.thirdparty.providers.bitbucket.Bitbucket">Bitbucket</a></li>
 <li><a title="supertokens_python.recipe.thirdparty.providers.discord.Discord" href="providers/discord.html#supertokens_python.recipe.thirdparty.providers.discord.Discord">Discord</a></li>
 <li><a title="supertokens_python.recipe.thirdparty.providers.facebook.Facebook" href="providers/facebook.html#supertokens_python.recipe.thirdparty.providers.facebook.Facebook">Facebook</a></li>
 <li><a title="supertokens_python.recipe.thirdparty.providers.github.Github" href="providers/github.html#supertokens_python.recipe.thirdparty.providers.github.Github">Github</a></li>
+<li><a title="supertokens_python.recipe.thirdparty.providers.gitlab.GitLab" href="providers/gitlab.html#supertokens_python.recipe.thirdparty.providers.gitlab.GitLab">GitLab</a></li>
 <li><a title="supertokens_python.recipe.thirdparty.providers.google.Google" href="providers/google.html#supertokens_python.recipe.thirdparty.providers.google.Google">Google</a></li>
 <li><a title="supertokens_python.recipe.thirdparty.providers.google_workspaces.GoogleWorkspaces" href="providers/google_workspaces.html#supertokens_python.recipe.thirdparty.providers.google_workspaces.GoogleWorkspaces">GoogleWorkspaces</a></li>
 </ul>
diff --git a/html/supertokens_python/recipe/thirdparty/providers/bitbucket.html b/html/supertokens_python/recipe/thirdparty/providers/bitbucket.html
diff --git a/html/supertokens_python/recipe/thirdparty/providers/gitlab.html b/html/supertokens_python/recipe/thirdparty/providers/gitlab.html
diff --git a/html/supertokens_python/recipe/thirdparty/providers/index.html b/html/supertokens_python/recipe/thirdparty/providers/index.html
@@ -44,7 +44,9 @@ <h1 class="title">Module <code>supertokens_python.recipe.thirdparty.providers</c
 from .facebook import Facebook  # type: ignore
 from .github import Github  # type: ignore
 from .google import Google  # type: ignore
-from .google_workspaces import GoogleWorkspaces  # type: ignore</code></pre>
+from .google_workspaces import GoogleWorkspaces  # type: ignore
+from .bitbucket import Bitbucket  # type: ignore
+from .gitlab import GitLab  # type: ignore</code></pre>
 </details>
 </section>
 <section>
@@ -54,6 +56,10 @@ <h2 class="section-title" id="header-submodules">Sub-modules</h2>
 <dd>
 <div class="desc"></div>
 </dd>
+<dt><code class="name"><a title="supertokens_python.recipe.thirdparty.providers.bitbucket" href="bitbucket.html">supertokens_python.recipe.thirdparty.providers.bitbucket</a></code></dt>
+<dd>
+<div class="desc"></div>
+</dd>
 <dt><code class="name"><a title="supertokens_python.recipe.thirdparty.providers.discord" href="discord.html">supertokens_python.recipe.thirdparty.providers.discord</a></code></dt>
 <dd>
 <div class="desc"></div>
@@ -66,6 +72,10 @@ <h2 class="section-title" id="header-submodules">Sub-modules</h2>
 <dd>
 <div class="desc"></div>
 </dd>
+<dt><code class="name"><a title="supertokens_python.recipe.thirdparty.providers.gitlab" href="gitlab.html">supertokens_python.recipe.thirdparty.providers.gitlab</a></code></dt>
+<dd>
+<div class="desc"></div>
+</dd>
 <dt><code class="name"><a title="supertokens_python.recipe.thirdparty.providers.google" href="google.html">supertokens_python.recipe.thirdparty.providers.google</a></code></dt>
 <dd>
 <div class="desc"></div>
@@ -101,9 +111,11 @@ <h2>Index</h2>
 <li><h3><a href="#header-submodules">Sub-modules</a></h3>
 <ul>
 <li><code><a title="supertokens_python.recipe.thirdparty.providers.apple" href="apple.html">supertokens_python.recipe.thirdparty.providers.apple</a></code></li>
+<li><code><a title="supertokens_python.recipe.thirdparty.providers.bitbucket" href="bitbucket.html">supertokens_python.recipe.thirdparty.providers.bitbucket</a></code></li>
 <li><code><a title="supertokens_python.recipe.thirdparty.providers.discord" href="discord.html">supertokens_python.recipe.thirdparty.providers.discord</a></code></li>
 <li><code><a title="supertokens_python.recipe.thirdparty.providers.facebook" href="facebook.html">supertokens_python.recipe.thirdparty.providers.facebook</a></code></li>
 <li><code><a title="supertokens_python.recipe.thirdparty.providers.github" href="github.html">supertokens_python.recipe.thirdparty.providers.github</a></code></li>
+<li><code><a title="supertokens_python.recipe.thirdparty.providers.gitlab" href="gitlab.html">supertokens_python.recipe.thirdparty.providers.gitlab</a></code></li>
 <li><code><a title="supertokens_python.recipe.thirdparty.providers.google" href="google.html">supertokens_python.recipe.thirdparty.providers.google</a></code></li>
 <li><code><a title="supertokens_python.recipe.thirdparty.providers.google_workspaces" href="google_workspaces.html">supertokens_python.recipe.thirdparty.providers.google_workspaces</a></code></li>
 <li><code><a title="supertokens_python.recipe.thirdparty.providers.okta" href="okta.html">supertokens_python.recipe.thirdparty.providers.okta</a></code></li>
diff --git a/html/supertokens_python/recipe/thirdpartyemailpassword/index.html b/html/supertokens_python/recipe/thirdpartyemailpassword/index.html
@@ -63,6 +63,8 @@ <h1 class="title">Module <code>supertokens_python.recipe.thirdpartyemailpassword
 Github = thirdparty.Github
 Google = thirdparty.Google
 GoogleWorkspaces = thirdparty.GoogleWorkspaces
+Bitbucket = thirdparty.Bitbucket
+GitLab = thirdparty.GitLab
 SMTPService = emaildelivery_services.SMTPService
 
 if TYPE_CHECKING:
diff --git a/html/supertokens_python/recipe/thirdpartypasswordless/index.html b/html/supertokens_python/recipe/thirdpartypasswordless/index.html
@@ -66,6 +66,8 @@ <h1 class="title">Module <code>supertokens_python.recipe.thirdpartypasswordless<
 Github = thirdparty.Github
 Google = thirdparty.Google
 GoogleWorkspaces = thirdparty.GoogleWorkspaces
+Bitbucket = thirdparty.Bitbucket
+GitLab = thirdparty.GitLab
 ContactPhoneOnlyConfig = passwordless.ContactPhoneOnlyConfig
 ContactEmailOnlyConfig = passwordless.ContactEmailOnlyConfig
 ContactEmailOrPhoneConfig = passwordless.ContactEmailOrPhoneConfig
diff --git a/setup.py b/setup.py
@@ -70,7 +70,7 @@
 
 setup(
     name="supertokens_python",
-    version="0.12.3",
+    version="0.12.4",
     author="SuperTokens",
     license="Apache 2.0",
     author_email="team@supertokens.com",
diff --git a/src/supertokens-python b/src/supertokens-python
diff --git a/supertokens_python/constants.py b/supertokens_python/constants.py
@@ -22,8 +22,9 @@
     "2.16",
     "2.17",
     "2.18",
+    "2.19",
 ]
-VERSION = "0.12.3"
+VERSION = "0.12.4"
 TELEMETRY = "/telemetry"
 USER_COUNT = "/users/count"
 USER_DELETE = "/user/remove"
diff --git a/supertokens_python/recipe/thirdparty/__init__.py b/supertokens_python/recipe/thirdparty/__init__.py
@@ -29,6 +29,8 @@
 Github = providers.Github
 Google = providers.Google
 GoogleWorkspaces = providers.GoogleWorkspaces
+Bitbucket = providers.Bitbucket
+GitLab = providers.GitLab
 exceptions = ex
 
 if TYPE_CHECKING:
diff --git a/supertokens_python/recipe/thirdparty/providers/__init__.py b/supertokens_python/recipe/thirdparty/providers/__init__.py
@@ -17,3 +17,5 @@
 from .github import Github  # type: ignore
 from .google import Google  # type: ignore
 from .google_workspaces import GoogleWorkspaces  # type: ignore
+from .bitbucket import Bitbucket  # type: ignore
+from .gitlab import GitLab  # type: ignore
diff --git a/supertokens_python/recipe/thirdparty/providers/bitbucket.py b/supertokens_python/recipe/thirdparty/providers/bitbucket.py
@@ -0,0 +1,113 @@
+# Copyright (c) 2023, VRAI Labs and/or its affiliates. All rights reserved.
+#
+# This software is licensed under the Apache License, Version 2.0 (the
+# "License") as published by the Apache Software Foundation.
+#
+# You may not use this file except in compliance with the License. You may
+# obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+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,
+)
+
+if TYPE_CHECKING:
+    from supertokens_python.framework.request import BaseRequest
+
+
+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
+
+            if email is None:
+                return UserInfo(user_id)
+            return UserInfo(user_id, UserInfoEmail(email, is_verified))
+
+    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)
+
+    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)
+
+    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
diff --git a/supertokens_python/recipe/thirdparty/providers/gitlab.py b/supertokens_python/recipe/thirdparty/providers/gitlab.py
@@ -0,0 +1,106 @@
+# Copyright (c) 2023, VRAI Labs and/or its affiliates. All rights reserved.
+#
+# This software is licensed under the Apache License, Version 2.0 (the
+# "License") as published by the Apache Software Foundation.
+#
+# You may not use this file except in compliance with the License. You may
+# obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+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))
+
+    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)
+
+    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
diff --git a/supertokens_python/recipe/thirdpartyemailpassword/__init__.py b/supertokens_python/recipe/thirdpartyemailpassword/__init__.py
@@ -35,6 +35,8 @@
 Github = thirdparty.Github
 Google = thirdparty.Google
 GoogleWorkspaces = thirdparty.GoogleWorkspaces
+Bitbucket = thirdparty.Bitbucket
+GitLab = thirdparty.GitLab
 SMTPService = emaildelivery_services.SMTPService
 
 if TYPE_CHECKING:
diff --git a/supertokens_python/recipe/thirdpartypasswordless/__init__.py b/supertokens_python/recipe/thirdpartypasswordless/__init__.py
@@ -38,6 +38,8 @@
 Github = thirdparty.Github
 Google = thirdparty.Google
 GoogleWorkspaces = thirdparty.GoogleWorkspaces
+Bitbucket = thirdparty.Bitbucket
+GitLab = thirdparty.GitLab
 ContactPhoneOnlyConfig = passwordless.ContactPhoneOnlyConfig
 ContactEmailOnlyConfig = passwordless.ContactEmailOnlyConfig
 ContactEmailOrPhoneConfig = passwordless.ContactEmailOrPhoneConfig

-Original file line number
+Diff line change
     "2.15",
     "2.16",
     "2.17",
 -    "2.18"
 +    "2.18",
 +    "2.19"
+  ]
 -}
 +}