From b9ee8fad913ad2a2fb1af2421e9d374960e57093 Mon Sep 17 00:00:00 2001
From: dettlaff <dettlaff@riseup.net>
Date: Thu, 21 Nov 2024 21:20:29 +0400
Subject: [PATCH] fix: add more debug for subprocess.check_output

---
 .../users/kanidm_user_repository.py           | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/selfprivacy_api/repositories/users/kanidm_user_repository.py b/selfprivacy_api/repositories/users/kanidm_user_repository.py
index adf7351..08ae356 100644
--- a/selfprivacy_api/repositories/users/kanidm_user_repository.py
+++ b/selfprivacy_api/repositories/users/kanidm_user_repository.py
@@ -53,17 +53,22 @@ class KanidmAdminToken:
     @staticmethod
     def create_and_save_token(kanidm_admin_password: str) -> str:
         with temporary_env_var(key="KANIDM_PASSWORD", value=kanidm_admin_password):
-            kanidm_admin_token = subprocess.check_output(
-                [
-                    "kanidm",
-                    "service-account",
-                    "api-token",
-                    "generate",
-                    "--rw",
-                    "selfprivacy",
-                    "token2",
-                ]
-            )
+            try:
+                kanidm_admin_token = subprocess.check_output(
+                    [
+                        "kanidmd",
+                        "recover-account",
+                        "-c",
+                        "/etc/kanidm/server.toml",
+                        "idm_admin",
+                        "-o",
+                        "json",
+                    ],
+                    text=True,
+                    stderr=subprocess.DEVNULL,
+                )
+            except subprocess.CalledProcessError as e:
+                print(e)
 
         redis.set("kanidm:token", kanidm_admin_token)
         return kanidm_admin_token
@@ -80,14 +85,15 @@ class KanidmAdminToken:
                 "-o",
                 "json",
             ],
+            text=True,
             stderr=subprocess.DEVNULL,
-        ).decode("utf-8")
+        )
 
         new_kanidm_admin_password = re.search(r'{"password":"([^"]+)"}', output).group(
             1
-        )
-        redis.set("kanidm:password", new_kanidm_admin_password)
+        )  # we have many not json strings in output
 
+        redis.set("kanidm:password", new_kanidm_admin_password)
         return new_kanidm_admin_password