refactoring

markus-96 · Jan 22, 2023 · 828778f · 828778f
1 parent 2cbdd99
commit 828778f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/kvmd/apps/kvmd/__init__.py b/kvmd/apps/kvmd/__init__.py
@@ -74,12 +74,14 @@ def main(argv: (list[str] | None)=None) -> None:
 
     KvmdServer(
         auth_manager=AuthManager(
+            enabled=config.auth.enabled,
+
             internal_type=config.auth.internal.type,
             internal_kwargs=config.auth.internal._unpack(ignore=["type", "force_users"]),
+            force_internal_users=config.auth.internal.force_users,
+
             external_type=config.auth.external.type,
             external_kwargs=(config.auth.external._unpack(ignore=["type"]) if config.auth.external.type else {}),
-            force_internal_users=config.auth.internal.force_users,
-            enabled=config.auth.enabled,
         ),
         info_manager=InfoManager(global_config),
         log_reader=(LogReader() if config.log_reader.enabled else None),

diff --git a/kvmd/apps/kvmd/auth.py b/kvmd/apps/kvmd/auth.py
@@ -34,15 +34,14 @@
 class AuthManager:
     def __init__(
         self,
+        enabled: bool,
 
         internal_type: str,
         internal_kwargs: dict,
+        force_internal_users: list[str],
 
         external_type: str,
         external_kwargs: dict,
-
-        force_internal_users: list[str],
-        enabled: bool,
     ) -> None:
 
         self.__enabled = enabled

diff --git a/testenv/tests/apps/kvmd/test_auth.py b/testenv/tests/apps/kvmd/test_auth.py
@@ -51,12 +51,14 @@ async def _get_configured_manager(
 ) -> AsyncGenerator[AuthManager, None]:
 
     manager = AuthManager(
+        enabled=True,
+
         internal_type="htpasswd",
         internal_kwargs=_make_service_kwargs(internal_path),
+        force_internal_users=(force_internal_users or []),
+
         external_type=("htpasswd" if external_path else ""),
         external_kwargs=(_make_service_kwargs(external_path) if external_path else {}),
-        force_internal_users=(force_internal_users or []),
-        enabled=True,
     )
 
     try:
@@ -139,12 +141,14 @@ async def test_ok__external(tmpdir) -> None:  # type: ignore
 async def test_ok__disabled() -> None:
     try:
         manager = AuthManager(
+            enabled=False,
+
             internal_type="foobar",
             internal_kwargs={},
+            force_internal_users=[],
+
             external_type="",
             external_kwargs={},
-            force_internal_users=[],
-            enabled=False,
         )
 
         assert not manager.is_auth_enabled()