From dea917b23f285bb6616262e4b5f381a03205a410 Mon Sep 17 00:00:00 2001
From: Boody <69832947+bitboody@users.noreply.github.com>
Date: Mon, 1 Jun 2026 10:55:42 +0300
Subject: [PATCH] Clarify setup admin login instructions

* fixed confusing credentials prompt

* fix(setup): return status from create_default_admin function

* fix(setup): initialize admin creation status in main function

* fix(setup): enhance admin creation feedback and status handling

* Enhance admin user login messages with conditional feedback based on creation status

* Refine admin user creation feedback messages for clarity and actionability and formatted code

* Add fallback error message for admin creation failure in setup script
---
 setup.py | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/setup.py b/setup.py
index 358d4b4..4a24759 100644
--- a/setup.py
+++ b/setup.py
@@ -48,7 +48,7 @@ def create_default_admin():
     auth_path = os.path.join(DATA_DIR, "auth.json")
     if os.path.exists(auth_path):
         print("  [skip] auth.json already exists")
-        return
+        return "exists"
 
     try:
         import bcrypt
@@ -70,9 +70,11 @@ def create_default_admin():
         print(f"  [ok] Initial admin user created ({username})")
         print(f"        Temporary password: {password}")
         print(f"        ** Change it after first login. Set ODYSSEUS_ADMIN_PASSWORD to choose your own. **")
+        return "created"
     except ImportError:
         print("  [warn] bcrypt not installed — skipping admin user creation")
         print("         Run: pip install bcrypt")
+        return "skipped"
 
 
 def create_env():
@@ -139,10 +141,14 @@ def main():
         print("         This is OK if dependencies aren't installed yet.")
 
     print("\n5. Creating initial admin...")
+
+    admin_status = "failed"
+
     try:
-        create_default_admin()
+        admin_status = create_default_admin()
     except Exception as e:
         print(f"  [warn] Admin creation failed: {e}")
+        admin_status = "failed"
 
     print("\n=== Setup complete ===")
     # start-macos.sh launches the server itself (on its own port) right after
@@ -151,7 +157,18 @@ def main():
         print(f"\nStart the server with:")
         print(f"  python -m uvicorn app:app --host 127.0.0.1 --port 7000")
         print(f"\nThen open http://localhost:7000")
-    print(f"Login with the admin username and temporary password printed above.\n")
+
+    # Cleaned, action-focused final instruction strings
+    if admin_status == "created":
+        print("Login with the admin username and temporary password printed above.\n")
+    elif admin_status == "exists":
+        print("Login with your existing admin credentials.\n")
+    elif admin_status == "skipped":
+        print("Admin creation did not happen: dependencies are missing.\nRun 'pip install bcrypt' and rerun setup.\n")
+    elif admin_status == "failed":
+        print("Admin creation did not happen: a system or file error occurred.\nCheck write permissions for the 'data' directory and rerun setup.\n")
+    else:  # handling "failed" or any unhandled edge case
+        print("Admin creation did not happen: a system or file error occurred.\nCheck write permissions for the 'data' directory and rerun setup.\n")
 
 
 if __name__ == "__main__":