From 6c61f53d8b4ad05d4a3ecb96df6ae2def592868c Mon Sep 17 00:00:00 2001
From: Addison Beck <abeck@bitwarden.com>
Date: Fri, 28 Jan 2022 08:15:02 -0500
Subject: [PATCH] [bug] Always save environmentUrls passed to setUrls (#641)

* [bug] Always save environmentUrls passed to setUrls

* [bug] Remove parameter from abstraction as well

* [bug] Correct type in abstraction
---
 .../src/abstractions/environment.service.ts   |  2 +-
 common/src/services/environment.service.ts    | 24 +++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/common/src/abstractions/environment.service.ts b/common/src/abstractions/environment.service.ts
index 97daeba225a..8398b4c634e 100644
--- a/common/src/abstractions/environment.service.ts
+++ b/common/src/abstractions/environment.service.ts
@@ -29,6 +29,6 @@ export abstract class EnvironmentService {
   getEventsUrl: () => string;
   getKeyConnectorUrl: () => string;
   setUrlsFromStorage: () => Promise<void>;
-  setUrls: (urls: any, saveSettings?: boolean) => Promise<Urls>;
+  setUrls: (urls: Urls) => Promise<Urls>;
   getUrls: () => Urls;
 }
diff --git a/common/src/services/environment.service.ts b/common/src/services/environment.service.ts
index f1842fe9801..a4f0a213e72 100644
--- a/common/src/services/environment.service.ts
+++ b/common/src/services/environment.service.ts
@@ -126,7 +126,7 @@ export class EnvironmentService implements EnvironmentServiceAbstraction {
     this.keyConnectorUrl = urls.keyConnector;
   }
 
-  async setUrls(urls: Urls, saveSettings: boolean = true): Promise<any> {
+  async setUrls(urls: Urls): Promise<any> {
     urls.base = this.formatUrl(urls.base);
     urls.webVault = this.formatUrl(urls.webVault);
     urls.api = this.formatUrl(urls.api);
@@ -136,18 +136,16 @@ export class EnvironmentService implements EnvironmentServiceAbstraction {
     urls.events = this.formatUrl(urls.events);
     urls.keyConnector = this.formatUrl(urls.keyConnector);
 
-    if (saveSettings) {
-      await this.stateService.setEnvironmentUrls({
-        base: urls.base,
-        api: urls.api,
-        identity: urls.identity,
-        webVault: urls.webVault,
-        icons: urls.icons,
-        notifications: urls.notifications,
-        events: urls.events,
-        keyConnector: urls.keyConnector,
-      });
-    }
+    await this.stateService.setEnvironmentUrls({
+      base: urls.base,
+      api: urls.api,
+      identity: urls.identity,
+      webVault: urls.webVault,
+      icons: urls.icons,
+      notifications: urls.notifications,
+      events: urls.events,
+      keyConnector: urls.keyConnector,
+    });
 
     this.baseUrl = urls.base;
     this.webVaultUrl = urls.webVault;