bstein/ariadne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: reduce rotation check branches

Browse Source
This commit is contained in:
Brad Stein 2026-01-23 18:33:02 -03:00
parent e9b5f32ef4
commit 22dc4e8be4
2 changed files with 80 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
ariadne/services/firefly.py
View File

@ -472,28 +472,48 @@ class FireflyService:
def check_rotation_for_user(self, username: str) -> dict[str, Any]: def check_rotation_for_user(self, username: str) -> dict[str, Any]:
username = (username or "").strip() username = (username or "").strip()
status = "error"
detail = ""
rotated = None
if not username: if not username:
return {"status": "error", "detail": "missing username"} detail = "missing username"
if not keycloak_admin.ready(): elif not keycloak_admin.ready():
return {"status": "error", "detail": "keycloak admin not configured"} detail = "keycloak admin not configured"
else:
user = keycloak_admin.find_user(username)
if not isinstance(user, dict):
detail = "user not found"
else:
user_id = user.get("id") if isinstance(user.get("id"), str) else ""
if not user_id:
detail = "missing user id"
else:
full = keycloak_admin.get_user(user_id)
prepared = _build_sync_input(full)
if isinstance(prepared, UserSyncOutcome):
if prepared.status == "skipped":
status = "ok"
rotated = False
else:
status = prepared.status
detail = prepared.detail or ""
else:
outcome = self._rotation_outcome(prepared)
if outcome.status == "synced":
status = "ok"
rotated = True
elif outcome.status == "skipped":
status = "ok"
rotated = False
else:
detail = outcome.detail or "rotation check failed"
user = keycloak_admin.find_user(username) result = {"status": status}
if not isinstance(user, dict): if status == "ok":
return {"status": "error", "detail": "user not found"} result["rotated"] = bool(rotated)
user_id = user.get("id") if isinstance(user.get("id"), str) else "" elif detail:
if not user_id: result["detail"] = detail
return {"status": "error", "detail": "missing user id"} return result
full = keycloak_admin.get_user(user_id)
prepared = _build_sync_input(full)
if isinstance(prepared, UserSyncOutcome):
return {"status": prepared.status, "detail": prepared.detail or ""}
outcome = self._rotation_outcome(prepared)
if outcome.status == "synced":
return {"status": "ok", "rotated": True}
if outcome.status == "skipped":
return {"status": "ok", "rotated": False}
return {"status": "error", "detail": outcome.detail or "rotation check failed"}
def sync_user(self, email: str, password: str, wait: bool = True) -> dict[str, Any]: def sync_user(self, email: str, password: str, wait: bool = True) -> dict[str, Any]:
email = (email or "").strip() email = (email or "").strip()

60
ariadne/services/wger.py
View File

@ -431,28 +431,48 @@ class WgerService:
def check_rotation_for_user(self, username: str) -> dict[str, Any]: def check_rotation_for_user(self, username: str) -> dict[str, Any]:
username = (username or "").strip() username = (username or "").strip()
status = "error"
detail = ""
rotated = None
if not username: if not username:
return {"status": "error", "detail": "missing username"} detail = "missing username"
if not keycloak_admin.ready(): elif not keycloak_admin.ready():
return {"status": "error", "detail": "keycloak admin not configured"} detail = "keycloak admin not configured"
else:
user = keycloak_admin.find_user(username)
if not isinstance(user, dict):
detail = "user not found"
else:
user_id = user.get("id") if isinstance(user.get("id"), str) else ""
if not user_id:
detail = "missing user id"
else:
full = keycloak_admin.get_user(user_id)
prepared = _build_sync_input(full)
if isinstance(prepared, UserSyncOutcome):
if prepared.status == "skipped":
status = "ok"
rotated = False
else:
status = prepared.status
detail = prepared.detail or ""
else:
outcome = self._rotation_outcome(prepared)
if outcome.status == "synced":
status = "ok"
rotated = True
elif outcome.status == "skipped":
status = "ok"
rotated = False
else:
detail = outcome.detail or "rotation check failed"
user = keycloak_admin.find_user(username) result = {"status": status}
if not isinstance(user, dict): if status == "ok":
return {"status": "error", "detail": "user not found"} result["rotated"] = bool(rotated)
user_id = user.get("id") if isinstance(user.get("id"), str) else "" elif detail:
if not user_id: result["detail"] = detail
return {"status": "error", "detail": "missing user id"} return result
full = keycloak_admin.get_user(user_id)
prepared = _build_sync_input(full)
if isinstance(prepared, UserSyncOutcome):
return {"status": prepared.status, "detail": prepared.detail or ""}
outcome = self._rotation_outcome(prepared)
if outcome.status == "synced":
return {"status": "ok", "rotated": True}
if outcome.status == "skipped":
return {"status": "ok", "rotated": False}
return {"status": "error", "detail": outcome.detail or "rotation check failed"}
def sync_user(self, username: str, email: str, password: str, wait: bool = True) -> dict[str, Any]: def sync_user(self, username: str, email: str, password: str, wait: bool = True) -> dict[str, Any]:
username = (username or "").strip() username = (username or "").strip()