From 57d37544f90eb5ea976f7e9943ae1380c8f1c33e Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Tue, 20 Sep 2022 00:52:25 +0200
Subject: [PATCH] Also display erroneous PGP keys

---
 keys.go                   |  3 +--
 ui/src/lib/key.js         | 12 ++++++++++++
 ui/src/routes/keys.svelte | 18 +++++++++++++++++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/keys.go b/keys.go
index 48dfe5f..9db04d6 100644
--- a/keys.go
+++ b/keys.go
@@ -126,8 +126,7 @@ func declareAPIAuthKeysRoutes(router *gin.RouterGroup) {
 		k := c.MustGet("key").(*Key)
 
 		if err := k.ReadInfos(u); err != nil {
-			log.Println("Unable to ReadInfos:", err)
-			c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "Unable to read your public key. Please try again in a few moment."})
+			c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": fmt.Sprintf("Unable to read your public key: %s", err.Error())})
 			return
 		}
 
diff --git a/ui/src/lib/key.js b/ui/src/lib/key.js
index 912f7ce..dc331e9 100644
--- a/ui/src/lib/key.js
+++ b/ui/src/lib/key.js
@@ -59,3 +59,15 @@ export async function getKey(kid, userid) {
     throw new Error((await res.json()).errmsg);
   }
 }
+
+export async function deleteKey(kid, userid) {
+  const res = await fetch(userid?`api/users/${userid}/keys/${kid}`:`api/keys/${kid}`, {
+    method: 'DELETE',
+    headers: {'Accept': 'application/json'}
+  })
+  if (res.status == 200) {
+    return await res.json();
+  } else {
+    throw new Error((await res.json()).errmsg);
+  }
+}
diff --git a/ui/src/routes/keys.svelte b/ui/src/routes/keys.svelte
index 794b4d5..12ca082 100644
--- a/ui/src/routes/keys.svelte
+++ b/ui/src/routes/keys.svelte
@@ -1,5 +1,5 @@
 <script>
- import { getKeys, getKey, Key } from '../lib/key';
+ import { deleteKey, getKeys, getKey, Key } from '../lib/key';
  import { user } from '../stores/user';
  import { ToastsStore } from '../stores/toasts';
 
@@ -72,6 +72,22 @@
                         </button>
                     </div>
                 </div>
+            {:catch err}
+                <div class="alert alert-danger d-flex justify-content-between">
+                    <p>
+                        <strong>Il y a une erreur avec cette clef&nbsp;:</strong>
+                        {err}
+                    </p>
+                    <div class="d-flex flex-column justify-content-center">
+                        <button
+                            type="button"
+                            class="btn btn-outline-danger float-end"
+                            on:click={() => deleteKey(keyid).then(() => { keysP = getKeys(); })}
+                        >
+                            Supprimer la clef
+                        </button>
+                    </div>
+                </div>
             {/await}
         {/each}
     {:else}