From 74be63555dd08d41ae56aa10cdaea54f3fe7de48 Mon Sep 17 00:00:00 2001
From: Maurice <mauriceboe@icloud.com>
Date: Thu, 19 Mar 2026 21:27:34 +0100
Subject: [PATCH] Fix API keys not loading after reload, auto-save before
 validate (v2.3.5)

- Admin panel now loads API keys from /me/settings endpoint (not /me)
- Validate buttons auto-save keys first so validation uses current values
- Keys persist and display correctly after page reload
---
 client/src/pages/AdminPage.jsx | 10 +++++++---
 server/package.json            |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/src/pages/AdminPage.jsx b/client/src/pages/AdminPage.jsx
index ceeecfa..fefc81b 100644
--- a/client/src/pages/AdminPage.jsx
+++ b/client/src/pages/AdminPage.jsx
@@ -78,9 +78,9 @@ export default function AdminPage() {
 
   const loadApiKeys = async () => {
     try {
-      const data = await authApi.me()
-      setMapsKey(data.user?.maps_api_key || '')
-      setWeatherKey(data.user?.openweather_api_key || '')
+      const data = await authApi.getSettings()
+      setMapsKey(data.settings?.maps_api_key || '')
+      setWeatherKey(data.settings?.openweather_api_key || '')
     } catch (err) {
       // ignore
     }
@@ -118,6 +118,8 @@ export default function AdminPage() {
   const handleValidateKeys = async () => {
     setValidating({ maps: true, weather: true })
     try {
+      // Save first so validation uses the current values
+      await updateApiKeys({ maps_api_key: mapsKey, openweather_api_key: weatherKey })
       const result = await authApi.validateKeys()
       setValidation(result)
     } catch (err) {
@@ -130,6 +132,8 @@ export default function AdminPage() {
   const handleValidateKey = async (keyType) => {
     setValidating(prev => ({ ...prev, [keyType]: true }))
     try {
+      // Save first so validation uses the current values
+      await updateApiKeys({ maps_api_key: mapsKey, openweather_api_key: weatherKey })
       const result = await authApi.validateKeys()
       setValidation(prev => ({ ...prev, [keyType]: result[keyType] }))
     } catch (err) {
diff --git a/server/package.json b/server/package.json
index 377cc5c..cbcb588 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nomad-server",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "main": "src/index.js",
   "scripts": {
     "start": "node --experimental-sqlite src/index.js",