keycloakify 11.2.6 → 11.2.9-rc.0

package/src/login/UserProfileFormFields.tsx

@@ -434,9 +434,7 @@ function AddRemoveButtonsMultiValuedAttribute(props: {
 }
 
 function InputTagSelects(props: InputFieldByTypeProps) {
-    const { attribute, dispatchFormAction, kcClsx, valueOrValues } = props;
-
-    const { advancedMsg } = props.i18n;
+    const { attribute, dispatchFormAction, kcClsx, i18n, valueOrValues } = props;
 
     const { classDiv, classInput, classLabel, inputType } = (() => {
         const { inputType } = attribute.annotations;
@@ -533,7 +531,7 @@ function InputTagSelects(props: InputFieldByTypeProps) {
                         htmlFor={`${attribute.name}-${option}`}
                         className={`${classLabel}${attribute.readOnly ? ` ${kcClsx("kcInputClassRadioCheckboxLabelDisabled")}` : ""}`}
                     >
-                        {advancedMsg(option)}
+                        {inputLabel(i18n, attribute, option)}
                     </label>
                 </div>
             ))}
@@ -580,8 +578,6 @@ function TextareaTag(props: InputFieldByTypeProps) {
 function SelectTag(props: InputFieldByTypeProps) {
     const { attribute, dispatchFormAction, kcClsx, displayableErrors, i18n, valueOrValues } = props;
 
-    const { advancedMsgStr } = i18n;
-
     const isMultiple = attribute.annotations.inputType === "multiselect";
 
     return (
@@ -645,22 +641,26 @@ function SelectTag(props: InputFieldByTypeProps) {
 
                 return options.map(option => (
                     <option key={option} value={option}>
-                        {(() => {
-                            if (attribute.annotations.inputOptionLabels !== undefined) {
-                                const { inputOptionLabels } = attribute.annotations;
-
-                                return advancedMsgStr(inputOptionLabels[option] ?? option);
-                            }
-
-                            if (attribute.annotations.inputOptionLabelsI18nPrefix !== undefined) {
-                                return advancedMsgStr(`${attribute.annotations.inputOptionLabelsI18nPrefix}.${option}`);
-                            }
-
-                            return option;
-                        })()}
+                        {inputLabel(i18n, attribute, option)}
                     </option>
                 ));
             })()}
         </select>
     );
 }
+
+function inputLabel(i18n: I18n, attribute: Attribute, option: string) {
+    const { advancedMsg } = i18n;
+
+    if (attribute.annotations.inputOptionLabels !== undefined) {
+        const { inputOptionLabels } = attribute.annotations;
+
+        return advancedMsg(inputOptionLabels[option] ?? option);
+    }
+
+    if (attribute.annotations.inputOptionLabelsI18nPrefix !== undefined) {
+        return advancedMsg(`${attribute.annotations.inputOptionLabelsI18nPrefix}.${option}`);
+    }
+
+    return option;
+}

package/stories/login/pages/Register.stories.tsx

@@ -115,6 +115,38 @@ export const WithFavoritePet: Story = {
     )
 };
 
+
+export const WithNewsletter: Story = {
+    render: () => (
+        <KcPageStory
+            kcContext={{
+                profile: {
+                    attributesByName: {
+                        newsletter: {
+                            name: "newsletter",
+                            displayName: "Sign up to the newsletter",
+                            validators: {
+                                options: {
+                                    options: ["yes"]
+                                }
+                            },
+                            annotations: {
+                                inputOptionLabels: {
+                                    "yes": "I want my email inbox filled with spam"
+                                },
+                                inputType: "multiselect-checkboxes"
+                            },
+                            required: false,
+                            readOnly: false
+                        } satisfies Attribute
+                    }
+                },
+            }}
+        />
+    )
+};
+
+
 export const WithEmailAsUsername: Story = {
     render: () => (
         <KcPageStory

package/vite-plugin/index.js

@@ -229,6 +229,7 @@ function ensureSingleOrNone(arg0) {
 
 
 
+
 (0,assert/* assert */.h)();
 function getBuildContext(params) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
@@ -334,8 +335,8 @@ function getBuildContext(params) {
                     lib.z.literal("none")
                 ]),
                 keycloakVersionTargets: lib.z.object({
-                    "21-and-below": lib.z.union([lib.z.boolean(), lib.z.string()]),
-                    "22-and-above": lib.z.union([lib.z.boolean(), lib.z.string()])
+                    "22-to-25": lib.z.union([lib.z.boolean(), lib.z.string()]),
+                    "all-other-versions": lib.z.union([lib.z.boolean(), lib.z.string()])
                 })
                     .optional()
             });
@@ -667,10 +668,11 @@ function getBuildContext(params) {
                     }
                     else {
                         const keycloakVersionRange = (() => {
-                            if (buildForKeycloakMajorVersionNumber <= 21) {
-                                return "21-and-below";
+                            if (buildForKeycloakMajorVersionNumber <= 21 ||
+                                buildForKeycloakMajorVersionNumber >= 26) {
+                                return "all-other-versions";
                             }
-                            return "22-and-above";
+                            return "22-to-25";
                         })();
                         (0,assert/* assert */.h)();
                         return keycloakVersionRange;
@@ -679,6 +681,7 @@ function getBuildContext(params) {
                 const jarFileBasename = (() => {
                     use_custom_jar_basename: {
                         const { keycloakVersionTargets } = buildOptions;
+                        (0,assert/* assert */.h)(is(keycloakVersionTargets));
                         if (keycloakVersionTargets === undefined) {
                             break use_custom_jar_basename;
                         }
@@ -720,8 +723,8 @@ function getBuildContext(params) {
                 }
                 else {
                     for (const keycloakVersionRange of [
-                        "21-and-below",
-                        "22-and-above"
+                        "22-to-25",
+                        "all-other-versions"
                     ]) {
                         (0,assert/* assert */.h)(true);
                         jarTargets.push({
@@ -736,7 +739,11 @@ function getBuildContext(params) {
                 return jarTargets_default;
             }
             const jarTargets = [];
-            for (const [keycloakVersionRange, jarNameOrBoolean] of objectEntries(buildOptions.keycloakVersionTargets)) {
+            for (const [keycloakVersionRange, jarNameOrBoolean] of objectEntries((() => {
+                const { keycloakVersionTargets } = buildOptions;
+                (0,assert/* assert */.h)(is(keycloakVersionTargets));
+                return keycloakVersionTargets;
+            })())) {
                 if (jarNameOrBoolean === false) {
                     continue;
                 }