From 04cfd8040cfa825249b921150917463a0cf2702b Mon Sep 17 00:00:00 2001 From: Billy Hughes Date: Wed, 22 Nov 2017 12:45:38 -0500 Subject: [PATCH] on-premise support for "bitwarden Web Vault" tool (#388) * on-premise support for "bitwarden Web Vault" tool * don't import EnvironmentService yet, change variable scope --- src/popup/app/tools/tools.component.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/popup/app/tools/tools.component.ts b/src/popup/app/tools/tools.component.ts index 79910a5139..c556f2f25f 100644 --- a/src/popup/app/tools/tools.component.ts +++ b/src/popup/app/tools/tools.component.ts @@ -7,14 +7,21 @@ export class ToolsController { i18n: any; constructor(private SweetAlert: any, private i18nService: any, - private $analytics: any, private utilsService: UtilsService) { + private $analytics: any, private utilsService: UtilsService, + private webVaultBaseUrl: string = 'https://vault.bitwarden.com', + private environmentService: any) { this.i18n = i18nService; this.showExport = !utilsService.isEdge(); + if (environmentService.baseUrl) { + this.webVaultBaseUrl = environmentService.baseUrl; + } else if (environmentService.webVaultUrl) { + this.webVaultBaseUrl = environmentService.webVaultUrl; + } } launchWebVault(createOrg: any) { this.$analytics.eventTrack('Launch Web Vault' + (createOrg ? ' For Share' : '')); - chrome.tabs.create({ url: 'https://vault.bitwarden.com/#/' + (createOrg ? '?org=free' : '') }); + chrome.tabs.create({ url: this.webVaultBaseUrl + '/#/' + (createOrg ? '?org=free' : '') }); } launchAndroid() {