From 79e9728d19feeeed49a65fd21c0860043c3274e1 Mon Sep 17 00:00:00 2001
From: AJ ONeal <coolaj86@gmail.com>
Date: Sun, 8 Jul 2018 02:57:33 +0000
Subject: [PATCH] better error handling

---
 lib/extensions/admin/login/index.html |  2 +-
 lib/extensions/admin/login/js/app.js  | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/extensions/admin/login/index.html b/lib/extensions/admin/login/index.html
index ff77d12..ff442e7 100644
--- a/lib/extensions/admin/login/index.html
+++ b/lib/extensions/admin/login/index.html
@@ -9,7 +9,7 @@
   <div class="js-error" hidden>
     <h1>Invalid Magic Link</h1>
     <div class="js-magic-link">'{{magic_link}}' isn't a valid magic link code.
-      <br>Links are only good for 5 minutes, so you gotta act fast.
+      <br>Links are only valid for a limited time, so you gotta act fast.
     </div>
   </div>
 
diff --git a/lib/extensions/admin/login/js/app.js b/lib/extensions/admin/login/js/app.js
index c717a12..4400cd7 100644
--- a/lib/extensions/admin/login/js/app.js
+++ b/lib/extensions/admin/login/js/app.js
@@ -53,11 +53,17 @@ function submitCode(pair) {
       // shouldn't be pending (because we get here by being ready)
       // should poll over 'ready'
 
+      console.log('Submit Code Response:');
+      console.log(data);
+      if (data.error) {
+        document.querySelector('.js-error').hidden = false;
+        return;
+      }
 
       setTimeout(checkStatus, 0);
 
       document.querySelector('.js-authz').hidden = false;
-      console.log(data);
+
       /*
       document.querySelectorAll('.js-token-data').forEach(function ($el) {
         $el.innerText = JSON.stringify(data, null, 2);
@@ -90,6 +96,7 @@ function init() {
   if (!magic) {
     document.querySelector('body').hidden = false;
     document.querySelector('.js-error').hidden = false;
+    return;
   }
 
   window.fetch(meta.baseUrl + meta.pair_request.pathname + '/' + magic, {
@@ -97,7 +104,7 @@ function init() {
   , cors: true
   }).then(function (resp) {
     return resp.json().then(function (data) {
-      console.log('Data:');
+      console.log('pair request:');
       console.log(data);
       document.querySelector('body').hidden = false;
       if (data.error) {