Fix handling 500s on unlock API (#429)

This provides us with better, more informative error messages in some weird edge cases (notably, 5xx server failure)
shieldproject · Jul 13, 2018 · 434cee2 · 434cee2
1 parent 7986b63
commit 434cee2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/web2/htdocs/index.html b/web2/htdocs/index.html
@@ -656,6 +656,7 @@ <h2>This SHIELD Core is LOCKED</h2>
             <div class="ctl" data-field="unlock-master">
               <label for="masterpass">Enter your SHIELD Master Password</label>
               <div class="errors">
+                <span class="error"></span>
                 <span data-error="missing">Please supply your password.</span>
                 <span data-error="incorrect">Incorrect password, please try again.</span>
               </div>

diff --git a/web2/htdocs/shield.js b/web2/htdocs/shield.js
@@ -1326,6 +1326,7 @@ function divert(page) { // {{{
   return page;
 }
 // }}}
+// vim:et:sts=2:ts=2:sw=2
 
 function dispatch(page) {
   var argv = page.split(/[:+]/);
@@ -3339,9 +3340,12 @@ function dispatch(page) {
       .on('submit', 'form', function (event) {
         event.preventDefault();
 
-        var data = $(event.target).serializeObject();
+        var $form = $(event.target);
+        $form.reset()
+        var data = $form.serializeObject();
         if (data.master == "") {
-          $(event.target).error('unlock-master', 'missing');
+          $form.error('unlock-master', 'missing');
+          return;
         }
 
         api({
@@ -3355,10 +3359,10 @@ function dispatch(page) {
           },
           statusCode: {
             403: function () {
-              $(event.target).error('unlock-master', 'incorrect')
+              $form.error('unlock-master', 'incorrect')
             },
             500: function (xhr) {
-              $(event.target).error(xhr.responseJSON);
+              $form.error(xhr.responseJSON);
             }
           },
           error: {}

diff --git a/web2/src/js/shield.js b/web2/src/js/shield.js
@@ -29,6 +29,7 @@ function divert(page) { // {{{
   return page;
 }
 // }}}
+// vim:et:sts=2:ts=2:sw=2
 
 function dispatch(page) {
   var argv = page.split(/[:+]/);
@@ -2042,9 +2043,12 @@ function dispatch(page) {
       .on('submit', 'form', function (event) {
         event.preventDefault();
 
-        var data = $(event.target).serializeObject();
+        var $form = $(event.target);
+        $form.reset()
+        var data = $form.serializeObject();
         if (data.master == "") {
-          $(event.target).error('unlock-master', 'missing');
+          $form.error('unlock-master', 'missing');
+          return;
         }
 
         api({
@@ -2058,10 +2062,10 @@ function dispatch(page) {
           },
           statusCode: {
             403: function () {
-              $(event.target).error('unlock-master', 'incorrect')
+              $form.error('unlock-master', 'incorrect')
             },
             500: function (xhr) {
-              $(event.target).error(xhr.responseJSON);
+              $form.error(xhr.responseJSON);
             }
           },
           error: {}