Skip to content

Commit

Permalink
fix(clerk-js): Trim emails, usernames and identifiers (#2881)
Browse files Browse the repository at this point in the history
  • Loading branch information
desiprisg authored Feb 28, 2024
1 parent f964355 commit 7904096
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 14 deletions.
2 changes: 2 additions & 0 deletions .changeset/warm-news-wonder.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 5 additions & 0 deletions .changeset/wet-bats-tickle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@clerk/clerk-js': patch
---

Inputs will now trim usernames and email addresses since whitespace as a prefix or suffix is invalid in these fields.
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/components/SignIn/SignInStart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export function _SignInStart(): JSX.Element {
const textIdentifierField = useFormControl('identifier', initialValues[identifierAttribute] || '', {
...currentIdentifier,
isRequired: true,
transformer: value => value.trim(),
});

const phoneIdentifierField = useFormControl('identifier', initialValues['phone_number'] || '', {
Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui/components/SignUp/SignUpStart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ function _SignUpStart(): JSX.Element {
type: 'text',
label: localizationKeys('formFieldLabel__username'),
placeholder: localizationKeys('formFieldInputPlaceholder__username'),
transformer: value => value.trim(),
}),
phoneNumber: useFormControl('phoneNumber', signUp.phoneNumber || initialValues.phoneNumber || '', {
type: 'tel',
Expand Down
7 changes: 1 addition & 6 deletions packages/clerk-js/src/ui/primitives/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,7 @@ export const Input = React.forwardRef<HTMLInputElement, InputProps>((props, ref)
* type="email" will not allow characters like this one "ö", instead remove type email and provide a pattern that accepts any character before the "@" symbol
*/

const typeProps =
type === 'email'
? {
pattern: '^.*@[a-zA-Z0-9\\-]+\\.[a-zA-Z0-9\\-\\.]+$',
}
: { type };
const typeProps = type === 'email' ? { pattern: '^.*@[a-zA-Z0-9\\-]+\\.[a-zA-Z0-9\\-\\.]+$' } : { type };

const passwordManagerProps = ignorePasswordManager
? {
Expand Down
35 changes: 27 additions & 8 deletions packages/clerk-js/src/ui/utils/useFormControl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@ import { useLocalizations } from '../localization';

type SelectOption = { value: string; label?: string };

type Transformer = (value: string) => string;

type Options = {
isRequired?: boolean;
placeholder?: string | LocalizationKey;
options?: SelectOption[];
transformer?: Transformer;
defaultChecked?: boolean;
infoText?: LocalizationKey | string;
} & (
Expand Down Expand Up @@ -75,35 +78,51 @@ export type FormControlState<Id = string> = FieldStateProps<Id> & {

export type FeedbackType = 'success' | 'error' | 'warning' | 'info';

const emailTransformer = (v: string) => v.trim();
const applyTransformers = (v: string, transformers: Transformer[]) => {
let value = v;
for (let i = 0; i < transformers.length; i++) {
value = transformers[i](value);
}
return value;
};

export const useFormControl = <Id extends string>(
id: Id,
initialState: string,
opts?: Options,
): FormControlState<Id> => {
opts = opts || {
const options = opts || {
type: 'text',
label: '',
isRequired: false,
placeholder: '',
options: [],
defaultChecked: false,
};
const transformers: Transformer[] = [];
if (options.transformer) {
transformers.push(options.transformer);
}
if (options.type === 'email') {
transformers.push(emailTransformer);
}

const { translateError, t } = useLocalizations();
const [value, setValueInternal] = useState<string>(initialState);
const [value, setValueInternal] = useState<string>(applyTransformers(initialState, transformers));
const [isFocused, setFocused] = useState(false);
const [checked, setCheckedInternal] = useState<boolean>(opts?.defaultChecked || false);
const [checked, setCheckedInternal] = useState<boolean>(options?.defaultChecked || false);
const [hasPassedComplexity, setHasPassedComplexity] = useState(false);
const [feedback, setFeedback] = useState<{ message: string; type: FeedbackType }>({
message: '',
type: 'info',
});

const onChange: FormControlState['onChange'] = event => {
if (opts?.type === 'checkbox') {
if (options?.type === 'checkbox') {
return setCheckedInternal(event.target.checked);
}
return setValueInternal(event.target.value || '');
return setValueInternal(applyTransformers(event.target.value || '', transformers));
};

const setValue: FormControlState['setValue'] = val => setValueInternal(val || '');
Expand Down Expand Up @@ -135,7 +154,7 @@ export const useFormControl = <Id extends string>(
setFocused(false);
};

const { defaultChecked, validatePassword: validatePasswordProp, buildErrorMessage, ...restOpts } = opts;
const { defaultChecked, validatePassword: validatePasswordProp, buildErrorMessage, ...restOpts } = options;

const props = {
id,
Expand All @@ -148,13 +167,13 @@ export const useFormControl = <Id extends string>(
onBlur,
onFocus,
setWarning,
feedback: feedback.message || t(opts.infoText),
feedback: feedback.message || t(options.infoText),
feedbackType: feedback.type,
setInfo,
clearFeedback,
hasPassedComplexity,
setHasPassedComplexity,
validatePassword: opts.type === 'password' ? opts.validatePassword : undefined,
validatePassword: options.type === 'password' ? options.validatePassword : undefined,
isFocused,
...restOpts,
};
Expand Down

0 comments on commit 7904096

Please sign in to comment.