[PM-2594] Added new property "CloudRegion" to GlobalSettings and Conf…

…igResponseModel to be able to override the cloud url value for selfhost instances (#3024) * [PM-2594] Added new property "CloudVault" to GlobalSettings and ConfigResponseModel to be able to override this value for selfhost instances * [PM-2594] Renamed EnvironmentConfigResponseModel.CloudVault to CloudWebVault * [PM-2594] Added default value for globalSettings__baseServiceUri__cloudWebVault on EnvironmentFileBuilder * [PM-2594] Erased CloudWebVault environment variable and added CloudVaultRegion * [PM-2594] Changed var name on EnvironmentFileBuilder * [PM-2594] Renamed the env. variable and also the output property to CloudRegion (cherry picked from commit b151605)
bitwarden · Jul 3, 2023 · 70eefc5 · 70eefc5
1 parent 693f79c
commit 70eefc5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/src/Api/Models/Response/ConfigResponseModel.cs b/src/Api/Models/Response/ConfigResponseModel.cs
@@ -28,6 +28,7 @@ public ConfigResponseModel(
         GitHash = AssemblyHelpers.GetGitHash();
         Environment = new EnvironmentConfigResponseModel
         {
+            CloudRegion = globalSettings.BaseServiceUri.CloudRegion,
             Vault = globalSettings.BaseServiceUri.Vault,
             Api = globalSettings.BaseServiceUri.Api,
             Identity = globalSettings.BaseServiceUri.Identity,
@@ -46,6 +47,7 @@ public class ServerConfigResponseModel
 
 public class EnvironmentConfigResponseModel
 {
+    public string CloudRegion { get; set; }
     public string Vault { get; set; }
     public string Api { get; set; }
     public string Identity { get; set; }

diff --git a/src/Core/Settings/GlobalSettings.cs b/src/Core/Settings/GlobalSettings.cs
@@ -143,6 +143,7 @@ public BaseServiceUriSettings(GlobalSettings globalSettings)
             _globalSettings = globalSettings;
         }
 
+        public string CloudRegion { get; set; }
         public string Vault { get; set; }
         public string VaultWithHash => $"{Vault}/#";
 

diff --git a/src/Core/Settings/IBaseServiceUriSettings.cs b/src/Core/Settings/IBaseServiceUriSettings.cs
@@ -3,6 +3,7 @@ namespace Bit.Core.Settings;
 
 public interface IBaseServiceUriSettings
 {
+    string CloudRegion { get; set; }
     string Vault { get; set; }
     string VaultWithHash { get; }
     string Api { get; set; }

diff --git a/util/Setup/EnvironmentFileBuilder.cs b/util/Setup/EnvironmentFileBuilder.cs
@@ -73,6 +73,7 @@ private void Init()
         _globalOverrideValues = new Dictionary<string, string>
         {
             ["globalSettings__baseServiceUri__vault"] = _context.Config.Url,
+            ["globalSettings__baseServiceUri__cloudVaultRegion"] = "US",
             ["globalSettings__sqlServer__connectionString"] = $"\"{dbConnectionString.Replace("\"", "\\\"")}\"",
             ["globalSettings__identityServer__certificatePassword"] = _context.Install?.IdentityCertPassword,
             ["globalSettings__internalIdentityKey"] = _context.Stub ? "RANDOM_IDENTITY_KEY" :