From ac15a15caf982707cd0d0a2843bc56958d59b85f Mon Sep 17 00:00:00 2001 From: Chris Bisset Date: Sun, 23 Mar 2025 00:06:24 +0000 Subject: [PATCH] check api key list --- .../components/settings/server-settings-functions.svelte | 7 ++++++- src/lib/components/settings/server-settings.svelte | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lib/components/settings/server-settings-functions.svelte b/src/lib/components/settings/server-settings-functions.svelte index 729163e..0c9fd64 100644 --- a/src/lib/components/settings/server-settings-functions.svelte +++ b/src/lib/components/settings/server-settings-functions.svelte @@ -49,6 +49,7 @@ export async function rotateAPIKey() { for (const key of appSettings.apiKeyList) { + // select the current key being used in the app settings if (persistentAppSettings.headscaleAPIKey.startsWith(key.prefix)) { let currentKey = key; @@ -59,14 +60,18 @@ // create a new API key with the new expiration let apiKey = await createNewAPIKey(newExpiration); - // The above should always return a value + + // The above should always return a value, let's check that if (apiKey == undefined) { throw new Error('expecting API key string, string was undefined'); } + // Set the new key as the current key in the persistent settings persistentAppSettings.headscaleAPIKey = apiKey; + // Expire the previously current key await expireAPIKey(currentKey.prefix); + // Get keys again to make sure it all worked await getAPIKeys(); } diff --git a/src/lib/components/settings/server-settings.svelte b/src/lib/components/settings/server-settings.svelte index 94723e7..607e16b 100644 --- a/src/lib/components/settings/server-settings.svelte +++ b/src/lib/components/settings/server-settings.svelte @@ -9,7 +9,10 @@ function rotateAPIKeyClick() { rotateButtonDisabled = true; - rotateAPIKey().then(() => {rotateButtonDisabled = false}); + rotateAPIKey().then(() => { + rotateButtonDisabled = false; + console.log(appSettings.apiKeyList); + }); }