bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-11 13:53:34 +00:00
Code Issues Releases Wiki Activity

Provide information to set webauthn allow in html template (#455)

Browse Source
This commit is contained in:
Matt Gibson
2021-08-12 16:12:31 -04:00
committed by GitHub
parent c5f236c2e4
commit 0180d0cce5
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
angular/src/components/two-factor.component.ts
View File

@@ -44,6 +44,10 @@ export class TwoFactorComponent implements OnInit, OnDestroy {
onSuccessfulLogin: () => Promise<any>; onSuccessfulLogin: () => Promise<any>;
onSuccessfulLoginNavigate: () => Promise<any>; onSuccessfulLoginNavigate: () => Promise<any>;
get webAuthnAllow(): string {
return `publickey-credentials-get ${this.environmentService.getWebVaultUrl()}`;
}
protected loginRoute = 'login'; protected loginRoute = 'login';
protected successRoute = 'vault'; protected successRoute = 'vault';

6
common/src/misc/webauthn_iframe.ts
View File

@@ -1,6 +1,8 @@
import { I18nService } from '../abstractions/i18n.service'; import { I18nService } from '../abstractions/i18n.service';
import { PlatformUtilsService } from '../abstractions/platformUtils.service'; import { PlatformUtilsService } from '../abstractions/platformUtils.service';
import { IFrameComponent } from './iframe_component'; import { IFrameComponent } from './iframe_component';
import { Utils } from './utils';
export class WebAuthnIFrame extends IFrameComponent { export class WebAuthnIFrame extends IFrameComponent {
constructor(win: Window, webVaultUrl: string, private webAuthnNewTab: boolean, constructor(win: Window, webVaultUrl: string, private webAuthnNewTab: boolean,
@@ -20,7 +22,9 @@ export class WebAuthnIFrame extends IFrameComponent {
this.platformUtilsService.launchUri(`${this.webVaultUrl}/webauthn-fallback-connector.html?${params}`); this.platformUtilsService.launchUri(`${this.webVaultUrl}/webauthn-fallback-connector.html?${params}`);
} else { } else {
super.initComponent(params); super.initComponent(params);
this.iframe.allow = 'publickey-credentials-get ' + new URL(this.webVaultUrl).origin; if (Utils.isNullOrWhitespace(this.iframe.allow)) {
this.iframe.allow = 'publickey-credentials-get ' + new URL(this.webVaultUrl).origin;
}
} }
} }
} }