From 06bcf8a6563f948096a38cfeed63086199d59d0a Mon Sep 17 00:00:00 2001
From: joostdecock <joost@joost.at>
Date: Mon, 21 Aug 2023 09:13:34 +0200
Subject: [PATCH] fix(backend): Avoid async issues when returning key list

---
 sites/backend/src/models/apikey.mjs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sites/backend/src/models/apikey.mjs b/sites/backend/src/models/apikey.mjs
index 35225645ac7..a0740945f9c 100644
--- a/sites/backend/src/models/apikey.mjs
+++ b/sites/backend/src/models/apikey.mjs
@@ -165,9 +165,14 @@ ApikeyModel.prototype.userApikeys = async function (uid) {
   }
 
   /*
-   * Keys are an array, remove sercrets with map() and decrypt prior to returning
+   * Keys are an array, remove secrets with map() and decrypt prior to returning
    */
-  return keys.map((key) => this.asKeyData(key))
+  const list = []
+  for (const key of keys) {
+    list.push(await this.asKeyData(key))
+  }
+
+  return list
 }
 
 /*
@@ -176,7 +181,7 @@ ApikeyModel.prototype.userApikeys = async function (uid) {
 ApikeyModel.prototype.asKeyData = async function (key) {
   delete key.secret
   delete key.aud
-  key.name = this.decrypt(key.name)
+  key.name = await this.decrypt(key.name)
 
   return key
 }