First commit with common-auth flow

Author: davidpcls

bluesky_httpserver/app.py

@@ -14,8 +14,8 @@
 from fastapi import APIRouter, FastAPI, Request, Response
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.openapi.utils import get_openapi
+from bluesky_authentication.protocols import ExternalAuthenticator, InternalAuthenticator
 
-from .authentication import ExternalAuthenticator, InternalAuthenticator
 from .console_output import CollectPublishedConsoleOutput, ConsoleOutputStream, SystemInfoStream
 from .core import PatchedStreamingResponse
 from .database.core import purge_expired

bluesky_httpserver/authentication/authenticator_base.py

@@ -1,37 +1,31 @@
-from abc import ABC
-from dataclasses import dataclass
-from typing import Optional
+try:
+    from bluesky_authentication.protocols import (
+        ExternalAuthenticator,
+        InternalAuthenticator,
+        UserSessionState,
+    )
+except ModuleNotFoundError:
+    from abc import ABC
+    from dataclasses import dataclass
+    from typing import Optional
 
-from fastapi import Request
+    from fastapi import Request
 
+    @dataclass
+    class UserSessionState:
+        """Data transfer class to communicate custom session state information."""
 
-@dataclass
-class UserSessionState:
-    """Data transfer class to communicate custom session state information."""
+        user_name: str
+        state: dict = None
 
-    user_name: str
-    state: dict = None
+    class InternalAuthenticator(ABC):
+        """Base class for authenticators that use username/password credentials."""
 
+        async def authenticate(self, username: str, password: str) -> Optional[UserSessionState]:
+            raise NotImplementedError
 
-class InternalAuthenticator(ABC):
-    """
-    Base class for authenticators that use username/password credentials.
+    class ExternalAuthenticator(ABC):
+        """Base class for authenticators that use external identity providers."""
 
-    Subclasses must implement the authenticate method which takes a username
-    and password and returns a UserSessionState on success or None on failure.
-    """
-
-    async def authenticate(self, username: str, password: str) -> Optional[UserSessionState]:
-        raise NotImplementedError
-
-
-class ExternalAuthenticator(ABC):
-    """
-    Base class for authenticators that use external identity providers.
-
-    Subclasses must implement the authenticate method which takes a FastAPI
-    Request object and returns a UserSessionState on success or None on failure.
-    """
-
-    async def authenticate(self, request: Request) -> Optional[UserSessionState]:
-        raise NotImplementedError
+        async def authenticate(self, request: Request) -> Optional[UserSessionState]:
+            raise NotImplementedError