Skip to content

Commit 221ee6f

Browse files
committed
Use Object.keys for iterating over requirements
1 parent 1437bd8 commit 221ee6f

File tree

3 files changed

+18
-31
lines changed

3 files changed

+18
-31
lines changed

packages/auth/demo/public/index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -381,22 +381,22 @@
381381
</div>
382382
</div>
383383
<ul class="list-group" id="password-validation-requirements">
384-
<li class="list-group-item" id="password-validation-meets-min-length">
384+
<li class="list-group-item" id="password-validation-meets-min-password-length">
385385
Password must be at least <span id="password-validation-min-length">6</span> characters.
386386
</li>
387-
<li class="list-group-item" id="password-validation-meets-max-length">
387+
<li class="list-group-item" id="password-validation-meets-max-password-length">
388388
Password must be at most <span id="password-validation-max-length">4096</span> characters.
389389
</li>
390-
<li class="list-group-item" id="password-validation-contains-lowercase">
390+
<li class="list-group-item" id="password-validation-contains-lowercase-letter">
391391
Password must contain a lowercase letter.
392392
</li>
393-
<li class="list-group-item" id="password-validation-contains-uppercase">
393+
<li class="list-group-item" id="password-validation-contains-uppercase-letter">
394394
Password must contain an uppercase letter.
395395
</li>
396-
<li class="list-group-item" id="password-validation-contains-numeric">
396+
<li class="list-group-item" id="password-validation-contains-numeric-character">
397397
Password must contain a numeric character.
398398
</li>
399-
<li class="list-group-item" id="password-validation-contains-non-alphanumeric">
399+
<li class="list-group-item" id="password-validation-contains-non-alphanumeric-character">
400400
Password must contain a non-alphanumeric character. <span class="glyphicon glyphicon-info-sign" id="password-validation-allowed-non-alphanumeric-characters" data-toggle="tooltip" data-placement="bottom" title="No allowed non-alphanumeric characters." aria-label="View non-alphanumeric characters"></span>
401401
</li>
402402
</ul>

packages/auth/demo/public/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ body.user-info-displayed {
8787
list-style-type: none;
8888
}
8989

90-
#password-validation-contains-non-alphanumeric .tooltip {
90+
#password-validation-contains-non-alphanumeric-character .tooltip {
9191
font-family: 'Courier New', Courier;
9292
font-size: 1.1em;
9393
letter-spacing: 5px;

packages/auth/demo/src/index.js

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -543,30 +543,17 @@ function onValidatePassword() {
543543
passwordPolicy.allowedNonAlphanumericCharacters
544544
);
545545
}
546-
setRequirementStatus(
547-
'#password-validation-meets-min-length',
548-
status.meetsMinPasswordLength
549-
);
550-
setRequirementStatus(
551-
'#password-validation-meets-max-length',
552-
status.meetsMaxPasswordLength
553-
);
554-
setRequirementStatus(
555-
'#password-validation-contains-lowercase',
556-
status.containsLowercaseLetter
557-
);
558-
setRequirementStatus(
559-
'#password-validation-contains-uppercase',
560-
status.containsUppercaseLetter
561-
);
562-
setRequirementStatus(
563-
'#password-validation-contains-numeric',
564-
status.containsNumericCharacter
565-
);
566-
setRequirementStatus(
567-
'#password-validation-contains-non-alphanumeric',
568-
status.containsNonAlphanumericCharacter
569-
);
546+
Object.keys(status).forEach(requirement => {
547+
if (requirement !== 'passwordPolicy') {
548+
// Get the requirement ID by converting to kebab case.
549+
const requirementIdPrefix = '#password-validation-';
550+
const requirementId =
551+
requirementIdPrefix +
552+
requirement.replace(/[A-Z]/g, match => '-' + match.toLowerCase());
553+
554+
setRequirementStatus(requirementId, status[requirement]);
555+
}
556+
});
570557

571558
$('#password-validation-password').prop('disabled', false);
572559
$('#password-validation-requirements').show();

0 commit comments

Comments
 (0)