From 5b4be95ace075364f36db3fb491ea4ecf933629f Mon Sep 17 00:00:00 2001
From: Leo Vasanko <leo@git>
Date: Wed, 4 Feb 2026 20:15:56 +0000
Subject: [PATCH] Correctly handle customized server name in admin settings
 dialog.

---
 cista/api.py                                  |  9 ++++++
 .../src/components/UserManagementModal.vue    | 30 ++++++++++++-------
 frontend/src/repositories/User.ts             |  5 ++++
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/cista/api.py b/cista/api.py
index b6266d1..deb8681 100644
--- a/cista/api.py
+++ b/cista/api.py
@@ -163,6 +163,15 @@ def subscribe(uuid, ws):
         )
 
 
+@bp.get("config")
+async def get_config(request):
+    await auth.verify(request, privileged=True)
+    return json({
+        "name": config.config.name,
+        "public": config.config.public,
+    })
+
+
 @bp.put("config/public")
 async def update_public(request):
     await auth.verify(request, privileged=True)
diff --git a/frontend/src/components/UserManagementModal.vue b/frontend/src/components/UserManagementModal.vue
index 5d00275..64344c1 100644
--- a/frontend/src/components/UserManagementModal.vue
+++ b/frontend/src/components/UserManagementModal.vue
@@ -75,7 +75,7 @@
 
 <script lang="ts" setup>
 import { ref, reactive, onMounted, watch } from 'vue'
-import { listUsers, createUser, updateUser, deleteUser, updatePublic, updateServerName } from '@/repositories/User'
+import { listUsers, createUser, updateUser, deleteUser, updatePublic, updateServerName, getServerConfig } from '@/repositories/User'
 import type { ISimpleError } from '@/repositories/Client'
 import { useMainStore } from '@/stores/main'
 
@@ -238,22 +238,32 @@ const debouncedUpdateServerName = () => {
   nameDebounceTimer = setTimeout(updateServerNameSetting, 400)
 }
 
-// Initialize server settings
-const initServerSettings = () => {
-  serverSettings.public = store.server.public || false
-  // Start with empty name field - placeholder shows current effective name
-  serverSettings.name = ''
+// Load server config from admin API
+const loadServerConfig = async () => {
+  try {
+    const config = await getServerConfig()
+    serverSettings.name = config.name
+    serverSettings.public = config.public
+  } catch (e) {
+    // Fallback to store values if API fails
+    serverSettings.public = store.server.public || false
+    serverSettings.name = ''
+  }
 }
 
 onMounted(() => {
-  initServerSettings()
+  serverSettings.public = store.server.public || false
+  serverSettings.name = ''
   loading.value = false
 })
 
-// Load users when dialog opens (only in built-in auth mode)
+// Load users and config when dialog opens
 watch(() => store.dialog, (newVal) => {
-  if (newVal === 'usermgmt' && !store.server.paskia) {
-    loadUsers()
+  if (newVal === 'usermgmt') {
+    loadServerConfig()
+    if (!store.server.paskia) {
+      loadUsers()
+    }
   }
 })
 
diff --git a/frontend/src/repositories/User.ts b/frontend/src/repositories/User.ts
index 3df3212..b2f6cc5 100644
--- a/frontend/src/repositories/User.ts
+++ b/frontend/src/repositories/User.ts
@@ -60,3 +60,8 @@ export async function updateServerName(name: string) {
   const data = await Client.put('/api/config/name', { name })
   return data
 }
+
+export async function getServerConfig() {
+  const data = await Client.get('/api/config')
+  return data as { name: string, public: boolean }
+}