From 542b642de467ef4c3b6cffae5912f7ef8ce266c2 Mon Sep 17 00:00:00 2001
From: Weston Haught <whaught@google.com>
Date: Fri, 25 Sep 2020 11:52:04 -0700
Subject: [PATCH] Show all password vaidation

---
 cmd/server/assets/login/_loginscripts.html | 29 ++++++++++++++++------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/cmd/server/assets/login/_loginscripts.html b/cmd/server/assets/login/_loginscripts.html
index 7873166df..53f985b02 100644
--- a/cmd/server/assets/login/_loginscripts.html
+++ b/cmd/server/assets/login/_loginscripts.html
@@ -112,13 +112,17 @@
       <span id="icon" aria-hidden="true"></span>Contain {{.requirements.Special}} special character
     </span>
     {{end}}
+    <span class="row ml-1" id="retyped">
+      <span id="icon" aria-hidden="true"></span>Retyped password must match password
+    </span>
   </small>
 </p>
 {{end}}
 {{end}}
 
 {{define "login/pwd-validate-js"}}
-  {{if .requirements.HasRequirements}}
+  let $retyped = $('#retyped');
+  {{- if .requirements.HasRequirements}}
   let $lenReq = $('#length-req');
   let $upperReq = $('#upper-req');
   let $lowerReq = $('#lower-req');
@@ -148,12 +152,13 @@
 
     let errClass = "oi oi-circle-x pr-1";
     let checkClass = "oi oi-circle-check pr-1";
+    let valid = true
 
     {{if gt .requirements.Length 0}}
     if (pwd.length < {{.requirements.Length}}) {
       $lenReq.find("#icon").attr("class", errClass)
       $lenReq.addClass("text-danger");
-      return false;
+      valid = false;
     } else {
       $lenReq.find("#icon").attr("class", checkClass)
       $lenReq.addClass("text-muted");
@@ -164,7 +169,7 @@
     if (upper < {{.requirements.Uppercase}}) {
       $upperReq.find("#icon").attr("class", errClass);
       $upperReq.addClass("text-danger");
-      return false;
+      valid = false;
     } else {
       $upperReq.find("#icon").attr("class", checkClass);
       $upperReq.addClass("text-muted");
@@ -175,7 +180,7 @@
     if (lower < {{.requirements.Lowercase}}) {
       $lowerReq.find("#icon").attr("class", errClass);
       $lowerReq.addClass("text-danger");
-      return false;
+      valid = false;
     } else {
       $lowerReq.find("#icon").attr("class", checkClass);
       $lowerReq.addClass("text-muted");
@@ -186,7 +191,7 @@
     if (digit < {{.requirements.Number}}) {
       $numReq.find("#icon").attr("class", errClass);
       $numReq.addClass("text-danger");
-      return false;
+      valid = false;
     } else {
       $numReq.find("#icon").attr("class", checkClass);
       $numReq.addClass("text-muted");
@@ -197,13 +202,23 @@
     if (special < {{.requirements.Special}}) {
       $specialReq.find("#icon").attr("class", errClass);
       $specialReq.addClass("text-danger");
-      return false;
+      valid = false;
     } else {
       $specialReq.find("#icon").attr("class", checkClass);
       $specialReq.addClass("text-muted");
     }
     {{end}}
+
+    if (pwd != $retype.val()) {
+      $retyped.find("#icon").attr("class", errClass);
+      $retyped.addClass("text-danger");
+      valid = false;
+    } else {
+      $retyped.find("#icon").attr("class", checkClass);
+      $retyped.addClass("text-muted");
+    }
+
     {{end}}
-    return true;
+    return valid;
   }
 {{end}}