Merge pull request #225 from vsimakhin/fix/auth

Fix/auth
vsimakhin · May 20, 2024 · 2d902f0 · 2d902f0
2 parents c865f84 + 796ebbf
commit 2d902f0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased]
 
+- Fix: Proper password field validation on Save
+- Update: Support for submit button (on Enter key) on login page
 - Fix: Add horizontal scrolling for the logbook page to properly support mobile devices
 - Fix: Add dynamic resizing for the charts on Stats pages
 - Fix: Instructor's hours for the Total Stats table were mixed up for the last 90 days and the last 12 months

diff --git a/README.md b/README.md
@@ -17,6 +17,8 @@ You also can easily export all flight records into EASA style pdf format, print
 
 ## [Unreleased]
 
+- Fix: Proper password field validation on Save
+- Update: Support for submit button (on Enter key) on login page
 - Fix: Add horizontal scrolling for the logbook page to properly support mobile devices
 - Fix: Add dynamic resizing for the charts on Stats pages
 - Fix: Instructor's hours for the Total Stats table were mixed up for the last 90 days and the last 12 months

diff --git a/app/static/js/wlb-settings.js b/app/static/js/wlb-settings.js
@@ -161,13 +161,22 @@ const settingsUtils = function () {
         }
     }
 
+    const validatePasswordField = (field) => {
+        if (!field.value) {
+            if (document.getElementById("previous_auth_value").value == "false") {
+                return updateFieldValidity(field, false);
+            }
+        }
+        return commonUtils.updateFieldValidity(field, true);
+    }
+
     /**
      * Validates the coomon settings fields.
      */
     const validateFields = () => {
         const fields = [
             { name: "login", validator: commonUtils.validateRequiredField, error: "Login field is empty\r\n" },
-            { name: "password", validator: commonUtils.validateRequiredField, error: "Password field is empty\r\n" },
+            { name: "password", validator: validatePasswordField, error: "Password field is empty\r\n" },
         ]
         const errorMessage = commonUtils.validateFields(fields);
 

diff --git a/app/templates/login.page.gohtml b/app/templates/login.page.gohtml
@@ -28,7 +28,7 @@
                     <div class="card">
                         <div class="card-body">
                             <div class="m-sm-3">
-                                <form>
+                                <form onsubmit="Submit(); return false;" action="">
                                     <div class="alert alert-danger text-center d-none p-2" id="info" role="alert"></div>
                                     <div class="mb-3">
                                         <label class="form-label">Username</label>
@@ -39,7 +39,7 @@
                                         <input class="form-control form-control-lg" type="password" id="password" name="password" placeholder="Enter your password" />
                                     </div>
                                     <div class="d-grid gap-2 mt-3">
-                                        <a class="btn btn-lg btn-primary" onclick="Submit();">Log in</a>
+                                        <button type="submit" class="btn btn-lg btn-primary" onclick="Submit();">Log in</button>
                                     </div>
                                 </form>
                             </div>