@forgerock/login-widget 1.0.0-beta.8 → 1.0.0-beta.9

package/CHANGELOG.md

@@ -1,16 +1,21 @@
-# [1.0.0-beta.8](https://github.com/forgerock/forgerock-web-login-framework/compare/v1.0.0-beta.7...v1.0.0-beta.8) (2023-03-15)
+# [1.0.0-beta.9](https://github.com/forgerock/forgerock-web-login-framework/compare/v1.0.0-beta.8...v1.0.0-beta.9) (2023-03-21)
 
 
 ### Bug Fixes
 
-* addresses bugs fixes reported in beta testing and doc changes for new api ([10c4b05](https://github.com/forgerock/forgerock-web-login-framework/commit/10c4b05579bb5c5921567fdedc95a5bef4a9aa7b))
+* **journeys:** fix stages, journey restarts & config, policy display, remove restart after logout ([ac0c9aa](https://github.com/forgerock/forgerock-web-login-framework/commit/ac0c9aaccf0359c36614a6199af7a64cfa9615e2))
 
-# [1.0.0-beta.7](https://github.com/forgerock/forgerock-web-login-framework/compare/v1.0.0-beta.6...v1.0.0-beta.7) (2023-03-08)
+# [1.0.0-beta.8](https://github.com/forgerock/forgerock-web-login-framework/compare/v1.0.0-beta.7...v1.0.0-beta.8) (2023-03-15)
 
+### Bug Fixes
+
+- addresses bugs fixes reported in beta testing and doc changes for new api ([10c4b05](https://github.com/forgerock/forgerock-web-login-framework/commit/10c4b05579bb5c5921567fdedc95a5bef4a9aa7b))
+
+# [1.0.0-beta.7](https://github.com/forgerock/forgerock-web-login-framework/compare/v1.0.0-beta.6...v1.0.0-beta.7) (2023-03-08)
 
 ### Bug Fixes
 
-* **add-back-css:** css was removed ona ccident ([ba024f3](https://github.com/forgerock/forgerock-web-login-framework/commit/ba024f338a978c60a965230d95defdc95c7a4b3b))
+- **add-back-css:** css was removed ona ccident ([ba024f3](https://github.com/forgerock/forgerock-web-login-framework/commit/ba024f338a978c60a965230d95defdc95c7a4b3b))
 
 # [1.0.0-beta.6](https://github.com/forgerock/forgerock-web-login-framework/compare/v1.0.0-beta.5...v1.0.0-beta.6) (2023-03-07)
 

package/index.cjs

@@ -14930,7 +14930,8 @@ function configure (config) {
     Config.set(config);
 }
 
-const journeyConfigItemSchema = z.object({
+const journeyConfigItemSchema = z
+    .object({
     journey: z.string().optional(),
     match: z
         .string()
@@ -14938,7 +14939,8 @@ const journeyConfigItemSchema = z.object({
         message: 'HREF string must start with `?journey` or `#/service`',
     })
         .array(),
-});
+})
+    .optional();
 const journeyConfigSchema = z.object({
     forgotPassword: journeyConfigItemSchema,
     forgotUsername: journeyConfigItemSchema,
@@ -14955,8 +14957,8 @@ const defaultJourneys = {
         match: ['#/service/ForgottenUsername', '?journey=ForgottenUsername'],
     },
     login: {
-        journey: undefined,
-        match: ['#/service/Login', '?journey'],
+        journey: 'Login',
+        match: ['#/service/Login', '?journey', '?journey=Login'],
     },
     register: {
         journey: 'Registration',
@@ -14974,8 +14976,14 @@ function initialize$6(customJourneys) {
     if (customJourneys) {
         // Provide developer feedback if customized
         journeyConfigSchema.parse(customJourneys);
-        configuredJourneysStore.set(Object.keys(customJourneys).map((key) => ({
-            ...customJourneys[key],
+        // Merge the two journey configs, dev's overwriting the default
+        const mergedJourneyObjects = {
+            ...defaultJourneys,
+            ...customJourneys,
+        };
+        const customJourneyKeys = Object.keys(mergedJourneyObjects);
+        configuredJourneysStore.set(customJourneyKeys.map((key) => ({
+            ...mergedJourneyObjects[key],
             key,
         })));
     }
@@ -17326,6 +17334,15 @@ function initializeStack(initOptions) {
     const { update, set, subscribe } = writable(initialValue);
     // Assign to exported variable (see bottom of file)
     stack = {
+        latest: async () => {
+            return new Promise((resolve) => {
+                // subscribe, grab the current value and unsubscribe
+                subscribe((current) => {
+                    const lastItem = current[current.length - 1];
+                    resolve(lastItem);
+                })();
+            });
+        },
         pop: async () => {
             return new Promise((resolve) => {
                 update((current) => {
@@ -17377,7 +17394,6 @@ const journeyStore = writable({
 });
 function initialize$4(initOptions) {
     const stack = initializeStack();
-    let restartOptions;
     let stepNumber = 0;
     async function next(prevStep = null, nextOptions, resumeUrl) {
         if (!Config.get().serverConfig?.baseUrl) {
@@ -17391,14 +17407,6 @@ function initialize$4(initOptions) {
             ...initOptions,
             ...nextOptions,
         };
-        // These options are reserved only for restarting a journey after failure
-        if (initOptions || nextOptions) {
-            restartOptions = {
-                // Prioritize next options over initialize options
-                ...initOptions,
-                ...nextOptions,
-            };
-        }
         /**
          * Save previous step information just in case we have a total
          * form failure due to 400 response from ForgeRock.
@@ -17485,6 +17493,7 @@ function initialize$4(initOptions) {
             /**
              * SUCCESSFUL COMPLETION BLOCK
              */
+            stack.reset();
             // Set final state
             journeyStore.set({
                 completed: true,
@@ -17508,6 +17517,7 @@ function initialize$4(initOptions) {
                 /**
                  * Restart tree to get fresh step
                  */
+                const restartOptions = await stack.latest();
                 restartedStep = await FRAuth$1.next(undefined, restartOptions);
             }
             catch (err) {
@@ -17643,6 +17653,18 @@ function initialize$4(initOptions) {
         await next(undefined, resumeOptions, url);
     }
     async function start(startOptions) {
+        const configTree = Config.get().tree;
+        // If no tree is passed in, but there's a configured default tree, use that
+        if (!startOptions?.tree && configTree) {
+            if (startOptions) {
+                startOptions.tree = configTree;
+            }
+            else {
+                startOptions = {
+                    tree: configTree,
+                };
+            }
+        }
         await stack.push(startOptions);
         await next(undefined, startOptions);
     }
@@ -17885,8 +17907,6 @@ function widgetApiFactory(componentApi) {
         journeyStore.reset();
         oauthStore.reset();
         userStore.reset();
-        // Fetch fresh journey step
-        journey().start();
     }
     const configuration = (options) => {
         if (options?.forgerock) {
@@ -20657,18 +20677,36 @@ function getValidationMessageString(policy) {
         }
         case 'cannot-contain-characters': {
             const params = policy?.params;
-            const chars = params?.forbiddenChars.reduce((prev, curr) => {
-                prev = `${prev ? `${prev}, ` : `${prev}`} ${curr}`;
-                return prev;
-            }, '');
+            let chars = '';
+            if (typeof params !== 'object') {
+                return '';
+            }
+            if (Array.isArray(params.forbiddenChars)) {
+                chars = params.forbiddenChars.reduce((prev, curr) => {
+                    prev = `${prev ? `${prev}, ` : `${prev}`} ${curr}`;
+                    return prev;
+                }, '');
+            }
+            else if (typeof params.forbiddenChars === 'string') {
+                chars = params.forbiddenChars;
+            }
             return interpolate('fieldCanNotContainFollowingCharacters', { chars });
         }
         case 'cannot-contain-others': {
             const params = policy?.params;
-            const fields = params?.disallowedFields?.reduce((prev, curr) => {
-                prev = `${prev ? `${prev}, ` : `${prev}`} ${interpolate(curr)}`;
-                return prev;
-            }, '');
+            let fields = '';
+            if (typeof params !== 'object') {
+                return '';
+            }
+            if (Array.isArray(params.disallowedFields)) {
+                fields = params.disallowedFields?.reduce((prev, curr) => {
+                    prev = `${prev ? `${prev}, ` : `${prev}`} ${interpolate(curr)}`;
+                    return prev;
+                }, '');
+            }
+            else if (typeof params.disallowedFields === 'string') {
+                fields = params.disallowedFields;
+            }
             return interpolate('fieldCanNotContainFollowingValues', { fields });
         }
         case 'maximum-length': {
@@ -29218,17 +29256,17 @@ class Select_idp extends SvelteComponent {
 
 function get_each_context_1(ctx, list, i) {
 	const child_ctx = ctx.slice();
-	child_ctx[10] = list[i];
+	child_ctx[11] = list[i];
 	return child_ctx;
 }
 
 function get_each_context$4(ctx, list, i) {
 	const child_ctx = ctx.slice();
-	child_ctx[7] = list[i];
+	child_ctx[8] = list[i];
 	return child_ctx;
 }
 
-// (34:33) 
+// (35:51) 
 function create_if_block_1$6(ctx) {
 	let div;
 	let p;
@@ -29238,7 +29276,7 @@ function create_if_block_1$6(ctx) {
 	let div_id_value;
 	let current;
 	t0 = new Locale_strings({ props: { key: /*messageKey*/ ctx[1] } });
-	let each_value_1 = /*validationRules*/ ctx[2];
+	let each_value_1 = /*validationRules*/ ctx[3];
 	let each_blocks = [];
 
 	for (let i = 0; i < each_value_1.length; i += 1) {
@@ -29280,8 +29318,8 @@ function create_if_block_1$6(ctx) {
 			if (dirty & /*messageKey*/ 2) t0_changes.key = /*messageKey*/ ctx[1];
 			t0.$set(t0_changes);
 
-			if (dirty & /*validationRules*/ 4) {
-				each_value_1 = /*validationRules*/ ctx[2];
+			if (dirty & /*validationRules*/ 8) {
+				each_value_1 = /*validationRules*/ ctx[3];
 				let i;
 
 				for (i = 0; i < each_value_1.length; i += 1) {
@@ -29324,7 +29362,7 @@ function create_if_block_1$6(ctx) {
 	};
 }
 
-// (23:0) {#if simplifiedFailures.length}
+// (24:0) {#if simplifiedFailures.length}
 function create_if_block$8(ctx) {
 	let div;
 	let p;
@@ -29334,7 +29372,7 @@ function create_if_block$8(ctx) {
 	let div_id_value;
 	let current;
 	t0 = new Locale_strings({ props: { key: /*messageKey*/ ctx[1] } });
-	let each_value = /*simplifiedFailures*/ ctx[3];
+	let each_value = /*simplifiedFailures*/ ctx[4];
 	let each_blocks = [];
 
 	for (let i = 0; i < each_value.length; i += 1) {
@@ -29376,8 +29414,8 @@ function create_if_block$8(ctx) {
 			if (dirty & /*messageKey*/ 2) t0_changes.key = /*messageKey*/ ctx[1];
 			t0.$set(t0_changes);
 
-			if (dirty & /*simplifiedFailures*/ 8) {
-				each_value = /*simplifiedFailures*/ ctx[3];
+			if (dirty & /*simplifiedFailures*/ 16) {
+				each_value = /*simplifiedFailures*/ ctx[4];
 				let i;
 
 				for (i = 0; i < each_value.length; i += 1) {
@@ -29420,10 +29458,10 @@ function create_if_block$8(ctx) {
 	};
 }
 
-// (40:6) {#each validationRules as rule}
+// (41:6) {#each validationRules as rule}
 function create_each_block_1(ctx) {
 	let li;
-	let t_value = /*rule*/ ctx[10].message + "";
+	let t_value = /*rule*/ ctx[11].message + "";
 	let t;
 
 	return {
@@ -29437,7 +29475,7 @@ function create_each_block_1(ctx) {
 			append(li, t);
 		},
 		p(ctx, dirty) {
-			if (dirty & /*validationRules*/ 4 && t_value !== (t_value = /*rule*/ ctx[10].message + "")) set_data(t, t_value);
+			if (dirty & /*validationRules*/ 8 && t_value !== (t_value = /*rule*/ ctx[11].message + "")) set_data(t, t_value);
 		},
 		d(detaching) {
 			if (detaching) detach(li);
@@ -29445,10 +29483,10 @@ function create_each_block_1(ctx) {
 	};
 }
 
-// (29:6) {#each simplifiedFailures as failure}
+// (30:6) {#each simplifiedFailures as failure}
 function create_each_block$4(ctx) {
 	let li;
-	let t_value = /*failure*/ ctx[7].message + "";
+	let t_value = /*failure*/ ctx[8].message + "";
 	let t;
 
 	return {
@@ -29462,7 +29500,7 @@ function create_each_block$4(ctx) {
 			append(li, t);
 		},
 		p(ctx, dirty) {
-			if (dirty & /*simplifiedFailures*/ 8 && t_value !== (t_value = /*failure*/ ctx[7].message + "")) set_data(t, t_value);
+			if (dirty & /*simplifiedFailures*/ 16 && t_value !== (t_value = /*failure*/ ctx[8].message + "")) set_data(t, t_value);
 		},
 		d(detaching) {
 			if (detaching) detach(li);
@@ -29479,8 +29517,8 @@ function create_fragment$g(ctx) {
 	const if_blocks = [];
 
 	function select_block_type(ctx, dirty) {
-		if (/*simplifiedFailures*/ ctx[3].length) return 0;
-		if (/*validationRules*/ ctx[2].length) return 1;
+		if (/*simplifiedFailures*/ ctx[4].length) return 0;
+		if (/*showPolicies*/ ctx[2] && /*validationRules*/ ctx[3].length) return 1;
 		return -1;
 	}
 
@@ -29561,6 +29599,7 @@ function instance$g($$self, $$props, $$invalidate) {
 	let { key = undefined } = $$props;
 	let { label } = $$props;
 	let { messageKey } = $$props;
+	let { showPolicies = false } = $$props;
 	let validationFailures = getValidationFailures(callback, label);
 	let validationRules = getValidationPolicies(callback.getPolicies());
 
@@ -29573,19 +29612,20 @@ function instance$g($$self, $$props, $$invalidate) {
 	);
 
 	$$self.$$set = $$props => {
-		if ('callback' in $$props) $$invalidate(4, callback = $$props.callback);
+		if ('callback' in $$props) $$invalidate(5, callback = $$props.callback);
 		if ('key' in $$props) $$invalidate(0, key = $$props.key);
-		if ('label' in $$props) $$invalidate(5, label = $$props.label);
+		if ('label' in $$props) $$invalidate(6, label = $$props.label);
 		if ('messageKey' in $$props) $$invalidate(1, messageKey = $$props.messageKey);
+		if ('showPolicies' in $$props) $$invalidate(2, showPolicies = $$props.showPolicies);
 	};
 
 	$$self.$$.update = () => {
-		if ($$self.$$.dirty & /*callback, label, validationFailures*/ 112) {
+		if ($$self.$$.dirty & /*callback, label, validationFailures*/ 224) {
 			{
-				$$invalidate(6, validationFailures = getValidationFailures(callback, label));
-				$$invalidate(2, validationRules = getValidationPolicies(callback.getPolicies()));
+				$$invalidate(7, validationFailures = getValidationFailures(callback, label));
+				$$invalidate(3, validationRules = getValidationPolicies(callback.getPolicies()));
 
-				$$invalidate(3, simplifiedFailures = validationFailures.reduce(
+				$$invalidate(4, simplifiedFailures = validationFailures.reduce(
 					(prev, curr) => {
 						prev = prev.concat(curr.restructured);
 						return prev;
@@ -29599,6 +29639,7 @@ function instance$g($$self, $$props, $$invalidate) {
 	return [
 		key,
 		messageKey,
+		showPolicies,
 		validationRules,
 		simplifiedFailures,
 		callback,
@@ -29612,10 +29653,11 @@ class Policies extends SvelteComponent {
 		super();
 
 		init(this, options, instance$g, create_fragment$g, safe_not_equal, {
-			callback: 4,
+			callback: 5,
 			key: 0,
-			label: 5,
-			messageKey: 1
+			label: 6,
+			messageKey: 1,
+			showPolicies: 2
 		});
 	}
 }
@@ -30443,7 +30485,8 @@ function create_default_slot$7(ctx) {
 			props: {
 				callback: /*callback*/ ctx[0],
 				label: /*prompt*/ ctx[3],
-				messageKey: "passwordRequirements"
+				messageKey: "passwordRequirements",
+				showPolicies: true
 			}
 		});
 
@@ -33484,7 +33527,7 @@ function get_each_context$1(ctx, list, i) {
 	return child_ctx;
 }
 
-// (44:2) {#if form?.icon}
+// (41:2) {#if form?.icon}
 function create_if_block_2$2(ctx) {
 	let div;
 	let newusericon;
@@ -33524,7 +33567,7 @@ function create_if_block_2$2(ctx) {
 	};
 }
 
-// (59:2) {#if form.message}
+// (56:2) {#if form.message}
 function create_if_block_1$2(ctx) {
 	let alert;
 	let current;
@@ -33572,7 +33615,7 @@ function create_if_block_1$2(ctx) {
 	};
 }
 
-// (60:4) <Alert id="formFailureMessageAlert" needsFocus={alertNeedsFocus} type="error">
+// (57:4) <Alert id="formFailureMessageAlert" needsFocus={alertNeedsFocus} type="error">
 function create_default_slot_2$1(ctx) {
 	let t_value = interpolate(/*formMessageKey*/ ctx[6], null, /*form*/ ctx[1]?.message) + "";
 	let t;
@@ -33593,7 +33636,7 @@ function create_default_slot_2$1(ctx) {
 	};
 }
 
-// (65:2) {#each step?.callbacks as callback, idx}
+// (62:2) {#each step?.callbacks as callback, idx}
 function create_each_block$1(ctx) {
 	let callbackmapper;
 	let current;
@@ -33646,7 +33689,7 @@ function create_each_block$1(ctx) {
 	};
 }
 
-// (77:2) {#if metadata?.step?.derived.isUserInputOptional || !metadata?.step?.derived.isStepSelfSubmittable}
+// (74:2) {#if metadata?.step?.derived.isUserInputOptional || !metadata?.step?.derived.isStepSelfSubmittable}
 function create_if_block$3(ctx) {
 	let button;
 	let current;
@@ -33695,7 +33738,7 @@ function create_if_block$3(ctx) {
 	};
 }
 
-// (78:4) <Button busy={journey?.loading} style="primary" type="submit" width="full">
+// (75:4) <Button busy={journey?.loading} style="primary" type="submit" width="full">
 function create_default_slot_1$2(ctx) {
 	let t;
 	let current;
@@ -33725,7 +33768,7 @@ function create_default_slot_1$2(ctx) {
 	};
 }
 
-// (43:0) <Form bind:formEl ariaDescribedBy="formFailureMessageAlert" onSubmitWhenValid={form?.submit}>
+// (40:0) <Form bind:formEl ariaDescribedBy="formFailureMessageAlert" onSubmitWhenValid={form?.submit}>
 function create_default_slot$3(ctx) {
 	let t0;
 	let h1;
@@ -34094,7 +34137,7 @@ class Registration extends SvelteComponent {
 	}
 }
 
-/* src/lib/journey/stages/username-password.svelte generated by Svelte v3.55.1 */
+/* src/lib/journey/stages/login.svelte generated by Svelte v3.55.1 */
 
 function get_each_context(ctx, list, i) {
 	const child_ctx = ctx.slice();
@@ -34103,7 +34146,7 @@ function get_each_context(ctx, list, i) {
 	return child_ctx;
 }
 
-// (44:2) {#if form?.icon}
+// (41:2) {#if form?.icon}
 function create_if_block_2$1(ctx) {
 	let div;
 	let keyicon;
@@ -34143,7 +34186,7 @@ function create_if_block_2$1(ctx) {
 	};
 }
 
-// (53:2) {#if form?.message}
+// (50:2) {#if form?.message}
 function create_if_block_1$1(ctx) {
 	let alert;
 	let current;
@@ -34191,7 +34234,7 @@ function create_if_block_1$1(ctx) {
 	};
 }
 
-// (54:4) <Alert id="formFailureMessageAlert" needsFocus={alertNeedsFocus} type="error">
+// (51:4) <Alert id="formFailureMessageAlert" needsFocus={alertNeedsFocus} type="error">
 function create_default_slot_2(ctx) {
 	let t_value = interpolate(/*formMessageKey*/ ctx[6], null, /*form*/ ctx[1]?.message) + "";
 	let t;
@@ -34212,7 +34255,7 @@ function create_default_slot_2(ctx) {
 	};
 }
 
-// (59:2) {#each step?.callbacks as callback, idx}
+// (56:2) {#each step?.callbacks as callback, idx}
 function create_each_block(ctx) {
 	let callbackmapper;
 	let current;
@@ -34265,7 +34308,7 @@ function create_each_block(ctx) {
 	};
 }
 
-// (71:2) {#if metadata?.step?.derived.isUserInputOptional || !metadata?.step?.derived.isStepSelfSubmittable}
+// (68:2) {#if metadata?.step?.derived.isUserInputOptional || !metadata?.step?.derived.isStepSelfSubmittable}
 function create_if_block$2(ctx) {
 	let button;
 	let current;
@@ -34314,7 +34357,7 @@ function create_if_block$2(ctx) {
 	};
 }
 
-// (72:4) <Button busy={journey?.loading} style="primary" type="submit" width="full">
+// (69:4) <Button busy={journey?.loading} style="primary" type="submit" width="full">
 function create_default_slot_1$1(ctx) {
 	let t;
 	let current;
@@ -34344,7 +34387,7 @@ function create_default_slot_1$1(ctx) {
 	};
 }
 
-// (43:0) <Form bind:formEl ariaDescribedBy="formFailureMessageAlert" onSubmitWhenValid={form?.submit}>
+// (40:0) <Form bind:formEl ariaDescribedBy="formFailureMessageAlert" onSubmitWhenValid={form?.submit}>
 function create_default_slot$2(ctx) {
 	let t0;
 	let h1;
@@ -34746,7 +34789,7 @@ function instance$2($$self, $$props, $$invalidate) {
 	];
 }
 
-class Username_password extends SvelteComponent {
+class Login extends SvelteComponent {
 	constructor(options) {
 		super();
 
@@ -34774,10 +34817,10 @@ function mapStepToStage(currentStep) {
     switch (currentStep?.getStage && currentStep.getStage()) {
         case 'OneTimePassword':
             return One_time_password;
-        case 'Registration':
+        case 'DefaultRegistration':
             return Registration;
-        case 'UsernamePassword':
-            return Username_password;
+        case 'DefaultLogin':
+            return Login;
         default:
             return Generic;
     }