From 0004b9778da7c741363ffdd37cfaceb6dff7e998 Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Tue, 22 Jun 2021 17:34:42 +0300
Subject: [PATCH] fix(core-root): CB-1062 server uri change detection

---
 .../packages/core-root/src/ServerConfigResource.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/webapp/packages/core-root/src/ServerConfigResource.ts b/webapp/packages/core-root/src/ServerConfigResource.ts
index b43250cef9..701bf3d173 100644
--- a/webapp/packages/core-root/src/ServerConfigResource.ts
+++ b/webapp/packages/core-root/src/ServerConfigResource.ts
@@ -84,15 +84,16 @@ export class ServerConfigResource extends CachedDataResource<ServerConfig | null
 
     return (
       this.update.serverName !== this.data.name
-    || this.update.sessionExpireTime !== this.data.sessionExpireTime
+      || this.update.serverURL !== this.data.serverURL
+      || this.update.sessionExpireTime !== this.data.sessionExpireTime
 
-    || this.update.anonymousAccessEnabled !== this.data.anonymousAccessEnabled
+      || this.update.anonymousAccessEnabled !== this.data.anonymousAccessEnabled
 
-    || this.update.adminCredentialsSaveEnabled !== this.data.adminCredentialsSaveEnabled
-    || this.update.publicCredentialsSaveEnabled !== this.data.publicCredentialsSaveEnabled
+      || this.update.adminCredentialsSaveEnabled !== this.data.adminCredentialsSaveEnabled
+      || this.update.publicCredentialsSaveEnabled !== this.data.publicCredentialsSaveEnabled
 
-    || this.update.customConnectionsEnabled !== this.data.supportsCustomConnections
-    || !isArraysEqual(this.update.enabledAuthProviders || [], this.data.enabledAuthProviders)
+      || this.update.customConnectionsEnabled !== this.data.supportsCustomConnections
+      || !isArraysEqual(this.update.enabledAuthProviders || [], this.data.enabledAuthProviders)
     );
   }
 
@@ -172,6 +173,7 @@ export class ServerConfigResource extends CachedDataResource<ServerConfig | null
     Object.assign(this.navigatorSettingsUpdate, serverConfig.defaultNavigatorSettings);
 
     this.update.serverName = serverConfig.name;
+    this.update.serverURL = serverConfig.serverURL;
     this.update.sessionExpireTime = serverConfig.sessionExpireTime;
 
     this.update.adminName = undefined;