Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Review #16

Merged
merged 4 commits into from
Nov 24, 2020
Merged

Review #16

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2946bb4
fixed error which prevented user from cleaning password field
Gimleux Nov 24, 2020
7340ce1
Specified number of characters in password
Gimleux Nov 24, 2020
446579e
Merge pull request #11 from FileFighter/feature/addUser
Gimleux Nov 24, 2020
09c02e5
Merge branch 'feature/feStructure' into review
Gimleux Nov 24, 2020
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
25 changes: 15 additions & 10 deletions webapp_frontend/src/components/pages/Registration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,23 @@ export default function Registration(): ReactElement {
}
}

const makePasswordInputFitRules = (input: string): string | null => {

const makePasswordInputFitRules = (input:string):[string,boolean] => {
input = deleteSpaces(input);
if (biggerMaxStrLength(input, MAX_PASSWORD_LENGTH)) {
handleAlertVisibility(DEFAULT_ALERT_DURATION, "warning", "Maximum password length exceeded. Input was undone.");
return null
if (biggerMaxStrLength(input, MAX_PASSWORD_LENGTH)){
handleAlertVisibility(DEFAULT_ALERT_DURATION, "warning", "Maximum password length exceeded. Input was undone.");
return [input,false];
}
return input;
return [input,true];
}

const handlePasswordChange = (event: ChangeEvent<HTMLInputElement>) => {
event.preventDefault();
let value: string | null = makePasswordInputFitRules(event.target.value);
if (!value) {
let value:[string,boolean]|string = makePasswordInputFitRules(event.target.value);
if (!value[1]){
value = password;
} else {
value = value[0]
}
setPasswordInformationLength(!notMinStrLength(value, MIN_PASSWORD_LENGTH));
setPasswordInformationLowercase(value.match(/[a-z]/) !== null);
Expand All @@ -86,9 +89,11 @@ export default function Registration(): ReactElement {

const handlePasswordConfirmationChange = async (event: ChangeEvent<HTMLInputElement>) => {
event.preventDefault();
let value: string | null = makePasswordInputFitRules(event.target.value);
if (!value) {
let value:[string,boolean]|string = makePasswordInputFitRules(event.target.value);
if (!value[1]){
value = passwordConfirmation;
} else {
value = value[0]
}
setPasswordConfirmation(value);
}
Expand Down Expand Up @@ -118,7 +123,7 @@ export default function Registration(): ReactElement {
<img alt={"status icon password length"}
src={passwordInformationLength ? check_svg : info_svg}/>
<span className={"sr-only"}>{passwordInformationLength ? "Done: " : "Missing: "}</span>
<span className={passwordInformationLength ? "text-success" : "text-muted"}>Passwords must be at least 8 characters.</span>
<span className={passwordInformationLength ? "text-success" : "text-muted"}>Passwords must be between 8 and 20 characters.</span>
</div>
<div>
<img alt={"status icon password contains uppercase character"}
Expand Down