Merge branch 'dev' into feat/WPB-3072-group-messages-in-the-chat-by-u…

…ser-and-timestamp

src/script/E2EIdentity/DelayTimer/DelayTimer.test.ts

@@ -18,7 +18,7 @@
  */
 
 import {FIFTEEN_MINUTES, FOUR_HOURS, ONE_HOUR, ONE_MINUTE} from './delay';
-import {DelayTimerService} from './DelayTimer'; // Update this with your module's actual path
+import {DelayTimerService} from './DelayTimer';
 
 describe('createGracePeriodTimer', () => {
   let timer: DelayTimerService | undefined;
@@ -27,16 +27,14 @@ describe('createGracePeriodTimer', () => {
     jest.clearAllMocks();
     jest.useFakeTimers();
     global.localStorage.clear();
-    timer = DelayTimerService?.getInstance({
+    timer = new DelayTimerService({
       gracePeriodInMS: 0,
       gracePeriodExpiredCallback: jest.fn(),
       delayPeriodExpiredCallback: jest.fn(),
     });
   });
 
   afterEach(() => {
-    timer?.resetInstance();
-    timer = undefined;
     jest.useRealTimers();
   });
 

src/script/E2EIdentity/DelayTimer/DelayTimer.ts

@@ -32,42 +32,21 @@ interface CreateGracePeriodTimerParams {
   delayPeriodExpiredCallback: () => void;
 }
 
-class DelayTimerService {
-  private static instance: DelayTimerService | null = null;
+export class DelayTimerService {
   private gracePeriodInMS: number;
   private gracePeriodExpiredCallback: () => void;
   private delayPeriodExpiredCallback: () => void;
   private readonly logger = logdown('@wireapp/core/DelayTimer');
   private delayPeriodTimerKey: string = 'E2EIdentity_DelayTimer';
   private gracePeriodTimerKey: string = 'E2EIdentity_GracePeriodTimer';
 
-  private constructor({
-    gracePeriodInMS,
-    gracePeriodExpiredCallback,
-    delayPeriodExpiredCallback,
-  }: CreateGracePeriodTimerParams) {
+  constructor({gracePeriodInMS, gracePeriodExpiredCallback, delayPeriodExpiredCallback}: CreateGracePeriodTimerParams) {
     this.gracePeriodInMS = gracePeriodInMS;
     this.gracePeriodExpiredCallback = gracePeriodExpiredCallback;
     this.delayPeriodExpiredCallback = delayPeriodExpiredCallback;
     this.initialize();
   }
 
-  /**
-   * Get the singleton instance of GracePeriodTimer or create a new one
-   * For the first time, params are required to create the instance
-   * @param params The params to create the grace period timer
-   * @returns The singleton instance of GracePeriodTimer
-   */
-  public static getInstance(params?: CreateGracePeriodTimerParams) {
-    if (!DelayTimerService.instance) {
-      if (!params) {
-        throw new Error('DelayTimerService is not initialized. Please call getInstance with params.');
-      }
-      DelayTimerService.instance = new DelayTimerService(params);
-    }
-    return DelayTimerService.instance;
-  }
-
   /**
    * @param CreateGracePeriodTimerParams The params to create the grace period timer
    */
@@ -263,16 +242,6 @@ class DelayTimerService {
       : 0;
   }
 
-  /**
-   * Reset the instance
-   */
-  public resetInstance() {
-    DelayTimerStore.clear.all();
-    this.clearGracePeriodTimer();
-    this.clearDelayPeriodTimer();
-    DelayTimerService.instance = null;
-  }
-
   public isDelayTimerActive() {
     return TaskScheduler.hasActiveTask(this.delayPeriodTimerKey);
   }
@@ -283,5 +252,3 @@ class DelayTimerService {
     return remainingTime - delayTime > 0;
   }
 }
-
-export {DelayTimerService};

src/script/E2EIdentity/DelayTimer/delay.ts

@@ -18,7 +18,7 @@
  */
 
 import {EnrollmentConfig} from '../E2EIdentityEnrollment';
-import {MLSStatuses, WireIdentity} from '../E2EIdentityVerification';
+import {MLSStatuses, WireIdentity, isFreshMLSSelfClient} from '../E2EIdentityVerification';
 
 /* eslint-disable no-magic-numbers */
 
@@ -54,8 +54,14 @@ export function getDelayTime(gracePeriodInMs: number): number {
   return 0;
 }
 
-export function shouldEnableSoftLock(enrollmentConfig: EnrollmentConfig, identity?: WireIdentity): boolean {
-  if (!enrollmentConfig.timer.isSnoozeTimeAvailable() || enrollmentConfig.isFreshMLSSelfClient) {
+export async function shouldEnableSoftLock(
+  enrollmentConfig: EnrollmentConfig,
+  identity?: WireIdentity,
+): Promise<boolean> {
+  if (await isFreshMLSSelfClient()) {
+    return true;
+  }
+  if (!enrollmentConfig.timer.isSnoozeTimeAvailable()) {
     // The user has used up the entire grace period or has a fresh new client, he now needs to enroll
     return true;
   }

src/script/E2EIdentity/E2EIdentityEnrollment.test.ts

@@ -68,6 +68,7 @@ jest.mock('./E2EIdentityVerification', () => ({
   hasActiveCertificate: jest.fn().mockResolvedValue(false),
   getActiveWireIdentity: jest.fn().mockResolvedValue({certificate: 'certificate data'}),
   isE2EIEnabled: jest.fn().mockReturnValue(true),
+  isFreshMLSSelfClient: jest.fn().mockResolvedValue(false),
 }));
 
 // These values should lead to renewalPromptTime being less than the mocked current time
@@ -135,8 +136,8 @@ describe('E2EIHandler', () => {
     jest.spyOn(container.resolve(Core), 'enrollE2EI').mockResolvedValueOnce(true);
 
     const instance = await E2EIHandler.getInstance().initialize(params);
-    await instance['enroll']();
-
+    void instance['enroll']();
+    await wait(1);
     expect(instance['currentStep']).toBe(E2EIHandlerStep.SUCCESS);
   });
 
@@ -146,7 +147,8 @@ describe('E2EIHandler', () => {
     jest.spyOn(container.resolve(UserState), 'self').mockImplementationOnce(() => user);
 
     const instance = await E2EIHandler.getInstance().initialize(params);
-    await instance['enroll']();
+    void instance['enroll']();
+    await wait(1);
     expect(instance['currentStep']).toBe(E2EIHandlerStep.ERROR);
   });
 
@@ -169,7 +171,8 @@ describe('E2EIHandler', () => {
 
   it('should display loading message when enroled', async () => {
     const handler = await E2EIHandler.getInstance().initialize(params);
-    await handler['enroll']();
+    void handler['enroll']();
+    await wait(1);
     expect(getModalOptions).toHaveBeenCalledWith(
       expect.objectContaining({
         type: ModalType.LOADING,
@@ -182,7 +185,8 @@ describe('E2EIHandler', () => {
 
     const handler = await E2EIHandler.getInstance().initialize(params);
     handler['showLoadingMessage'] = jest.fn();
-    await handler['enroll']();
+    void handler['enroll']();
+    await wait(1);
     expect(getModalOptions).toHaveBeenCalledWith(
       expect.objectContaining({
         type: ModalType.SUCCESS,
@@ -195,7 +199,8 @@ describe('E2EIHandler', () => {
 
     const handler = await E2EIHandler.getInstance().initialize(params);
     handler['showLoadingMessage'] = jest.fn();
-    await handler['enroll']();
+    void handler['enroll']();
+    await wait(1);
     expect(getModalOptions).toHaveBeenCalledWith(
       expect.objectContaining({
         type: ModalType.ERROR,