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.

Sign up for GitHub

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

feat: add nonOptionalErrorMsg props #757

Merged
merged 9 commits into from
Nov 11, 2023
Merged

feat: add nonOptionalErrorMsg props #757

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0eb5e50
Add nonOptionalErr types
amitbadala Nov 6, 2023
f1c8f95
Now supports nonOptionalErrorMsg attribute
amitbadala Nov 6, 2023
f8e9cca
Add tests and fix signin types to include nonOptionalMsg
amitbadala Nov 6, 2023
18a411f
Enforce no api request are made on blank forms
amitbadala Nov 6, 2023
a14b2da
Clean up signup
amitbadala Nov 7, 2023
ee682a7
Throw error if invalid nonOptionalErrorMsg, add tests for the same
amitbadala Nov 7, 2023
f2ebfe9
Better error message
amitbadala Nov 7, 2023
277489d
Handle incorrect optional flag
amitbadala Nov 10, 2023
8e81b30
fixes redundant normalisation
rishabhpoddar Nov 11, 2023
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
9 changes: 6 additions & 3 deletions lib/build/emailpassword-shared4.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions lib/build/emailpassword-shared7.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions lib/ts/recipe/emailpassword/components/library/formBase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,7 @@ export const FormBase: React.FC<FormBaseProps<any>> = (props) => {
if (errorMessage === "Field is not optional") {
rishabhpoddar marked this conversation as resolved.
Show resolved Hide resolved
const fieldConfigData = props.formFields.find((f) => f.id === fs.id);
// replace non-optional server error message from nonOptionalErrorMsg
if (
fieldConfigData?.nonOptionalErrorMsg !== undefined &&
fieldConfigData?.nonOptionalErrorMsg !== ""
) {
if (fieldConfigData?.nonOptionalErrorMsg !== undefined) {
return fieldConfigData?.nonOptionalErrorMsg;
}
}
Expand Down
4 changes: 2 additions & 2 deletions lib/ts/recipe/emailpassword/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,10 +326,10 @@ export function mergeFormFields(
// If new field, push to mergeFormFields.
if (isNewField) {
mergedFormFields.push({
optional: false,
placeholder: userField.label,
validate: defaultValidate,
...userField,
optional: Boolean(userField.optional),
rishabhpoddar marked this conversation as resolved.
Show resolved Hide resolved
});
}
}
Expand All @@ -340,7 +340,7 @@ export function mergeFormFields(
export function getFormattedFormField(field: NormalisedFormField): NormalisedFormField {
// Fields with the 'nonOptionalErrorMsg' property must have a valid message defined
if (field.optional === false && field.nonOptionalErrorMsg === "") {
rishabhpoddar marked this conversation as resolved.
Show resolved Hide resolved
throw new Error(`nonOptionalErrorMsg for field ${field.id} cannot be empty`);
throw new Error(`nonOptionalErrorMsg for field ${field.id} cannot be an empty string`);
}
return {
...field,
Expand Down
2 changes: 1 addition & 1 deletion test/end-to-end/signup.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ describe("SuperTokens SignUp", function () {
});

it("Check if empty string for nonOptionalErrorMsg throws error", async function () {
const expectedErrorMessage = "nonOptionalErrorMsg for field city cannot be empty";
const expectedErrorMessage = "nonOptionalErrorMsg for field city cannot be an empty string";
let pageErrorMessage = "";
page.on("pageerror", (err) => {
pageErrorMessage = err.message;
Expand Down
Loading