From 5760efdaa1642b07d980574002de1d3937aa4250 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 27 Jun 2018 22:05:33 -0400 Subject: [PATCH] u2d lib is externals --- src/app/settings/two-factor-u2f.component.ts | 6 ++++-- src/connectors/u2f.html | 1 + src/connectors/u2f.js | 2 +- webpack.config.js | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/app/settings/two-factor-u2f.component.ts b/src/app/settings/two-factor-u2f.component.ts index a0ba2e068d..32342211c5 100644 --- a/src/app/settings/two-factor-u2f.component.ts +++ b/src/app/settings/two-factor-u2f.component.ts @@ -35,12 +35,13 @@ export class TwoFactorU2fComponent implements OnInit, OnDestroy { u2fListening: boolean; u2fResponse: string; masterPassword: string; - u2fScript: HTMLScriptElement; authPromise: Promise; formPromise: Promise; private masterPasswordHash: string; + private closed = false; + private u2fScript: HTMLScriptElement; constructor(private apiService: ApiService, private i18nService: I18nService, private analytics: Angulartics2, private toasterService: ToasterService, @@ -55,6 +56,7 @@ export class TwoFactorU2fComponent implements OnInit, OnDestroy { } ngOnDestroy() { + this.closed = true; window.document.body.removeChild(this.u2fScript); } @@ -86,7 +88,7 @@ export class TwoFactorU2fComponent implements OnInit, OnDestroy { } private readDevice() { - if (this.enabled) { + if (this.closed || this.enabled) { return; } diff --git a/src/connectors/u2f.html b/src/connectors/u2f.html index 8e3785b76f..f1151bfca9 100644 --- a/src/connectors/u2f.html +++ b/src/connectors/u2f.html @@ -4,6 +4,7 @@ Bitwarden U2F Connector + diff --git a/src/connectors/u2f.js b/src/connectors/u2f.js index af51eaf6b8..d397af2e25 100644 --- a/src/connectors/u2f.js +++ b/src/connectors/u2f.js @@ -1,4 +1,4 @@ -require('../scripts/u2f'); +import * as u2f from 'u2f'; document.addEventListener('DOMContentLoaded', function (event) { init(); diff --git a/webpack.config.js b/webpack.config.js index 048db1528a..bee4f6985e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -147,6 +147,9 @@ const config = { 'connectors/u2f': './src/connectors/u2f.js', 'connectors/duo': './src/connectors/duo.ts', }, + externals: { + 'u2f': 'u2f', + }, resolve: { extensions: ['.ts', '.js'], alias: {