bug fixes

2026-09-12 13:01:11 +08:00 · 2017-09-25 16:12:40 -06:00
parent 825e1b5e5c
commit 203d3c7ee9
10 changed files with 77 additions and 38 deletions
@@ -15,11 +15,13 @@
        background: #fff;
      }

-      #root form {
+      .container {
        max-width: 300px;
-        border: 1px solid lightgrey;
-        box-shadow: 0px 10px 24px 2px rgba(0,0,0,0.2);
        margin: 50px auto;
+      }
+
+      #root form {
+        display: none;
        padding: 15px;
      }

@@ -81,7 +83,8 @@
  </head>
  <body>
    <div id="root">
-      <form id="reset-password-form">
+      <div class="error-console container"></div>
+      <form id="reset-password-form" class="container">
        <legend class="legend">Set new password</legend>
        <label for="password">
          New password
@@ -94,14 +97,18 @@
          <input type="password" name="confirm-password" placeholder="confirm password" />
        </label>
        <button class="submit-password-reset" type="submit">Apply</button>
-        <div class="error-console">foo</div>
      </form>
    </div>
    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
    <script>
      $(function () {
-        function showError(message) {
-          $('.error-console').text(message).addClass('active');
+        function showError(error) {
+          try {
+            var err = JSON.parse(error);
+            $('.error-console').text(err.message).addClass('active');
+          } catch (err) {
+            $('.error-console').text(error).addClass('active');
+          }
        }

        function handleSubmit (e) {
@@ -111,8 +118,13 @@
          var password = $('[name="password"]').val();
          var confirm = $('[name="confirm-password"]').val();

-          if (password !== confirm || password === '' || password.length < 8) {
-            showError('passwords must match and be 8 characters.');
+          if (password === '' || password.length < 8) {
+            showError('Passwords must be at least 8 characters.');
+            return false;
+          }
+
+          if (password !== confirm) {
+            showError('New password and confirm password must match');
            return false;
          }

@@ -128,7 +140,17 @@
          });
        }

-        $('#reset-password-form').on('submit', handleSubmit);
+
+        $.ajax({
+          url: '<%= BASE_PATH %>api/v1/account/password/reset?check=true',
+          contentType: 'application/json',
+          method: 'PUT',
+          data: JSON.stringify({token: location.hash.replace('#', '')})
+        }).then(function () {
+          $('#reset-password-form').fadeIn().on('submit', handleSubmit);
+        }).catch(function (error) {
+          showError(error.responseText);
+        });
      });
    </script>
  </body>