Merge remote-tracking branch 'origin/develop' into release-2211.32.0-1

SAP · Nov 29, 2024 · 5335110 · 5335110
2 parents d4c916f + 6e16fc3
commit 5335110
Show file tree

Hide file tree

Showing 22 changed files with 253 additions and 91 deletions.
diff --git a/.../order-confirmation/order-guest-register-form/order-guest-register-form.component.spec.ts b/.../order-confirmation/order-guest-register-form/order-guest-register-form.component.spec.ts
@@ -104,7 +104,8 @@ describe('OrderGuestRegisterFormComponent', () => {
         cxMinOneDigit: true,
         cxMinOneUpperCaseCharacter: true,
         cxMinOneSpecialCharacter: true,
-        cxMinSixCharactersLength: true,
+        cxMinEightCharactersLength: true,
+        cxMaxCharactersLength: true,
       });
     });
 

diff --git a/...nents/order-confirmation/order-guest-register-form/order-guest-register-form.component.ts b/...nents/order-confirmation/order-guest-register-form/order-guest-register-form.component.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Component, Input, OnDestroy, inject } from '@angular/core';
+import { Component, inject, Input, OnDestroy } from '@angular/core';
 import {
   UntypedFormBuilder,
   UntypedFormGroup,
@@ -31,20 +31,24 @@ export class OrderGuestRegisterFormComponent implements OnDestroy {
   protected passwordValidators = this.featureConfigService?.isEnabled(
     'formErrorsDescriptiveMessages'
   )
-    ? this.featureConfigService.isEnabled(
-        'enableConsecutiveCharactersPasswordRequirement'
-      )
-      ? [
-          ...CustomFormValidators.passwordValidators,
-          CustomFormValidators.noConsecutiveCharacters,
-        ]
-      : CustomFormValidators.passwordValidators
+    ? this.featureConfigService.isEnabled('enableSecurePasswordValidation')
+      ? CustomFormValidators.securePasswordValidators
+      : this.featureConfigService.isEnabled(
+            'enableConsecutiveCharactersPasswordRequirement'
+          )
+        ? [
+            ...CustomFormValidators.passwordValidators,
+            CustomFormValidators.noConsecutiveCharacters,
+          ]
+        : CustomFormValidators.passwordValidators
     : [
-        this.featureConfigService.isEnabled(
-          'enableConsecutiveCharactersPasswordRequirement'
-        )
-          ? CustomFormValidators.strongPasswordValidator
-          : CustomFormValidators.passwordValidator,
+        this.featureConfigService.isEnabled('enableSecurePasswordValidation')
+          ? CustomFormValidators.securePasswordValidator
+          : this.featureConfigService.isEnabled(
+                'enableConsecutiveCharactersPasswordRequirement'
+              )
+            ? CustomFormValidators.strongPasswordValidator
+            : CustomFormValidators.passwordValidator,
       ];
 
   @Input() guid: string;

diff --git a/feature-libs/user/karma.conf.js b/feature-libs/user/karma.conf.js
@@ -32,7 +32,8 @@ module.exports = function (config) {
         global: {
           statements: 90,
           lines: 90,
-          branches: 75,
+          //TODO CXSPA-8984 change branches to 75 after fix
+          branches: 70,
           functions: 80,
         },
       },

diff --git a/feature-libs/user/profile/components/register/register.component.spec.ts b/feature-libs/user/profile/components/register/register.component.spec.ts
@@ -468,9 +468,10 @@ describe('RegisterComponent', () => {
       expect(validators).toEqual({
         required: true,
         cxMinOneDigit: true,
-        cxMinOneUpperCaseCharacter: true,
         cxMinOneSpecialCharacter: true,
-        cxMinSixCharactersLength: true,
+        cxMinOneUpperCaseCharacter: true,
+        cxMinEightCharactersLength: true,
+        cxMaxCharactersLength: true,
       });
     });
 

diff --git a/feature-libs/user/profile/components/register/register.component.ts b/feature-libs/user/profile/components/register/register.component.ts
@@ -44,20 +44,24 @@ export class RegisterComponent implements OnInit, OnDestroy {
   protected passwordValidators = this.featureConfigService?.isEnabled(
     'formErrorsDescriptiveMessages'
   )
-    ? this.featureConfigService.isEnabled(
-        'enableConsecutiveCharactersPasswordRequirement'
-      )
-      ? [
-          ...CustomFormValidators.passwordValidators,
-          CustomFormValidators.noConsecutiveCharacters,
-        ]
-      : CustomFormValidators.passwordValidators
+    ? this.featureConfigService.isEnabled('enableSecurePasswordValidation')
+      ? CustomFormValidators.securePasswordValidators
+      : this.featureConfigService.isEnabled(
+            'enableConsecutiveCharactersPasswordRequirement'
+          )
+        ? [
+            ...CustomFormValidators.passwordValidators,
+            CustomFormValidators.noConsecutiveCharacters,
+          ]
+        : CustomFormValidators.passwordValidators
     : [
-        this.featureConfigService.isEnabled(
-          'enableConsecutiveCharactersPasswordRequirement'
-        )
-          ? CustomFormValidators.strongPasswordValidator
-          : CustomFormValidators.passwordValidator,
+        this.featureConfigService.isEnabled('enableSecurePasswordValidation')
+          ? CustomFormValidators.securePasswordValidator
+          : this.featureConfigService.isEnabled(
+                'enableConsecutiveCharactersPasswordRequirement'
+              )
+            ? CustomFormValidators.strongPasswordValidator
+            : CustomFormValidators.passwordValidator,
       ];
 
   titles$: Observable<Title[]>;

diff --git a/feature-libs/user/profile/components/reset-password/reset-password-component.service.spec.ts b/feature-libs/user/profile/components/reset-password/reset-password-component.service.spec.ts
@@ -141,16 +141,16 @@ describe('ResetPasswordComponentService', () => {
   describe('reset', () => {
     describe('success', () => {
       beforeEach(() => {
-        password.setValue('Qwe123!');
-        passwordConfirm.setValue('Qwe123!');
+        password.setValue('QwePas123!');
+        passwordConfirm.setValue('QwePas123!');
       });
 
       it('should reset password', () => {
         spyOn(userPasswordService, 'reset').and.callThrough();
         service.resetPassword(resetToken);
         expect(userPasswordService.reset).toHaveBeenCalledWith(
           resetToken,
-          'Qwe123!'
+          'QwePas123!'
         );
       });
 
@@ -177,8 +177,8 @@ describe('ResetPasswordComponentService', () => {
     describe('error', () => {
       describe('valid form', () => {
         beforeEach(() => {
-          password.setValue('Qwe123!');
-          passwordConfirm.setValue('Qwe123!');
+          password.setValue('QwePas123!');
+          passwordConfirm.setValue('QwePas123!');
         });
 
         it('should show error message', () => {
@@ -239,7 +239,8 @@ describe('ResetPasswordComponentService', () => {
         cxMinOneDigit: true,
         cxMinOneUpperCaseCharacter: true,
         cxMinOneSpecialCharacter: true,
-        cxMinSixCharactersLength: true,
+        cxMinEightCharactersLength: true,
+        cxMaxCharactersLength: true,
       });
     });
   });

diff --git a/feature-libs/user/profile/components/reset-password/reset-password-component.service.ts b/feature-libs/user/profile/components/reset-password/reset-password-component.service.ts
@@ -32,20 +32,24 @@ export class ResetPasswordComponentService {
   protected passwordValidators = this.featureConfigService?.isEnabled(
     'formErrorsDescriptiveMessages'
   )
-    ? this.featureConfigService.isEnabled(
-        'enableConsecutiveCharactersPasswordRequirement'
-      )
-      ? [
-          ...CustomFormValidators.passwordValidators,
-          CustomFormValidators.noConsecutiveCharacters,
-        ]
-      : CustomFormValidators.passwordValidators
+    ? this.featureConfigService.isEnabled('enableSecurePasswordValidation')
+      ? CustomFormValidators.securePasswordValidators
+      : this.featureConfigService.isEnabled(
+            'enableConsecutiveCharactersPasswordRequirement'
+          )
+        ? [
+            ...CustomFormValidators.passwordValidators,
+            CustomFormValidators.noConsecutiveCharacters,
+          ]
+        : CustomFormValidators.passwordValidators
     : [
-        this.featureConfigService.isEnabled(
-          'enableConsecutiveCharactersPasswordRequirement'
-        )
-          ? CustomFormValidators.strongPasswordValidator
-          : CustomFormValidators.passwordValidator,
+        this.featureConfigService.isEnabled('enableSecurePasswordValidation')
+          ? CustomFormValidators.securePasswordValidator
+          : this.featureConfigService.isEnabled(
+                'enableConsecutiveCharactersPasswordRequirement'
+              )
+            ? CustomFormValidators.strongPasswordValidator
+            : CustomFormValidators.passwordValidator,
       ];
 
   constructor(

diff --git a/...re-libs/user/profile/components/update-password/update-password-component.service.spec.ts b/...re-libs/user/profile/components/update-password/update-password-component.service.spec.ts
@@ -124,16 +124,16 @@ describe('UpdatePasswordComponentService', () => {
   describe('updatePassword', () => {
     describe('success', () => {
       beforeEach(() => {
-        oldPassword.setValue('Old123!');
-        newPassword.setValue('New123!');
-        newPasswordConfirm.setValue('New123!');
+        oldPassword.setValue('OldPas123!');
+        newPassword.setValue('NewPas123!');
+        newPasswordConfirm.setValue('NewPas123!');
       });
 
       it('should update password', () => {
         service.updatePassword();
         expect(userPasswordFacade.update).toHaveBeenCalledWith(
-          'Old123!',
-          'New123!'
+          'OldPas123!',
+          'NewPas123!'
         );
       });
 
@@ -201,7 +201,8 @@ describe('UpdatePasswordComponentService', () => {
           cxMinOneDigit: true,
           cxMinOneUpperCaseCharacter: true,
           cxMinOneSpecialCharacter: true,
-          cxMinSixCharactersLength: true,
+          cxMinEightCharactersLength: true,
+          cxMaxCharactersLength: true,
         });
       });
     });

diff --git a/feature-libs/user/profile/components/update-password/update-password-component.service.ts b/feature-libs/user/profile/components/update-password/update-password-component.service.ts
@@ -35,20 +35,24 @@ export class UpdatePasswordComponentService {
   protected passwordValidators = this.featureConfigService?.isEnabled(
     'formErrorsDescriptiveMessages'
   )
-    ? this.featureConfigService.isEnabled(
-        'enableConsecutiveCharactersPasswordRequirement'
-      )
-      ? [
-          ...CustomFormValidators.passwordValidators,
-          CustomFormValidators.noConsecutiveCharacters,
-        ]
-      : CustomFormValidators.passwordValidators
+    ? this.featureConfigService.isEnabled('enableSecurePasswordValidation')
+      ? CustomFormValidators.securePasswordValidators
+      : this.featureConfigService.isEnabled(
+            'enableConsecutiveCharactersPasswordRequirement'
+          )
+        ? [
+            ...CustomFormValidators.passwordValidators,
+            CustomFormValidators.noConsecutiveCharacters,
+          ]
+        : CustomFormValidators.passwordValidators
     : [
-        this.featureConfigService.isEnabled(
-          'enableConsecutiveCharactersPasswordRequirement'
-        )
-          ? CustomFormValidators.strongPasswordValidator
-          : CustomFormValidators.passwordValidator,
+        this.featureConfigService.isEnabled('enableSecurePasswordValidation')
+          ? CustomFormValidators.securePasswordValidator
+          : this.featureConfigService.isEnabled(
+                'enableConsecutiveCharactersPasswordRequirement'
+              )
+            ? CustomFormValidators.strongPasswordValidator
+            : CustomFormValidators.passwordValidator,
       ];
 
   constructor(

diff --git a/integration-libs/opf/base/root/services/opf-resource-loader.service.spec.ts b/integration-libs/opf/base/root/services/opf-resource-loader.service.spec.ts
@@ -161,7 +161,10 @@ describe('OpfResourceLoaderService', () => {
         }
       );
 
-      opfResourceLoaderService.loadResources([mockScriptResource]);
+      opfResourceLoaderService
+        .loadResources([mockScriptResource])
+        .then(() => {})
+        .catch(() => {});
 
       expect(opfResourceLoaderService['loadStyles']).not.toHaveBeenCalled();
       expect(opfResourceLoaderService['loadScript']).toHaveBeenCalled();
@@ -207,7 +210,10 @@ describe('OpfResourceLoaderService', () => {
         }
       );
 
-      opfResourceLoaderService.loadResources([], [mockStylesResources]);
+      opfResourceLoaderService
+        .loadResources([], [mockStylesResources])
+        .then(() => {})
+        .catch(() => {});
 
       expect(opfResourceLoaderService['loadScript']).not.toHaveBeenCalled();
 

diff --git a/integration-libs/opf/base/root/services/opf-resource-loader.service.ts b/integration-libs/opf/base/root/services/opf-resource-loader.service.ts
@@ -185,8 +185,6 @@ export class OpfResourceLoaderService {
       }
     );
 
-    return Promise.all(resourcesPromises)
-      .then(() => {})
-      .catch(() => {});
+    return Promise.all(resourcesPromises).then(() => {});
   }
 }
diff --git a/.../checkout/components/opf-checkout-payment-wrapper/opf-checkout-payment-wrapper.service.ts b/.../checkout/components/opf-checkout-payment-wrapper/opf-checkout-payment-wrapper.service.ts
@@ -180,6 +180,9 @@ export class OpfCheckoutPaymentWrapperService {
           if (html) {
             this.executeScriptFromHtml(html);
           }
+        })
+        .catch(() => {
+          this.handleGeneralPaymentError().pipe(take(1)).subscribe();
         });
       return;
     }

diff --git a/projects/assets/src/translations/en/common.json b/projects/assets/src/translations/en/common.json
@@ -181,6 +181,8 @@
       "cxMinOneDigit": "Password must contain at least one digit",
       "cxMinOneSpecialCharacter": "Password must contain at least one special character",
       "cxMinSixCharactersLength": "Password must contain at least 6 characters",
+      "cxMinEightCharactersLength": "Password must contain at least 8 characters",
+      "cxMaxCharactersLength": "Password cannot have more than 128 characters",
       "cxContainsSpecialCharacters": "Password cannot contain special characters",
       "cxNoConsecutiveCharacters": "Password cannot contain consecutive identical characters",
       "date": {

diff --git a/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts b/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts
@@ -834,6 +834,8 @@ export interface FeatureTogglesInterface {
    * Moves components to be children of this section element.
    */
   a11yWrapReviewOrderInSection?: boolean;
+
+  enableSecurePasswordValidation?: boolean;
 }
 
 export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
@@ -963,4 +965,5 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   sciEnabled: false,
   useExtendedMediaComponentConfiguration: false,
   showRealTimeStockInPDP: false,
+  enableSecurePasswordValidation: false,
 };
diff --git a/projects/core/src/util/regex-pattern.ts b/projects/core/src/util/regex-pattern.ts
@@ -20,7 +20,14 @@ export const MIN_ONE_SPECIAL_CHARACTER_PATTERN =
 
 export const MIN_SIX_CHARACTERS_PATTERN = /^.{6,}$/;
 
+export const MIN_EIGHT_CHARACTERS_PATTERN = /^.{8,}$/;
+
+export const MAX_CHARACTERS_PATTERN = /^.{0,128}$/;
+
 export const CONSECUTIVE_CHARACTERS = /(.)\1+/;
 
 export const STRONG_PASSWORD_PATTERN =
   /^(?!.*(.)\1)(?=.*?[A-Z])(?=.*?\d)(?=.*?[!@#$%^*()_\-+{};:.,]).{6,}$/;
+
+export const SECURE_PASSWORD_PATTERN =
+  /^(?!.*(.)\1)(?=.*?[A-Z])(?=.*?\d)(?=.*?[!@#$%^*()_\-+{};:.,]).{8,128}$/;
diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts
@@ -415,6 +415,7 @@ if (environment.cpq) {
         useExtendedMediaComponentConfiguration: true,
         showRealTimeStockInPDP: false,
         a11yWrapReviewOrderInSection: true,
+        enableSecurePasswordValidation: true,
       };
       return appFeatureToggles;
     }),

diff --git a/...lib/cms-components/product/product-list/product-facet-navigation/facet/facet.component.ts b/...lib/cms-components/product/product-list/product-facet-navigation/facet/facet.component.ts
@@ -21,7 +21,10 @@ import {
 import { Facet, FacetValue, FeatureConfigService } from '@spartacus/core';
 import { Observable } from 'rxjs';
 import { ICON_TYPE } from '../../../../../cms-components/misc/icon/icon.model';
-import { FocusDirective } from '../../../../../layout/a11y/keyboard-focus/focus.directive';
+import {
+  FocusDirective,
+  disableTabbingForTick,
+} from '../../../../../layout/a11y';
 import { FacetCollapseState } from '../facet.model';
 import { FacetService } from '../services/facet.service';
 
@@ -153,7 +156,21 @@ export class FacetComponent implements AfterViewInit {
       case 'ArrowUp':
         this.onArrowUp(event, targetIndex);
         break;
+      case 'Tab':
+        this.onTabNavigation();
+        break;
+    }
+  }
+
+  /**
+   * If a11yTabComponent is enabled, we temporarily disable tabbing for the facet values.
+   * This is to use proper keyboard navigation keys(ArrowUp/ArrowDown) for navigating through the facet values.
+   */
+  protected onTabNavigation(): void {
+    if (!this.featureConfigService?.isEnabled('a11yTabComponent')) {
+      return;
     }
+    disableTabbingForTick(this.values.map((el) => el.nativeElement));
   }
 
   /**

diff --git a/projects/storefrontlib/layout/a11y/keyboard-focus/index.ts b/projects/storefrontlib/layout/a11y/keyboard-focus/index.ts
@@ -11,6 +11,7 @@ export { FocusConfig, TrapFocus, TrapFocusType } from './keyboard-focus.model';
 export * from './keyboard-focus.module';
 export * from './focus-testing.module';
 export * from './services/index';
+export * from './keyboard-focus.utils';
 
 // export * from './autofocus/index';
 // export * from './base/index';