bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 08:43:33 +00:00
Code Issues Releases Wiki Activity

format fingerprint in template

Browse Source
This commit is contained in:
William Martin
2023-09-01 12:30:30 -04:00
parent 5c99e278b6
commit 8e33e0baf7
6 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/browser/src/background/nativeMessaging.background.ts
View File

@@ -422,9 +422,10 @@ export class NativeMessagingBackground {
} }
private async showFingerprintDialog() { private async showFingerprintDialog() {
const fingerprint = ( const fingerprint = await this.cryptoService.getFingerprint(
await this.cryptoService.getFingerprint(await this.stateService.getUserId(), this.publicKey) await this.stateService.getUserId(),
).join(" "); this.publicKey
);
this.messagingService.send("showNativeMessagingFinterprintDialog", { this.messagingService.send("showNativeMessagingFinterprintDialog", {
fingerprint: fingerprint, fingerprint: fingerprint,

2
apps/browser/src/popup/components/desktop-sync-verification-dialog.component.html
View File

@@ -5,7 +5,7 @@
<span bitDialogContent> <span bitDialogContent>
{{ "desktopIntegrationVerificationText" | i18n }} {{ "desktopIntegrationVerificationText" | i18n }}
<br /><br /> <br /><br />
<strong>{{ params.fingerprint }}</strong> <strong>{{ params.fingerprint.join("-") }}</strong>
</span> </span>
<ng-container bitDialogFooter> <ng-container bitDialogFooter>
<button bitButton type="submit" buttonType="danger" bitDialogClose> <button bitButton type="submit" buttonType="danger" bitDialogClose>

2
apps/browser/src/popup/components/desktop-sync-verification-dialog.component.ts
View File

@@ -5,7 +5,7 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
import { ButtonModule, DialogModule, DialogService } from "@bitwarden/components"; import { ButtonModule, DialogModule, DialogService } from "@bitwarden/components";
export type DesktopSyncVerificationDialogParams = { export type DesktopSyncVerificationDialogParams = {
fingerprint: string; fingerprint: string[];
}; };
@Component({ @Component({

2
apps/desktop/src/app/components/browser-sync-verification-dialog.component.html
View File

@@ -5,7 +5,7 @@
<span bitDialogContent> <span bitDialogContent>
<p>{{ "verifyBrowserDesc" | i18n }}</p> <p>{{ "verifyBrowserDesc" | i18n }}</p>
<p> <p>
<strong>{{ params.fingerprint }}</strong> <strong>{{ params.fingerprint.join("-") }}</strong>
</p> </p>
</span> </span>
<ng-container bitDialogFooter> <ng-container bitDialogFooter>

2
apps/desktop/src/app/components/browser-sync-verification-dialog.component.ts
View File

@@ -5,7 +5,7 @@ import { JslibModule } from "@bitwarden/angular/jslib.module";
import { ButtonModule, DialogModule, DialogService } from "@bitwarden/components"; import { ButtonModule, DialogModule, DialogService } from "@bitwarden/components";
export type BrowserSyncVerificationDialogParams = { export type BrowserSyncVerificationDialogParams = {
fingerprint: string; fingerprint: string[];
}; };
@Component({ @Component({

10
apps/desktop/src/services/native-messaging.service.ts
View File

@@ -71,12 +71,10 @@ export class NativeMessagingService {
if (await this.stateService.getEnableBrowserIntegrationFingerprint()) { if (await this.stateService.getEnableBrowserIntegrationFingerprint()) {
ipcRenderer.send("nativeMessagingReply", { command: "verifyFingerprint", appId: appId }); ipcRenderer.send("nativeMessagingReply", { command: "verifyFingerprint", appId: appId });
const fingerprint = ( const fingerprint = await this.cryptoService.getFingerprint(
await this.cryptoService.getFingerprint( await this.stateService.getUserId(),
await this.stateService.getUserId(), remotePublicKey
remotePublicKey );
)
).join("-");
this.messagingService.send("setFocus"); this.messagingService.send("setFocus");