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

async fillCipher

Browse Source
This commit is contained in:
Kyle Spearrin 2019-08-19 09:38:59 -04:00
parent 4d261964e5
commit e6d6275daa
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/browser/browserApi.ts
View File

@ -229,7 +229,7 @@ export class BrowserApi {
browser.tabs.update({ active: true }).finally(win.close); browser.tabs.update({ active: true }).finally(win.close);
} else if (BrowserApi.isWebExtensionsApi || BrowserApi.isChromeApi) { } else if (BrowserApi.isWebExtensionsApi || BrowserApi.isChromeApi) {
win.close(); win.close();
} else if (BrowserApi.isSafariApi && safari.extension.popovers && safari.extension.popovers.length > 0) { } else if (BrowserApi.isSafariApi) {
SafariApp.sendMessageToApp('hideWindow'); SafariApp.sendMessageToApp('hideWindow');
} }
} }

17
src/popup/vault/current-tab.component.ts
View File

@ -130,7 +130,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
this.router.navigate(['/view-cipher'], { queryParams: { cipherId: cipher.id } }); this.router.navigate(['/view-cipher'], { queryParams: { cipherId: cipher.id } });
} }
fillCipher(cipher: CipherView) { async fillCipher(cipher: CipherView) {
this.totpCode = null; this.totpCode = null;
if (this.totpTimeout != null) { if (this.totpTimeout != null) {
window.clearTimeout(this.totpTimeout); window.clearTimeout(this.totpTimeout);
@ -142,27 +142,26 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
return; return;
} }
this.autofillService.doAutoFill({ try {
this.totpCode = await this.autofillService.doAutoFill({
cipher: cipher, cipher: cipher,
pageDetails: this.pageDetails, pageDetails: this.pageDetails,
doc: window.document, doc: window.document,
}).then((totpCode) => { });
this.totpCode = totpCode;
this.analytics.eventTrack.next({ action: 'Autofilled' }); this.analytics.eventTrack.next({ action: 'Autofilled' });
if (totpCode != null && !this.platformUtilsService.isSafari()) { if (this.totpCode != null && !this.platformUtilsService.isSafari()) {
this.platformUtilsService.copyToClipboard(totpCode, { window: window }); this.platformUtilsService.copyToClipboard(this.totpCode, { window: window });
} }
if (this.popupUtilsService.inPopup(window)) { if (this.popupUtilsService.inPopup(window)) {
BrowserApi.closePopup(window); BrowserApi.closePopup(window);
} }
}).catch(() => { } catch {
this.ngZone.run(() => { this.ngZone.run(() => {
this.analytics.eventTrack.next({ action: 'Autofilled Error' }); this.analytics.eventTrack.next({ action: 'Autofilled Error' });
this.toasterService.popAsync('error', null, this.i18nService.t('autofillError')); this.toasterService.popAsync('error', null, this.i18nService.t('autofillError'));
this.changeDetectorRef.detectChanges(); this.changeDetectorRef.detectChanges();
}); });
}); }
// Weird bug in Safari won't allow clipboard copying after a promise call, so we have this workaround // Weird bug in Safari won't allow clipboard copying after a promise call, so we have this workaround
if (cipher.type === CipherType.Login && this.platformUtilsService.isSafari()) { if (cipher.type === CipherType.Login && this.platformUtilsService.isSafari()) {