@abp/ng.theme.shared 5.3.0 → 5.3.3

package/fesm2020/abp-ng.theme.shared.mjs

@@ -14,7 +14,7 @@ import { NgbInputDatepickerConfig, NgbTypeaheadConfig, NgbDateParserFormatter, N
 import * as i1$2 from '@swimlane/ngx-datatable';
 import { ColumnMode, NgxDatatableModule } from '@swimlane/ngx-datatable';
 import { HttpErrorResponse } from '@angular/common/http';
-import { NgxValidateCoreModule, VALIDATION_BLUEPRINTS, VALIDATION_MAP_ERRORS_FN, defaultMapErrorsFn, VALIDATION_VALIDATE_ON_SUBMIT, validatePassword } from '@ngx-validate/core';
+import { NgxValidateCoreModule, VALIDATION_BLUEPRINTS, VALIDATION_MAP_ERRORS_FN, defaultMapErrorsFn, VALIDATION_VALIDATE_ON_SUBMIT, normalizeDiacritics } from '@ngx-validate/core';
 import { Validators } from '@angular/forms';
 
 const bounceIn = animation([
@@ -933,15 +933,19 @@ const DEFAULT_VALIDATION_BLUEPRINTS = {
     creditCard: 'AbpValidation::ThisFieldIsNotAValidCreditCardNumber.',
     email: 'AbpValidation::ThisFieldIsNotAValidEmailAddress.',
     invalid: 'AbpValidation::ThisFieldIsNotValid.',
-    max: 'AbpValidation::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]',
+    max: 'AbpValidation::ThisFieldMustBeLessOrEqual{0}[{{ max }}]',
     maxlength: 'AbpValidation::ThisFieldMustBeAStringOrArrayTypeWithAMaximumLengthOf{0}[{{ requiredLength }}]',
-    min: 'AbpValidation::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]',
+    min: 'AbpValidation::ThisFieldMustBeGreaterThanOrEqual{0}[{{ min }}]',
     minlength: 'AbpValidation::ThisFieldMustBeAStringOrArrayTypeWithAMinimumLengthOf{0}[{{ requiredLength }}]',
     ngbDate: 'AbpValidation::ThisFieldIsNotValid.',
     passwordMismatch: 'AbpIdentity::Volo.Abp.Identity:PasswordConfirmationFailed',
     range: 'AbpValidation::ThisFieldMustBeBetween{0}And{1}[{{ min }},{{ max }}]',
     required: 'AbpValidation::ThisFieldIsRequired.',
     url: 'AbpValidation::ThisFieldIsNotAValidFullyQualifiedHttpHttpsOrFtpUrl',
+    passwordRequiresLower: 'AbpIdentity::Volo.Abp.Identity:PasswordRequiresLower',
+    passwordRequiresUpper: 'AbpIdentity::Volo.Abp.Identity:PasswordRequiresUpper',
+    passwordRequiresDigit: 'AbpIdentity::Volo.Abp.Identity:PasswordRequiresDigit',
+    passwordRequiresNonAlphanumeric: 'AbpIdentity::Volo.Abp.Identity:PasswordRequiresNonAlphanumeric',
 };
 
 class EllipsisDirective {
@@ -2204,7 +2208,8 @@ function getPasswordValidators(injector) {
     if (Number.isInteger(+getRule('RequiredLength'))) {
         requiredLength = +getRule('RequiredLength');
     }
-    return [validatePassword(passwordRulesArr), minLength(requiredLength), maxLength(128)];
+    const passwordValidators = passwordRulesArr.map(rule => validatePassword(rule));
+    return [...passwordValidators, minLength(requiredLength), maxLength(128)];
 }
 function getRuleFn(injector) {
     const configState = injector.get(ConfigStateService);
@@ -2212,6 +2217,34 @@ function getRuleFn(injector) {
         const passwordRules = configState.getSettings('Identity.Password');
         return (passwordRules[`Abp.Identity.Password.${key}`] || '').toLowerCase();
     };
+}
+const errorMessageMap = {
+    small: 'passwordRequiresLower',
+    capital: 'passwordRequiresUpper',
+    number: 'passwordRequiresDigit',
+    special: 'passwordRequiresNonAlphanumeric',
+};
+function validatePassword(shouldContain) {
+    return (control) => {
+        if (!control.value)
+            return null;
+        const value = normalizeDiacritics(control.value);
+        const regexMap = {
+            small: /.*[a-z].*/,
+            capital: /.*[A-Z].*/,
+            number: /.*[0-9].*/,
+            special: /.*[^0-9a-zA-Z].*/,
+        };
+        const regex = regexMap[shouldContain];
+        const isValid = regex.test(value);
+        if (isValid) {
+            return null;
+        }
+        const error = errorMessageMap[shouldContain];
+        return {
+            [error]: true,
+        };
+    };
 }
 
 /*
@@ -2222,5 +2255,5 @@ function getRuleFn(injector) {
  * Generated bundle index. Do not edit.
  */
 
-export { BaseThemeSharedModule, BreadcrumbComponent, BreadcrumbItemsComponent, ButtonComponent, Confirmation, ConfirmationComponent, ConfirmationService, DEFAULT_ERROR_LOCALIZATIONS, DEFAULT_ERROR_MESSAGES, DEFAULT_VALIDATION_BLUEPRINTS, DateParserFormatter, DocumentDirHandlerService, EllipsisDirective, EllipsisModule, ErrorHandler, HTTP_ERROR_CONFIG, HTTP_ERROR_HANDLER, HttpErrorWrapperComponent, LoaderBarComponent, LoadingComponent, LoadingDirective, ModalCloseDirective, ModalComponent, ModalRefService, NGX_DATATABLE_MESSAGES, NG_BOOTSTRAP_CONFIG_PROVIDERS, NavItem, NavItemsService, NgxDatatableDefaultDirective, NgxDatatableListDirective, PageAlertService, SUPPRESS_UNSAVED_CHANGES_WARNING, THEME_SHARED_APPEND_CONTENT, THEME_SHARED_ROUTE_PROVIDERS, ThemeSharedModule, ToastComponent, ToastContainerComponent, ToasterService, UserMenu, UserMenuService, bounceIn, collapse, collapseLinearWithMargin, collapseWithMargin, collapseX, collapseY, collapseYWithMargin, configureNgBootstrap, configureRoutes, defaultNgxDatatableMessages, dialogAnimation, expandX, expandY, expandYWithMargin, fadeAnimation, fadeIn, fadeInDown, fadeInLeft, fadeInRight, fadeInUp, fadeOut, fadeOutDown, fadeOutLeft, fadeOutRight, fadeOutUp, getPasswordValidators, httpErrorConfigFactory, slideFromBottom, toastInOut };
+export { BaseThemeSharedModule, BreadcrumbComponent, BreadcrumbItemsComponent, ButtonComponent, Confirmation, ConfirmationComponent, ConfirmationService, DEFAULT_ERROR_LOCALIZATIONS, DEFAULT_ERROR_MESSAGES, DEFAULT_VALIDATION_BLUEPRINTS, DateParserFormatter, DocumentDirHandlerService, EllipsisDirective, EllipsisModule, ErrorHandler, HTTP_ERROR_CONFIG, HTTP_ERROR_HANDLER, HttpErrorWrapperComponent, LoaderBarComponent, LoadingComponent, LoadingDirective, ModalCloseDirective, ModalComponent, ModalRefService, NGX_DATATABLE_MESSAGES, NG_BOOTSTRAP_CONFIG_PROVIDERS, NavItem, NavItemsService, NgxDatatableDefaultDirective, NgxDatatableListDirective, PageAlertService, SUPPRESS_UNSAVED_CHANGES_WARNING, THEME_SHARED_APPEND_CONTENT, THEME_SHARED_ROUTE_PROVIDERS, ThemeSharedModule, ToastComponent, ToastContainerComponent, ToasterService, UserMenu, UserMenuService, bounceIn, collapse, collapseLinearWithMargin, collapseWithMargin, collapseX, collapseY, collapseYWithMargin, configureNgBootstrap, configureRoutes, defaultNgxDatatableMessages, dialogAnimation, expandX, expandY, expandYWithMargin, fadeAnimation, fadeIn, fadeInDown, fadeInLeft, fadeInRight, fadeInUp, fadeOut, fadeOutDown, fadeOutLeft, fadeOutRight, fadeOutUp, getPasswordValidators, httpErrorConfigFactory, slideFromBottom, toastInOut, validatePassword };
 //# sourceMappingURL=abp-ng.theme.shared.mjs.map