From 16d7fe4bebe083834b9e602ddbf971055046fb71 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Tue, 20 Sep 2022 00:35:01 +0200
Subject: [PATCH] Fix key display

---
 keys.go                           | 6 ++++++
 ui/src/components/UserKeys.svelte | 2 +-
 ui/src/lib/key.js                 | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/keys.go b/keys.go
index 3b15b2a..48dfe5f 100644
--- a/keys.go
+++ b/keys.go
@@ -95,6 +95,12 @@ func declareAPIAuthKeysRoutes(router *gin.RouterGroup) {
 			return
 		}
 
+		k2 := key
+		if err := k2.ReadInfos(u); err != nil {
+			c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"errmsg": err.Error()})
+			return
+		}
+
 		k, err := u.NewKey(key.Type, key.Content)
 		if err != nil {
 			log.Println("Unable to NewKey:", err)
diff --git a/ui/src/components/UserKeys.svelte b/ui/src/components/UserKeys.svelte
index 8f21f21..7f383cb 100644
--- a/ui/src/components/UserKeys.svelte
+++ b/ui/src/components/UserKeys.svelte
@@ -25,7 +25,7 @@
         {:then keys}
             {#if keys && keys.length > 0}
                 {#each keys as keyid}
-                    {#await getKey(keyid)}
+                    {#await getKey(keyid, student.id)}
                         Veuillez patienter
                     {:then key}
                         <tr>
diff --git a/ui/src/lib/key.js b/ui/src/lib/key.js
index 37dcd45..912f7ce 100644
--- a/ui/src/lib/key.js
+++ b/ui/src/lib/key.js
@@ -51,8 +51,8 @@ export async function getKeys(userid) {
   }
 }
 
-export async function getKey(kid) {
-  const res = await fetch(`api/keys/${kid}`, {headers: {'Accept': 'application/json'}})
+export async function getKey(kid, userid) {
+  const res = await fetch(userid?`api/users/${userid}/keys/${kid}`:`api/keys/${kid}`, {headers: {'Accept': 'application/json'}})
   if (res.status == 200) {
     return new Key(await res.json());
   } else {