@isoftdata/svelte-user-configuration 1.2.6 → 1.3.1

package/dist/PasswordSetModal.svelte

@@ -32,7 +32,7 @@ export async function open(userAccount) {
   }
 }
 const { t: translate } = getContext("i18next") || { t: defaultTranslate };
-$: passwordMismatch = !(currentPassword && newPassword && confirmPassword && newPassword === confirmPassword);
+$: passwordMismatch = !(newPassword && confirmPassword && newPassword === confirmPassword);
 $: disablePasswordChange = changePasswordMode && !currentPassword || passwordMismatch || !newPassword || !confirmPassword || !passwordIsValid;
 </script>
 

package/dist/UserAccountInfo.svelte

@@ -26,6 +26,8 @@ export let cardHeight = 0;
 export let myAccountMode = false;
 export let passwordValidationRules = void 0;
 export let cardTitle = translate("configuration.user.accountInfoHeader", "Account");
+export let recoveryEmailIsValid = true;
+export let workEmailIsValid = true;
 let isLoading = false;
 let passwordSetModal;
 let deactivateUserModal;
@@ -66,10 +68,14 @@ async function reactivateUserAccount() {
     await accountInfoChanged?.();
   }
 }
+const emailAddressRegex = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+const emailIsValid = (emailAddress) => emailAddressRegex.test(emailAddress);
 $: workEmail = userAccount.workEmail;
 $: status = userAccount.status;
 $: activationPIN = userAccount.userActivationData?.activationPIN;
 $: isCreatingNewUser = userAccount.id === null;
+$: recoveryEmailIsValid = myAccountMode && userAccount.recoveryEmail ? emailIsValid(userAccount.recoveryEmail) : true;
+$: workEmailIsValid = !myAccountMode && userAccount.workEmail ? emailIsValid(userAccount.workEmail) : true;
 </script>
 
 <div
@@ -203,6 +209,8 @@ $: isCreatingNewUser = userAccount.id === null;
 						inputmode="email"
 						readonly={myAccountMode || undefined}
 						tabindex={myAccountMode ? -1 : undefined}
+						hint={!workEmailIsValid ? translate('common:invalidEmailAddress', 'Invalid Email') : undefined}
+						hintClass="text-danger"
 					/>
 					{#if workEmail && !isCreatingNewUser && status === 'PENDING_ACTIVATION'}
 						<Button
@@ -224,6 +232,8 @@ $: isCreatingNewUser = userAccount.id === null;
 						inputmode="email"
 						readonly={!myAccountMode || undefined}
 						tabindex={!myAccountMode ? -1 : undefined}
+						hint={!recoveryEmailIsValid ? translate('common:invalidEmailAddress', 'Invalid Email') : undefined}
+						hintClass="text-danger"
 					/>
 				</div>
 				{#if !isCreatingNewUser && !myAccountMode}

package/dist/UserAccountInfo.svelte.d.ts

@@ -28,6 +28,8 @@ declare const __propDef: {
         myAccountMode?: boolean;
         passwordValidationRules?: PasswordValidationRules | undefined;
         cardTitle?: string;
+        recoveryEmailIsValid?: boolean;
+        workEmailIsValid?: boolean;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@isoftdata/svelte-user-configuration",
-	"version": "1.2.6",
+	"version": "1.3.1",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build && npm run package",