From 9b471e663336af838f65eb2486dfbcbf922cb940 Mon Sep 17 00:00:00 2001
From: Cesar Gonzalez <cesar.a.gonzalezcs@gmail.com>
Date: Thu, 24 Oct 2024 08:22:43 -0500
Subject: [PATCH] [PM-13715] Launching a website from the extension does not
 trigger an update to reference the correct autofill value (#11587)

* [PM-13715] Launching page from cipher does not set correct autofill action

* [PM-13715] Fix autofill not triggering for correct cipher after page has been launched from browser extension
---
 .../popup/components/vault/view.component.html      |  2 +-
 libs/angular/src/vault/components/view.component.ts |  6 ++----
 libs/common/src/vault/services/cipher.service.ts    | 13 +++++--------
 .../autofill-options-view.component.ts              | 10 ++++++++--
 .../src/cipher-view/cipher-view.component.html      |  6 +++++-
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/apps/browser/src/vault/popup/components/vault/view.component.html b/apps/browser/src/vault/popup/components/vault/view.component.html
index ff76c68464..73415c9070 100644
--- a/apps/browser/src/vault/popup/components/vault/view.component.html
+++ b/apps/browser/src/vault/popup/components/vault/view.component.html
@@ -472,7 +472,7 @@
             attr.aria-label="{{ 'launch' | i18n }} {{ u.uri }}"
             appA11yTitle="{{ 'launch' | i18n }}"
             *ngIf="u.canLaunch"
-            (click)="launch(u)"
+            (click)="launch(u, cipher.id)"
           >
             <i class="bwi bwi-lg bwi-share-square" aria-hidden="true"></i>
           </button>
diff --git a/libs/angular/src/vault/components/view.component.ts b/libs/angular/src/vault/components/view.component.ts
index 4c96c10dac..2ff34ebafa 100644
--- a/libs/angular/src/vault/components/view.component.ts
+++ b/libs/angular/src/vault/components/view.component.ts
@@ -348,15 +348,13 @@ export class ViewComponent implements OnDestroy, OnInit {
     }
   }
 
-  launch(uri: Launchable, cipherId?: string) {
+  async launch(uri: Launchable, cipherId?: string) {
     if (!uri.canLaunch) {
       return;
     }
 
     if (cipherId) {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.cipherService.updateLastLaunchedDate(cipherId);
+      await this.cipherService.updateLastLaunchedDate(cipherId);
     }
 
     this.platformUtilsService.launchUri(uri.launchUri);
diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts
index a7377a93ee..207a5da3cb 100644
--- a/libs/common/src/vault/services/cipher.service.ts
+++ b/libs/common/src/vault/services/cipher.service.ts
@@ -650,14 +650,11 @@ export class CipherService implements CipherServiceAbstraction {
       ciphersLocalData = {};
     }
 
-    const cipherId = id as CipherId;
-    if (ciphersLocalData[cipherId]) {
-      ciphersLocalData[cipherId].lastLaunched = new Date().getTime();
-    } else {
-      ciphersLocalData[cipherId] = {
-        lastUsedDate: new Date().getTime(),
-      };
-    }
+    const currentTime = new Date().getTime();
+    ciphersLocalData[id as CipherId] = {
+      lastLaunched: currentTime,
+      lastUsedDate: currentTime,
+    };
 
     await this.localDataState.update(() => ciphersLocalData);
 
diff --git a/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.ts b/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.ts
index b7708b5aa9..2c3739dba4 100644
--- a/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.ts
+++ b/libs/vault/src/cipher-view/autofill-options/autofill-options-view.component.ts
@@ -3,6 +3,7 @@ import { Component, Input } from "@angular/core";
 
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
+import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
 import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view";
 import {
   CardComponent,
@@ -30,10 +31,15 @@ import {
 })
 export class AutofillOptionsViewComponent {
   @Input() loginUris: LoginUriView[];
+  @Input() cipherId: string;
 
-  constructor(private platformUtilsService: PlatformUtilsService) {}
+  constructor(
+    private platformUtilsService: PlatformUtilsService,
+    private cipherService: CipherService,
+  ) {}
 
-  openWebsite(selectedUri: string) {
+  async openWebsite(selectedUri: string) {
+    await this.cipherService.updateLastLaunchedDate(this.cipherId);
     this.platformUtilsService.launchUri(selectedUri);
   }
 }
diff --git a/libs/vault/src/cipher-view/cipher-view.component.html b/libs/vault/src/cipher-view/cipher-view.component.html
index b693c44815..2dd98092cb 100644
--- a/libs/vault/src/cipher-view/cipher-view.component.html
+++ b/libs/vault/src/cipher-view/cipher-view.component.html
@@ -25,7 +25,11 @@
   <app-login-credentials-view *ngIf="hasLogin" [cipher]="cipher"></app-login-credentials-view>
 
   <!-- AUTOFILL OPTIONS -->
-  <app-autofill-options-view *ngIf="hasAutofill" [loginUris]="cipher.login.uris">
+  <app-autofill-options-view
+    *ngIf="hasAutofill"
+    [loginUris]="cipher.login.uris"
+    [cipherId]="cipher.id"
+  >
   </app-autofill-options-view>
 
   <!-- CARD DETAILS -->