fix(Cluster): remove Fief client; copy code for login auth callback

Author: fubuloubu

setup.py

@@ -72,14 +72,15 @@
         "ethpm-types>=0.6.10",  # lower pin only, `eth-ape` governs upper pin
         "eth-pydantic-types",  # Use same version as eth-ape
         "exceptiongroup; python_version < '3.11'",  # Used with TaskGroup
+        "httpx>=0.28,<1",  # Use for Cluster client, auth
+        "jwcrypto>=1.4,<2",  # Use for auth
         "packaging",  # Use same version as eth-ape
         "pycron>=3.1,<4",  # Checking/triggering cron tasks
         "pydantic_settings",  # Use same version as eth-ape
         "quattro>=25.2,<26",  # Manage task groups and background tasks
         "taskiq[metrics]>=0.11.16,<0.12",
         "tomlkit>=0.12,<1",  # For reading/writing global platform profile
-        "fief_client @ git+https://github.com/ApeWorX/fief-python@fix/support-ory#egg=fief_client[cli]",  # for platform auth/cluster login  # noqa: E501
-        "yaspin",  # NOTE: Required by fief-client
+        "yaspin>=3.1,<4",  # Display a nice spinner when logging in
         "web3>=7.7,<8",  # TODO: Remove when Ape v0.9 is released (Ape v0.8 allows web3 v6)
     ],
     entry_points={

silverback/_cli.py

@@ -37,9 +37,9 @@
 if TYPE_CHECKING:
     from ape.api import AccountAPI, EcosystemAPI, NetworkAPI, ProviderAPI
     from ape.contracts import ContractInstance
-    from fief_client.integrations.cli import FiefAuth
 
-    from silverback.cluster.client import Bot, ClusterClient, PlatformClient
+    from .cluster.auth import Auth
+    from .cluster.client import Bot, ClusterClient, PlatformClient
 
 LOCAL_DATETIME = "%Y-%m-%d %H:%M:%S %Z"
 
@@ -232,7 +232,7 @@ def worker(cli_ctx, account, workers, max_exceptions, shutdown_timeout, debug, b
 
 @cli.command(section="Cloud Commands (https://silverback.apeworx.io)")
 @auth_required
-def login(auth: "FiefAuth"):
+def login(auth: "Auth"):
     """Login to ApeWorX Authorization Service (https://account.apeworx.io)"""
 
     state = secrets.token_urlsafe()

silverback/_click_ext.py

@@ -5,17 +5,16 @@
 from typing import TYPE_CHECKING, Any
 
 import click
-from fief_client import Fief
-from fief_client.integrations.cli import FiefAuth, FiefAuthNotAuthenticatedError
 
-from silverback.cluster.settings import (
+from .cluster.auth import Auth, AuthClient, NotAuthenticatedError
+from .cluster.settings import (
     PROFILE_PATH,
     BaseProfile,
     ClusterProfile,
     PlatformProfile,
     ProfileSettings,
 )
-from silverback.exceptions import ImportFromStringError
+from .exceptions import ImportFromStringError
 
 if TYPE_CHECKING:
     from ape.contracts import ContractInstance
@@ -219,8 +218,8 @@ def add_auth(ctx: click.Context, *args, **kwargs):
 
         if isinstance(profile, PlatformProfile):
             auth_info = settings.auth[profile.auth]
-            fief = Fief(auth_info.host, auth_info.client_id)
-            ctx.obj["auth"] = FiefAuth(fief, str(PROFILE_PATH.parent / f"{profile.auth}.json"))
+            client = AuthClient(auth_info.host, auth_info.client_id)
+            ctx.obj["auth"] = Auth(client, str(PROFILE_PATH.parent / f"{profile.auth}.json"))
 
             if expose_value:
                 kwargs["auth"] = ctx.obj["auth"]
@@ -245,10 +244,10 @@ def get_platform_client(ctx: click.Context, *args, **kwargs):
                 raise click.UsageError("This command only works with the Silverback Platform")
 
             # NOTE: `auth` should be set if `profile` is set and is `PlatformProfile`
-            auth: FiefAuth = ctx.obj["auth"]
+            auth: Auth = ctx.obj["auth"]
             try:
                 userinfo = auth.current_user()
-            except FiefAuthNotAuthenticatedError as e:
+            except NotAuthenticatedError as e:
                 raise click.UsageError(
                     "Not authenticated, please use `silverback login` first."
                 ) from e