From 5801169432328125f31e337fd61d7ab5a127c590 Mon Sep 17 00:00:00 2001
From: Yarmo Mackenbach <yarmo@qivro.xyz>
Date: Wed, 15 Jul 2020 15:12:55 +0200
Subject: [PATCH] Refactor WKD lookup code (#1123)

* Replace chained then by await

* Improve fetch fallback flow
---
 src/wkd.js | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/wkd.js b/src/wkd.js
index ac387f6f..7a956c16 100644
--- a/src/wkd.js
+++ b/src/wkd.js
@@ -60,29 +60,19 @@ WKD.prototype.lookup = async function(options) {
   const urlAdvanced = `https://openpgpkey.${domain}/.well-known/openpgpkey/${domain}/hu/${localEncoded}`;
   const urlDirect = `https://${domain}/.well-known/openpgpkey/hu/${localEncoded}`;
 
-  return fetch(urlAdvanced).then(function(response) {
-    if (response.status === 200) {
-      return response.arrayBuffer();
+  let response = await fetch(urlAdvanced);
+  if (response.status !== 200) {
+    response = await fetch(urlDirect);
+    if (response.status !== 200) {
+      return;
     }
-  }).then(function(publicKey) {
-    if (publicKey) {
-      return publicKey;
-    } else {
-      return fetch(urlDirect).then(function(response) {
-        if (response.status === 200) {
-          return response.arrayBuffer();
-        }
-      });
-    }
-  }).then(function(publicKey) {
-    if (publicKey) {
-      const rawBytes = new Uint8Array(publicKey);
-      if (options.rawBytes) {
-        return rawBytes;
-      }
-      return keyMod.read(rawBytes);
-    }
-  });
+  }
+
+  const rawBytes = new Uint8Array(await response.arrayBuffer());
+  if (options.rawBytes) {
+    return rawBytes;
+  }
+  return keyMod.read(rawBytes);
 };
 
 export default WKD;