From 185c4b6eb4e9f4823be64a30a950eda712165e9d Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Sun, 30 Nov 2025 11:45:37 +0100 Subject: [PATCH] More fixes for setup in ingress --- music_assistant/controllers/webserver/controller.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/music_assistant/controllers/webserver/controller.py b/music_assistant/controllers/webserver/controller.py index 302ddfa9..ad62b83e 100644 --- a/music_assistant/controllers/webserver/controller.py +++ b/music_assistant/controllers/webserver/controller.py @@ -619,8 +619,8 @@ class WebserverController(CoreController): quoted_return = urllib.parse.quote(return_url, safe="") setup_url = f"setup?return_url={quoted_return}" else: - # Default: redirect back to current directory (relative path) - setup_url = "setup?return_url=." + # No return URL - just redirect to setup without the parameter + setup_url = "setup" return web.Response(status=302, headers={"Location": setup_url}) # Serve the Vue frontend index.html @@ -1045,7 +1045,7 @@ class WebserverController(CoreController): ) # Add password authentication to existing user - password_hash = builtin_provider._hash_password(password, username) + password_hash = builtin_provider._hash_password(password, user.user_id) await self.auth.link_user_to_provider(user, AuthProviderType.BUILTIN, password_hash) else: # Create new admin user with password -- 2.34.1