From e24eaab3f187eaa8cac3b9bc73d710d1303154f3 Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Sun, 6 Jul 2025 13:10:14 -0500
Subject: [PATCH] Log when token expiry is set via env var, api-keys
 create/update returns with user association

---
 client/components/tables/ApiKeysTable.vue | 2 +-
 client/pages/config/api-keys/index.vue    | 5 +----
 server/Auth.js                            | 6 ++++++
 server/controllers/ApiKeyController.js    | 6 ++++++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/client/components/tables/ApiKeysTable.vue b/client/components/tables/ApiKeysTable.vue
index 037000b5..feab4e68 100644
--- a/client/components/tables/ApiKeysTable.vue
+++ b/client/components/tables/ApiKeysTable.vue
@@ -93,7 +93,7 @@ export default {
             this.$toast.error(data.error)
           } else {
             this.removeApiKey(apiKey.id)
-            this.$emit('deleted', apiKey.id)
+            this.$emit('numApiKeys', this.apiKeys.length)
           }
         })
         .catch((error) => {
diff --git a/client/pages/config/api-keys/index.vue b/client/pages/config/api-keys/index.vue
index edc4d59f..2523feed 100644
--- a/client/pages/config/api-keys/index.vue
+++ b/client/pages/config/api-keys/index.vue
@@ -19,7 +19,7 @@
 
       <tables-api-keys-table ref="apiKeysTable" class="pt-2" @edit="setShowApiKeyModal" @numApiKeys="(count) => (numApiKeys = count)" />
     </app-settings-content>
-    <modals-api-key-modal ref="apiKeyModal" v-model="showApiKeyModal" :api-key="selectedApiKey" :users="users" @created="apiKeyCreated" @deleted="apiKeyDeleted" @updated="apiKeyUpdated" />
+    <modals-api-key-modal ref="apiKeyModal" v-model="showApiKeyModal" :api-key="selectedApiKey" :users="users" @created="apiKeyCreated" @updated="apiKeyUpdated" />
     <modals-api-key-created-modal ref="apiKeyCreatedModal" v-model="showApiKeyCreatedModal" :api-key="selectedApiKey" />
   </div>
 </template>
@@ -50,9 +50,6 @@ export default {
         this.$refs.apiKeysTable.addApiKey(apiKey)
       }
     },
-    apiKeyDeleted() {
-      this.numApiKeys--
-    },
     apiKeyUpdated(apiKey) {
       if (this.$refs.apiKeysTable) {
         this.$refs.apiKeysTable.updateApiKey(apiKey)
diff --git a/server/Auth.js b/server/Auth.js
index b2fcebf9..c445b45e 100644
--- a/server/Auth.js
+++ b/server/Auth.js
@@ -25,6 +25,12 @@ class Auth {
 
     this.RefreshTokenExpiry = parseInt(process.env.REFRESH_TOKEN_EXPIRY) || 7 * 24 * 60 * 60 // 7 days
     this.AccessTokenExpiry = parseInt(process.env.ACCESS_TOKEN_EXPIRY) || 12 * 60 * 60 // 12 hours
+    if (parseInt(process.env.REFRESH_TOKEN_EXPIRY) > 0) {
+      Logger.info(`[Auth] Refresh token expiry set from ENV variable to ${this.RefreshTokenExpiry} seconds`)
+    }
+    if (parseInt(process.env.ACCESS_TOKEN_EXPIRY) > 0) {
+      Logger.info(`[Auth] Access token expiry set from ENV variable to ${this.AccessTokenExpiry} seconds`)
+    }
   }
 
   /**
diff --git a/server/controllers/ApiKeyController.js b/server/controllers/ApiKeyController.js
index 0166479f..f60480df 100644
--- a/server/controllers/ApiKeyController.js
+++ b/server/controllers/ApiKeyController.js
@@ -87,6 +87,9 @@ class ApiKeyController {
       isActive: !!req.body.isActive,
       createdByUserId: req.user.id
     })
+    apiKeyInstance.dataValues.user = await apiKeyInstance.getUser({
+      attributes: ['id', 'username', 'type']
+    })
 
     Logger.info(`[ApiKeyController] Created API key "${apiKeyInstance.name}"`)
     return res.json({
@@ -152,6 +155,9 @@ class ApiKeyController {
 
     if (hasUpdates) {
       await apiKey.save()
+      apiKey.dataValues.user = await apiKey.getUser({
+        attributes: ['id', 'username', 'type']
+      })
       Logger.info(`[ApiKeyController] Updated API key "${apiKey.name}"`)
     } else {
       Logger.info(`[ApiKeyController] No updates needed to API key "${apiKey.name}"`)