Skip to content
This repository has been archived by the owner on Jul 12, 2023. It is now read-only.

Show all password validations #681

Merged
merged 1 commit into from
Sep 25, 2020
Merged

Show all password validations #681

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions cmd/server/assets/login/_loginscripts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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");
Expand All @@ -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");
Expand All @@ -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");
Expand All @@ -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");
Expand All @@ -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}}