Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add password requirements to login page #103

Merged
merged 11 commits into from
Nov 18, 2023
Merged
32 changes: 30 additions & 2 deletions packages/app/src/AuthPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ import { Button, Form } from 'react-bootstrap';
import { NextSeo } from 'next-seo';
import { API_SERVER_URL } from './config';
import { useRouter } from 'next/router';
import { useEffect } from 'react';
import { KeyboardEventHandler, useState, useEffect } from 'react';
import Link from 'next/link';
import cx from 'classnames';

import { PasswordCheck, CheckOrX } from './PasswordCheck';
import LandingHeader from './LandingHeader';
import * as config from './config';
import api from './api';
Expand All @@ -17,6 +18,8 @@ type FormData = {
confirmPassword: string;
};

type FormControlElement = HTMLInputElement | HTMLTextAreaElement;

export default function AuthPage({ action }: { action: 'register' | 'login' }) {
const isRegister = action === 'register';
const {
Expand Down Expand Up @@ -45,6 +48,23 @@ export default function AuthPage({ action }: { action: 'register' | 'login' }) {
}
}, [installation, isRegister, router]);

const [currentPassword, setCurrentPassword] = useState<string>('');
jaggederest marked this conversation as resolved.
Show resolved Hide resolved
const [confirmPassword, setConfirmPassword] = useState<string>('');

const updateCurrentPassword: KeyboardEventHandler<FormControlElement> = e => {
const val = (e.target as HTMLInputElement).value;
setCurrentPassword(val);
};

const updateConfirmPassword: KeyboardEventHandler<FormControlElement> = e => {
const val = (e.target as HTMLInputElement).value;
setConfirmPassword(val);
};

const confirmPass = () => {
return currentPassword === confirmPassword;
};

const onSubmit: SubmitHandler<FormData> = data =>
registerPassword.mutate(
{
Expand Down Expand Up @@ -145,6 +165,7 @@ export default function AuthPage({ action }: { action: 'register' | 'login' }) {
className={cx('border-0', {
'mb-3': isRegister,
})}
onKeyUp={updateCurrentPassword}
{...form.password}
/>
{isRegister && (
Expand All @@ -153,15 +174,22 @@ export default function AuthPage({ action }: { action: 'register' | 'login' }) {
htmlFor="confirmPassword"
className="text-start text-muted fs-7.5 mb-1"
>
Confirm Password
<CheckOrX
handler={confirmPass}
password={currentPassword}
>
Confirm Password
</CheckOrX>
</Form.Label>
<Form.Control
data-test-id="form-confirm-password"
id="confirmPassword"
type="password"
className="border-0"
jaggederest marked this conversation as resolved.
Show resolved Hide resolved
onKeyUp={updateConfirmPassword}
{...form.confirmPassword}
/>
<PasswordCheck password={currentPassword} />
</>
)}
{isRegister && Object.keys(errors).length > 0 && (
Expand Down
92 changes: 92 additions & 0 deletions packages/app/src/PasswordCheck.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
import { useMemo } from 'react';

const checkLength = (password: string) => password.length >= 12;
const checkOneUpper = (password: string) => /[A-Z]+/.test(password);
const checkOneLower = (password: string) => /[a-z]+/.test(password);
const checkOneNumber = (password: string) => /\d+/.test(password);
const checkOneSpecial = (password: string) => /\W+/.test(password);

export const PasswordCheck = (password: string | null) => {
password = password ?? '';
return (
<ul>
<li>
jaggederest marked this conversation as resolved.
Show resolved Hide resolved
<CheckOrX handler={checkLength} password={password}>
minimum 12 characters
</CheckOrX>
</li>
<li>
<CheckOrX handler={checkOneUpper} password={password}>
at least 1 uppercase
</CheckOrX>
</li>
<li>
<CheckOrX handler={checkOneLower} password={password}>
at least 1 lowercase
</CheckOrX>
</li>
<li>
<CheckOrX handler={checkOneNumber} password={password}>
at least 1 number
</CheckOrX>
</li>
<li>
<CheckOrX handler={checkOneSpecial} password={password}>
at least 1 special character
</CheckOrX>
</li>
</ul>
);
};

export const CheckOrX = ({
handler,
password,
children,
}: {
handler: (password: string) => boolean;
password: string | { password: string | null };
children: React.ReactNode;
}) => {
let actualPassword = '';
if (typeof password === 'string') {
actualPassword = password;
} else {
actualPassword = password.password ?? '';
}
const isValid = useMemo(
() => handler(actualPassword),
[handler, actualPassword],
);
return (
<span className={isValid ? 'text-success' : 'text-danger'}>
{isValid ? <Check /> : <XShape />} {children}
</span>
);
};

const Check = () => (
jaggederest marked this conversation as resolved.
Show resolved Hide resolved
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
jaggederest marked this conversation as resolved.
Show resolved Hide resolved
height="16"
fill="currentColor"
className="bi bi-check2"
viewBox="0 0 16 16"
>
<path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z" />
</svg>
);

const XShape = () => (
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
height="16"
fill="currentColor"
className="bi bi-x"
viewBox="0 0 16 16"
>
<path d="M4.646 4.646a.5.5 0 0 1 .708 0L8 7.293l2.646-2.647a.5.5 0 0 1 .708.708L8.707 8l2.647 2.646a.5.5 0 0 1-.708.708L8 8.707l-2.646 2.647a.5.5 0 0 1-.708-.708L7.293 8 4.646 5.354a.5.5 0 0 1 0-.708z" />
</svg>
);