TST: fix unit tests

Author: dmgav

bluesky_httpserver/authentication.py bluesky_httpserver/_authentication.pybluesky_httpserver/authentication.py renamed to bluesky_httpserver/_authentication.py

@@ -1,5 +1,4 @@
 import asyncio
-import enum
 import hashlib
 import secrets
 import uuid as uuid_module
@@ -31,11 +30,6 @@
     from pydantic_settings import BaseSettings
 
 from . import schemas
-from .authentication.authenticator_base import (
-    ExternalAuthenticator,
-    InternalAuthenticator,
-    UserSessionState,
-)
 from .authorization._defaults import _DEFAULT_ANONYMOUS_PROVIDER_NAME
 from .core import json_or_msgpack
 from .database import orm
@@ -59,6 +53,7 @@ def utcnow():
     "UTC now with second resolution"
     return datetime.utcnow().replace(microsecond=0)
 
+
 class Token(BaseModel):
     access_token: str
     token_type: str
@@ -484,7 +479,9 @@ async def handle_credentials(
         api_access_manager=Depends(get_api_access_manager),
     ):
         request.state.endpoint = "auth"
-        user_session_state = await authenticator.authenticate(username=form_data.username, password=form_data.password)
+        user_session_state = await authenticator.authenticate(
+            username=form_data.username, password=form_data.password
+        )
         username = user_session_state.user_name if user_session_state else None
 
         err_msg = None

bluesky_httpserver/authentication/__init__.py

@@ -1,3 +1,11 @@
+from .._authentication import (
+    base_authentication_router,
+    build_auth_code_route,
+    build_handle_credentials_route,
+    get_current_principal,
+    get_current_principal_websocket,
+    oauth2_scheme,
+)
 from .authenticator_base import (
     ExternalAuthenticator,
     InternalAuthenticator,
@@ -8,4 +16,10 @@
     "ExternalAuthenticator",
     "InternalAuthenticator",
     "UserSessionState",
+    "get_current_principal",
+    "get_current_principal_websocket",
+    "base_authentication_router",
+    "build_auth_code_route",
+    "build_handle_credentials_route",
+    "oauth2_scheme",
 ]

bluesky_httpserver/tests/test_authenticators.py

@@ -3,7 +3,7 @@
 import pytest
 
 # fmt: off
-from ..authenticators import LDAPAuthenticator
+from ..authenticators import LDAPAuthenticator, UserSessionState
 
 
 @pytest.mark.parametrize("ldap_server_address, ldap_server_port", [
@@ -35,8 +35,8 @@ def test_LDAPAuthenticator_01(use_tls, use_ssl, ldap_server_address, ldap_server
     )
 
     async def testing():
-        assert await authenticator.authenticate("user01", "password1") == "user01"
-        assert await authenticator.authenticate("user02", "password2") == "user02"
+        assert await authenticator.authenticate("user01", "password1") == UserSessionState("user01", {})
+        assert await authenticator.authenticate("user02", "password2") == UserSessionState("user02", {})
         assert await authenticator.authenticate("user02a", "password2") is None
         assert await authenticator.authenticate("user02", "password2a") is None
 

requirements.txt

@@ -1,6 +1,7 @@
 alembic
 bluesky-queueserver
 bluesky-queueserver-api
+cachetools
 fastapi
 ldap3
 orjson