fractal-server 2.18.3__tar.gz → 2.18.3a1__tar.gz

{fractal_server-2.18.3 → fractal_server-2.18.3a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.18.3
+Version: 2.18.3a1
 Summary: Backend component of the Fractal analytics platform
 Author: Tommaso Comparin, Marco Franzon, Yuri Chiucconi, Jacopo Nespolo
 Author-email: Tommaso Comparin <tommaso.comparin@exact-lab.it>, Marco Franzon <marco.franzon@exact-lab.it>, Yuri Chiucconi <yuri.chiucconi@exact-lab.it>, Jacopo Nespolo <jacopo.nespolo@exact-lab.it>

fractal_server-2.18.3a1/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.18.3a1"

{fractal_server-2.18.3 → fractal_server-2.18.3a1}/fractal_server/app/routes/auth/oauth.py

@@ -3,8 +3,6 @@ from httpx_oauth.clients.github import GitHubOAuth2
 from httpx_oauth.clients.google import GoogleOAuth2
 from httpx_oauth.clients.openid import OpenID
 from httpx_oauth.clients.openid import OpenIDConfigurationError
-from httpx_oauth.exceptions import GetIdEmailError
-from httpx_oauth.exceptions import GetProfileError
 
 from fractal_server.config import OAuthSettings
 from fractal_server.config import get_oauth_settings
@@ -15,29 +13,6 @@ from . import cookie_backend
 from . import fastapi_users
 
 
-class FractalOpenID(OpenID):
-    """
-    Subclass of `httpx_oauth.clients.openid.OpenID` with customizable name for
-    the `"email"` claim.
-    """
-
-    def __init__(self, *, email_claim: str, **kwargs):
-        super().__init__(**kwargs)
-        self.email_claim = email_claim
-
-    # TODO-requires-py312: add `@override` decorator
-    async def get_id_email(self, token: str) -> tuple[str, str | None]:
-        """
-        Identical to the parent-class method (httpx-oauth version 0.16.1),
-        apart from making `"email"` configurable.
-        """
-        try:
-            profile = await self.get_profile(token)
-        except GetProfileError as e:
-            raise GetIdEmailError(response=e.response) from e
-        return str(profile["sub"]), profile.get(self.email_claim)
-
-
 def _create_client_github(cfg: OAuthSettings) -> GitHubOAuth2:
     return GitHubOAuth2(
         client_id=cfg.OAUTH_CLIENT_ID.get_secret_value(),
@@ -54,11 +29,10 @@ def _create_client_google(cfg: OAuthSettings) -> GoogleOAuth2:
 
 def _create_client_oidc(cfg: OAuthSettings) -> OpenID:
     try:
-        open_id = FractalOpenID(
+        open_id = OpenID(
             client_id=cfg.OAUTH_CLIENT_ID.get_secret_value(),
             client_secret=cfg.OAUTH_CLIENT_SECRET.get_secret_value(),
             openid_configuration_endpoint=cfg.OAUTH_OIDC_CONFIG_ENDPOINT.get_secret_value(),  # noqa
-            email_claim=cfg.OAUTH_EMAIL_CLAIM,
         )
     except OpenIDConfigurationError as e:
         OAUTH_OIDC_CONFIG_ENDPOINT = (

{fractal_server-2.18.3 → fractal_server-2.18.3a1}/fractal_server/config/_oauth.py

@@ -28,11 +28,6 @@ class OAuthSettings(BaseSettings):
             String to be used as `redirect_url` argument in
             `fastapi_users.get_oauth_router`, and then in
             `httpx_oauth.integrations.fastapi.OAuth2AuthorizeCallback`.
-        OAUTH_EMAIL_CLAIM:
-            Name of the OIDC claim with the user's email address. This is
-            `"email"` by default, but can be customized (e.g. to `"mail"`) to
-            fit with the response from the userinfo endpoint - see
-            https://openid.net/specs/openid-connect-core-1_0.html#UserInfoResponse
     """
 
     model_config = SettingsConfigDict(**SETTINGS_CONFIG_DICT)
@@ -48,7 +43,6 @@ class OAuthSettings(BaseSettings):
     OAUTH_CLIENT_SECRET: SecretStr | None = None
     OAUTH_OIDC_CONFIG_ENDPOINT: SecretStr | None = None
     OAUTH_REDIRECT_URL: str | None = None
-    OAUTH_EMAIL_CLAIM: str = "email"
 
     @model_validator(mode="after")
     def check_configuration(self: Self) -> Self:

{fractal_server-2.18.3 → fractal_server-2.18.3a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fractal-server"
-version = "2.18.3"
+version = "2.18.3a1"
 description = "Backend component of the Fractal analytics platform"
 authors = [
     { name="Tommaso Comparin", email="tommaso.comparin@exact-lab.it" },
@@ -92,7 +92,7 @@ filterwarnings = [
 markers = ["container", "ssh", "fails_on_macos", "oauth"]
 
 [tool.bumpver]
-current_version = "2.18.3"
+current_version = "2.18.3a1"
 version_pattern = "MAJOR.MINOR.PATCH[PYTAGNUM]"
 commit_message = "bump version {old_version} -> {new_version}"
 commit = true

fractal_server-2.18.3/fractal_server/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "2.18.3"