From 92a77cf9571300e5103f95681a2340caec9d7b48 Mon Sep 17 00:00:00 2001 From: Cesar Gonzalez Date: Tue, 23 Apr 2024 13:01:49 -0500 Subject: [PATCH] [PM-6426] Adjusting name for generate password to clipboard command task name --- .../generate-password-to-clipboard-command.spec.ts | 3 +-- .../generate-password-to-clipboard-command.ts | 14 +++++++------- .../src/platform/enums/scheduled-task-name.enum.ts | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts index 0dcf0fffd5..b64f5da561 100644 --- a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts +++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts @@ -62,9 +62,8 @@ describe("GeneratePasswordToClipboardCommand", () => { }); expect(browserTaskSchedulerService.setTimeout).toHaveBeenCalledTimes(1); expect(browserTaskSchedulerService.setTimeout).toHaveBeenCalledWith( - expect.any(Function), + ScheduledTaskNames.generatePasswordClearClipboardTimeout, expect.any(Number), - ScheduledTaskNames.clearClipboardTimeout, ); expect(ClearClipboard.run).toHaveBeenCalledTimes(1); }); diff --git a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts index bd70aebb9d..f56852c97e 100644 --- a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts +++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts @@ -15,10 +15,10 @@ export class GeneratePasswordToClipboardCommand { constructor( private passwordGenerationService: PasswordGenerationServiceAbstraction, private autofillSettingsService: AutofillSettingsServiceAbstraction, - private taskSchedulerService: BrowserTaskSchedulerService, + private taskSchedulerService?: BrowserTaskSchedulerService, ) { - void this.taskSchedulerService.registerTaskHandler( - ScheduledTaskNames.clearClipboardTimeout, + void this.taskSchedulerService?.registerTaskHandler( + ScheduledTaskNames.generatePasswordClearClipboardTimeout, () => ClearClipboard.run(), ); } @@ -39,12 +39,12 @@ export class GeneratePasswordToClipboardCommand { } const timeoutInMs = clearClipboardDelayInSeconds * 1000; - await this.taskSchedulerService.clearScheduledTask({ - taskName: ScheduledTaskNames.clearClipboardTimeout, + await this.taskSchedulerService?.clearScheduledTask({ + taskName: ScheduledTaskNames.generatePasswordClearClipboardTimeout, timeoutId: this.clearClipboardTimeout, }); - await this.taskSchedulerService.setTimeout( - ScheduledTaskNames.clearClipboardTimeout, + await this.taskSchedulerService?.setTimeout( + ScheduledTaskNames.generatePasswordClearClipboardTimeout, timeoutInMs, ); } diff --git a/libs/common/src/platform/enums/scheduled-task-name.enum.ts b/libs/common/src/platform/enums/scheduled-task-name.enum.ts index b4d89ae427..e3da776515 100644 --- a/libs/common/src/platform/enums/scheduled-task-name.enum.ts +++ b/libs/common/src/platform/enums/scheduled-task-name.enum.ts @@ -1,5 +1,5 @@ export const ScheduledTaskNames = { - clearClipboardTimeout: "clearClipboardTimeout", + generatePasswordClearClipboardTimeout: "generatePasswordClearClipboardTimeout", systemClearClipboardTimeout: "systemClearClipboardTimeout", loginStrategySessionTimeout: "loginStrategySessionTimeout", notificationsReconnectTimeout: "notificationsReconnectTimeout",