cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-12-24 22:52:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #268 from brecert/fix-198

Browse source
This commit is contained in:
Paul Makles 2021-10-09 23:45:52 +01:00 committed by GitHub
commit 148c0edcbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/context/intermediate/popovers/ModifyAccount.tsx
View file

@ -113,6 +113,7 @@ export function ModifyAccountModal({ onClose, field }: Props) {
register={register}
showOverline
error={errors.new_password?.message}
autoComplete="new-password"
/>
)}
{field === "username" && (
@ -129,6 +130,7 @@ export function ModifyAccountModal({ onClose, field }: Props) {
register={register}
showOverline
error={errors.current_password?.message}
autoComplete="current-password"
/>
{error && (
<Overline type="error" error={error}>

68
src/pages/login/FormField.tsx
View file

@ -5,8 +5,10 @@ import { Text, Localizer } from "preact-i18n";
import InputBox from "../../components/ui/InputBox";
import Overline from "../../components/ui/Overline";
interface Props {
type: "email" | "username" | "password" | "invite" | "current_password";
type FieldType = "email" | "username" | "password" | "invite" | "current_password";
type Props = Omit<JSX.HTMLAttributes<HTMLInputElement>, "children" | "as"> & {
type: FieldType;
showOverline?: boolean;
register: UseFormMethods["register"];
error?: string;
@ -19,6 +21,7 @@ export default function FormField({
showOverline,
error,
name,
...props
}: Props) {
return (
<>
@ -41,44 +44,45 @@ export default function FormField({
type === "invite" || type === "username"
? "text"
: type === "current_password"
? "password"
: type
? "password"
: type
}
// See https://github.com/mozilla/contain-facebook/issues/783
className="fbc-has-badge"
ref={register(
type === "password" || type === "current_password"
? {
validate: (value: string) =>
value.length === 0
? "RequiredField"
: value.length < 8
? "TooShort"
: value.length > 1024
? "TooLong"
: undefined,
}
validate: (value: string) =>
value.length === 0
? "RequiredField"
: value.length < 8
? "TooShort"
: value.length > 1024
? "TooLong"
: undefined,
}
: type === "email"
? {
required: "RequiredField",
pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
message: "InvalidEmail",
},
}
: type === "username"
? {
validate: (value: string) =>
value.length === 0
? "RequiredField"
: value.length < 2
? "TooShort"
: value.length > 32
? "TooLong"
: undefined,
}
: { required: "RequiredField" },
? {
required: "RequiredField",
pattern: {
value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
message: "InvalidEmail",
},
}
: type === "username"
? {
validate: (value: string) =>
value.length === 0
? "RequiredField"
: value.length < 2
? "TooShort"
: value.length > 32
? "TooLong"
: undefined,
}
: { required: "RequiredField" },
)}
{...props}
/>
</Localizer>
</>