Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-13 01:58:44 +02:00
Code Issues Projects Releases Wiki Activity

use win variables

Browse Source
This commit is contained in:
Kyle Spearrin 2018-04-07 00:18:31 -04:00
parent 5d66ede2ea
commit 2c87f12718
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,8 @@ export class TwoFactorOptionsComponent implements OnInit {
constructor(protected authService: AuthService, protected router: Router, constructor(protected authService: AuthService, protected router: Router,
protected analytics: Angulartics2, protected toasterService: ToasterService, protected analytics: Angulartics2, protected toasterService: ToasterService,
protected i18nService: I18nService, protected platformUtilsService: PlatformUtilsService) { } protected i18nService: I18nService, protected platformUtilsService: PlatformUtilsService,
protected win: Window) { }
ngOnInit() { ngOnInit() {
if (this.authService.twoFactorProviders.has(TwoFactorProviderType.OrganizationDuo)) { if (this.authService.twoFactorProviders.has(TwoFactorProviderType.OrganizationDuo)) {
@ -45,7 +46,7 @@ export class TwoFactorOptionsComponent implements OnInit {
} }
if (this.authService.twoFactorProviders.has(TwoFactorProviderType.U2f) && if (this.authService.twoFactorProviders.has(TwoFactorProviderType.U2f) &&
this.platformUtilsService.supportsU2f(window)) { this.platformUtilsService.supportsU2f(this.win)) {
this.providers.push(TwoFactorProviders[TwoFactorProviderType.U2f]); this.providers.push(TwoFactorProviders[TwoFactorProviderType.U2f]);
} }

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

@ -46,7 +46,7 @@ export class TwoFactorComponent implements OnInit, OnDestroy {
protected i18nService: I18nService, protected apiService: ApiService, protected i18nService: I18nService, protected apiService: ApiService,
protected platformUtilsService: PlatformUtilsService, protected syncService: SyncService, protected platformUtilsService: PlatformUtilsService, protected syncService: SyncService,
protected win: Window, protected environmentService: EnvironmentService) { protected win: Window, protected environmentService: EnvironmentService) {
this.u2fSupported = this.platformUtilsService.supportsU2f(window); this.u2fSupported = this.platformUtilsService.supportsU2f(win);
} }
async ngOnInit() { async ngOnInit() {
@ -119,7 +119,7 @@ export class TwoFactorComponent implements OnInit, OnDestroy {
} }
setTimeout(() => { setTimeout(() => {
(window as any).Duo.init({ (this.win as any).Duo.init({
host: params.Host, host: params.Host,
sig_request: params.Signature, sig_request: params.Signature,
submit_callback: async (f: HTMLFormElement) => { submit_callback: async (f: HTMLFormElement) => {

4
src/angular/components/view.component.ts
View File

@ -46,7 +46,7 @@ export class ViewComponent implements OnDestroy {
protected tokenService: TokenService, protected toasterService: ToasterService, protected tokenService: TokenService, protected toasterService: ToasterService,
protected cryptoService: CryptoService, protected platformUtilsService: PlatformUtilsService, protected cryptoService: CryptoService, protected platformUtilsService: PlatformUtilsService,
protected i18nService: I18nService, protected analytics: Angulartics2, protected i18nService: I18nService, protected analytics: Angulartics2,
protected auditService: AuditService) { } protected auditService: AuditService, protected win: Window) { }
ngOnDestroy() { ngOnDestroy() {
this.cleanUp(); this.cleanUp();
@ -145,7 +145,7 @@ export class ViewComponent implements OnDestroy {
const buf = await response.arrayBuffer(); const buf = await response.arrayBuffer();
const key = await this.cryptoService.getOrgKey(this.cipher.organizationId); const key = await this.cryptoService.getOrgKey(this.cipher.organizationId);
const decBuf = await this.cryptoService.decryptFromBytes(buf, key); const decBuf = await this.cryptoService.decryptFromBytes(buf, key);
this.platformUtilsService.saveFile(window, decBuf, null, attachment.fileName); this.platformUtilsService.saveFile(this.win, decBuf, null, attachment.fileName);
} catch (e) { } catch (e) {
this.toasterService.popAsync('error', null, this.i18nService.t('errorOccurred')); this.toasterService.popAsync('error', null, this.i18nService.t('errorOccurred'));
} }