wip3

src/fastapi_toolsets/security/__init__.py

@@ -1,14 +1,13 @@
 """Authentication helpers for FastAPI using Security()."""
 
-from .base import AuthSource
+from .abc import AuthSource
-from .multi import MultiAuth
+from .sources import BearerTokenAuth, CookieAuth, MultiAuth, OAuth2Auth, OpenIDAuth
-from .sources import BearerTokenAuth, CookieAuth, OAuth2Auth, OpenIDAuth
 
 __all__ = [
     "AuthSource",
     "BearerTokenAuth",
     "CookieAuth",
+    "MultiAuth",
     "OAuth2Auth",
     "OpenIDAuth",
-    "MultiAuth",
 ]

src/fastapi_toolsets/security/sources/__init__.py

@@ -2,7 +2,8 @@
 
 from .bearer import BearerTokenAuth
 from .cookie import CookieAuth
+from .multi import MultiAuth
 from .oauth2 import OAuth2Auth
 from .openid import OpenIDAuth
 
-__all__ = ["BearerTokenAuth", "CookieAuth", "OAuth2Auth", "OpenIDAuth"]
+__all__ = ["BearerTokenAuth", "CookieAuth", "MultiAuth", "OAuth2Auth", "OpenIDAuth"]

src/fastapi_toolsets/security/sources/bearer.py

@@ -9,7 +9,7 @@ from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer, SecurityS
 
 from fastapi_toolsets.exceptions import UnauthorizedError
 
-from ..base import AuthSource, _call_validator
+from ..abc import AuthSource, _call_validator
 
 
 class BearerTokenAuth(AuthSource):

src/fastapi_toolsets/security/sources/cookie.py

@@ -13,7 +13,7 @@ from fastapi.security import APIKeyCookie, SecurityScopes
 
 from fastapi_toolsets.exceptions import UnauthorizedError
 
-from ..base import AuthSource, _call_validator
+from ..abc import AuthSource, _call_validator
 
 
 class CookieAuth(AuthSource):

src/fastapi_toolsets/security/sources/multi.py

@@ -8,7 +8,7 @@ from fastapi.security import SecurityScopes
 
 from fastapi_toolsets.exceptions import UnauthorizedError
 
-from .base import AuthSource
+from ..abc import AuthSource
 
 
 class MultiAuth:

src/fastapi_toolsets/security/sources/oauth2.py

@@ -8,7 +8,7 @@ from fastapi.security import OAuth2PasswordBearer, SecurityScopes
 
 from fastapi_toolsets.exceptions import UnauthorizedError
 
-from ..base import AuthSource, _call_validator
+from ..abc import AuthSource, _call_validator
 
 
 class OAuth2Auth(AuthSource):

src/fastapi_toolsets/security/sources/openid.py

@@ -8,7 +8,7 @@ from fastapi.security import OpenIdConnect, SecurityScopes
 
 from fastapi_toolsets.exceptions import UnauthorizedError
 
-from ..base import AuthSource, _call_validator
+from ..abc import AuthSource, _call_validator
 
 
 class OpenIDAuth(AuthSource):

tests/test_security.py

@@ -507,7 +507,7 @@ class TestMultiAuth:
         assert org_calls == ["org_acme"]
 
     def test_require_returns_new_multi_auth(self):
-        from fastapi_toolsets.security.multi import MultiAuth as MultiAuthClass
+        from fastapi_toolsets.security.sources import MultiAuth as MultiAuthClass
 
         bearer = BearerTokenAuth(role_validator)
         multi = MultiAuth(bearer)