agtic/keycloak_theme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply number unformat during validation if any

Browse Source
This commit is contained in:
Joseph Garrone 2024-05-06 16:07:49 +02:00
parent 7f55bb5ce3
commit 4794e35989
2 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/login/kcContext/KcContext.ts
View File

@ -537,6 +537,7 @@ export type Attribute = {
}; };
html5DataAnnotations: { html5DataAnnotations: {
kcNumberFormat?: string; kcNumberFormat?: string;
kcNumberUnFormat?: string;
}; };
readOnly: boolean; readOnly: boolean;
validators: Validators; validators: Validators;

72
src/login/lib/useUserProfileForm.tsx
View File

@ -403,15 +403,36 @@ function useGetErrors(params: { kcContext: Pick<KcContextLike, "messagesPerField
const { attribute } = formFieldState; const { attribute } = formFieldState;
const valueOrValues = (() => {
let { valueOrValues } = formFieldState;
unFormat_number: {
// NOTE: The `?? {}` is for compat with Keycloak version prior to 24
const { kcNumberUnFormat } = attribute.html5DataAnnotations ?? {};
if (kcNumberUnFormat === undefined) {
break unFormat_number;
}
if (valueOrValues instanceof Array) {
valueOrValues = valueOrValues.map(value => formatNumber(value, kcNumberUnFormat));
} else {
valueOrValues = formatNumber(valueOrValues, kcNumberUnFormat);
}
}
return valueOrValues;
})();
assert(attribute !== undefined); assert(attribute !== undefined);
server_side_error: { server_side_error: {
if (attribute.multivalued) { if (attribute.multivalued) {
const defaultValues = attribute.values ?? [""]; const defaultValues = attribute.values ?? [""];
assert(formFieldState.valueOrValues instanceof Array); assert(valueOrValues instanceof Array);
const values = formFieldState.valueOrValues; const values = valueOrValues;
if (JSON.stringify(defaultValues) !== JSON.stringify(values.slice(0, defaultValues.length))) { if (JSON.stringify(defaultValues) !== JSON.stringify(values.slice(0, defaultValues.length))) {
break server_side_error; break server_side_error;
@ -419,9 +440,9 @@ function useGetErrors(params: { kcContext: Pick<KcContextLike, "messagesPerField
} else { } else {
const defaultValue = attribute.value ?? ""; const defaultValue = attribute.value ?? "";
assert(typeof formFieldState.valueOrValues === "string"); assert(typeof valueOrValues === "string");
const value = formFieldState.valueOrValues; const value = valueOrValues;
if (defaultValue !== value) { if (defaultValue !== value) {
break server_side_error; break server_side_error;
@ -463,25 +484,27 @@ function useGetErrors(params: { kcContext: Pick<KcContextLike, "messagesPerField
break handle_multi_valued_multi_fields; break handle_multi_valued_multi_fields;
} }
assert(formFieldState.valueOrValues instanceof Array); assert(valueOrValues instanceof Array);
const values = formFieldState.valueOrValues; const values = valueOrValues;
const errors = values const errors = values
.map((value, index) => { .map((...[, index]) => {
const specificValueErrors = getErrors({ const specificValueErrors = getErrors({
attributeName, attributeName,
"formFieldStates": formFieldStates.map(formFieldState => { "formFieldStates": formFieldStates.map(formFieldState => {
if (formFieldState.attribute.name === attributeName) { if (formFieldState.attribute.name === attributeName) {
assert(formFieldState.valueOrValues instanceof Array);
return { return {
"attribute": { "attribute": {
...attribute, ...attribute,
"annotations": { "annotations": {
...attribute.annotations, ...attribute.annotations,
"inputType": undefined "inputType": undefined
} },
"multivalued": false
}, },
"valueOrValues": value "valueOrValues": formFieldState.valueOrValues[index]
}; };
} }
@ -555,9 +578,9 @@ function useGetErrors(params: { kcContext: Pick<KcContextLike, "messagesPerField
assert(!isNaN(max)); assert(!isNaN(max));
assert(formFieldState.valueOrValues instanceof Array); assert(valueOrValues instanceof Array);
const values = formFieldState.valueOrValues; const values = valueOrValues;
if (min <= values.length && values.length <= max) { if (min <= values.length && values.length <= max) {
return []; return [];
@ -578,9 +601,9 @@ function useGetErrors(params: { kcContext: Pick<KcContextLike, "messagesPerField
]; ];
} }
assert(typeof formFieldState.valueOrValues === "string"); assert(typeof valueOrValues === "string");
const value = formFieldState.valueOrValues; const value = valueOrValues;
const errors: FormFieldError[] = []; const errors: FormFieldError[] = [];
@ -762,14 +785,27 @@ function useGetErrors(params: { kcContext: Pick<KcContextLike, "messagesPerField
break check_password_policy_x; break check_password_policy_x;
} }
assert(typeof usernameFormFieldState.valueOrValues === "string"); const usernameValue = (() => {
let { valueOrValues } = usernameFormFieldState;
{ assert(typeof valueOrValues === "string");
const usernameValue = usernameFormFieldState.valueOrValues;
if (value !== usernameValue) { unFormat_number: {
break check_password_policy_x; // NOTE: The `?? {}` is for compat with Keycloak version prior to 24
const { kcNumberUnFormat } = attribute.html5DataAnnotations ?? {};
if (kcNumberUnFormat === undefined) {
break unFormat_number;
}
valueOrValues = formatNumber(valueOrValues, kcNumberUnFormat);
} }
return valueOrValues;
})();
if (value !== usernameValue) {
break check_password_policy_x;
} }
const msgArgs = ["invalidPasswordNotUsernameMessage"] as const; const msgArgs = ["invalidPasswordNotUsernameMessage"] as const;