Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-01-02 18:47:44 +01:00
Code Issues Projects Releases Wiki Activity

[PM-2594] Added new property "CloudRegion" to GlobalSettings and ConfigResponseModel to be able to override the cloud url value for selfhost instances (#3024)

Browse Source 
* [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
This commit is contained in:
Rui Tomé 2023-07-03 21:43:13 +01:00 committed by GitHub
parent 4e089286e5
commit b151605c28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Models/Response/ConfigResponseModel.cs
View File

@ -28,6 +28,7 @@ public class ConfigResponseModel : ResponseModel
GitHash = AssemblyHelpers.GetGitHash(); GitHash = AssemblyHelpers.GetGitHash();
Environment = new EnvironmentConfigResponseModel Environment = new EnvironmentConfigResponseModel
{ {
CloudRegion = globalSettings.BaseServiceUri.CloudRegion,
Vault = globalSettings.BaseServiceUri.Vault, Vault = globalSettings.BaseServiceUri.Vault,
Api = globalSettings.BaseServiceUri.Api, Api = globalSettings.BaseServiceUri.Api,
Identity = globalSettings.BaseServiceUri.Identity, Identity = globalSettings.BaseServiceUri.Identity,
@ -46,6 +47,7 @@ public class ServerConfigResponseModel
public class EnvironmentConfigResponseModel public class EnvironmentConfigResponseModel
{ {
public string CloudRegion { get; set; }
public string Vault { get; set; } public string Vault { get; set; }
public string Api { get; set; } public string Api { get; set; }
public string Identity { get; set; } public string Identity { get; set; }

1
src/Core/Settings/GlobalSettings.cs
View File

@ -143,6 +143,7 @@ public class GlobalSettings : IGlobalSettings
_globalSettings = globalSettings; _globalSettings = globalSettings;
} }
public string CloudRegion { get; set; }
public string Vault { get; set; } public string Vault { get; set; }
public string VaultWithHash => $"{Vault}/#"; public string VaultWithHash => $"{Vault}/#";

1
src/Core/Settings/IBaseServiceUriSettings.cs
View File

@ -3,6 +3,7 @@ namespace Bit.Core.Settings;
public interface IBaseServiceUriSettings public interface IBaseServiceUriSettings
{ {
string CloudRegion { get; set; }
string Vault { get; set; } string Vault { get; set; }
string VaultWithHash { get; } string VaultWithHash { get; }
string Api { get; set; } string Api { get; set; }

1
util/Setup/EnvironmentFileBuilder.cs
View File

@ -73,6 +73,7 @@ public class EnvironmentFileBuilder
_globalOverrideValues = new Dictionary<string, string> _globalOverrideValues = new Dictionary<string, string>
{ {
["globalSettings__baseServiceUri__vault"] = _context.Config.Url, ["globalSettings__baseServiceUri__vault"] = _context.Config.Url,
["globalSettings__baseServiceUri__cloudVaultRegion"] = "US",
["globalSettings__sqlServer__connectionString"] = $"\"{dbConnectionString.Replace("\"", "\\\"")}\"", ["globalSettings__sqlServer__connectionString"] = $"\"{dbConnectionString.Replace("\"", "\\\"")}\"",
["globalSettings__identityServer__certificatePassword"] = _context.Install?.IdentityCertPassword, ["globalSettings__identityServer__certificatePassword"] = _context.Install?.IdentityCertPassword,
["globalSettings__internalIdentityKey"] = _context.Stub ? "RANDOM_IDENTITY_KEY" : ["globalSettings__internalIdentityKey"] = _context.Stub ? "RANDOM_IDENTITY_KEY" :