After review

CERT-Polska · Nov 6, 2024 · 944fe07 · 944fe07
1 parent 6785c83
commit 944fe07
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/app.py b/src/app.py
@@ -577,7 +577,7 @@ def query_remove(
 def server() -> ServerSchema:
     return ServerSchema(
         version=mquery_version(),
-        auth_enabled=db.config.auth_enabled,
+        auth_enabled=str(db.config.auth_enabled).lower(),
         openid_url=db.config.openid_url,
         openid_client_id=db.config.openid_client_id,
         about=app_config.mquery.about,

diff --git a/src/db.py b/src/db.py
@@ -78,7 +78,7 @@ def auth_default_roles(self) -> List[UserRole]:
         ]
 
     @property
-    def openid_client_id(self) -> str:
+    def openid_client_id(self) -> str | None:
         return self.db.get_mquery_config_key("openid_client_id")
 
     @property
@@ -87,13 +87,10 @@ def query_allow_slow(self) -> bool:
 
     @property
     def auth_enabled(self) -> bool:
-        auth_enabled = self.db.get_mquery_config_key("auth_enabled")
-        if not auth_enabled or auth_enabled == "false":
-            return False
-        return True
+        return self.db.get_mquery_config_key("auth_enabled") == "true"
 
     @property
-    def openid_url(self) -> str:
+    def openid_url(self) -> str | None:
         return self.db.get_mquery_config_key("openid_url")
 
     @property

diff --git a/src/schema.py b/src/schema.py
@@ -101,7 +101,7 @@ class BackendStatusDatasetsSchema(BaseModel):
 
 class ServerSchema(BaseModel):
     version: str
-    auth_enabled: Optional[bool]
+    auth_enabled: Optional[str]
     openid_url: Optional[str]
     openid_client_id: Optional[str]
     about: str