nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-23 04:21:05 -05:00
Code

internal api & vault urls. apply to version check

Browse Source
This commit is contained in:
Kyle Spearrin 2018-03-29 08:45:04 -04:00
parent da970c2308
commit 4ce69dac2b
24 changed files with 69 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Admin/Controllers/HomeController.cs
View File

@ -68,7 +68,8 @@ namespace Bit.Admin.Controllers
{ {
try try
{ {
var response = await _httpClient.GetAsync($"{_globalSettings.BaseServiceUri.Vault}/version.json"); var response = await _httpClient.GetAsync(
$"{_globalSettings.BaseServiceUri.InternalVault}/version.json");
if(response.IsSuccessStatusCode) if(response.IsSuccessStatusCode)
{ {
var json = await response.Content.ReadAsStringAsync(); var json = await response.Content.ReadAsStringAsync();

4
src/Admin/appsettings.Production.json
View File

@ -4,7 +4,9 @@
"vault": "https://vault.bitwarden.com", "vault": "https://vault.bitwarden.com",
"api": "https://api.bitwarden.com", "api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com", "identity": "https://identity.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com" "internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",
"internalVault": "https://vault.bitwarden.com"
}, },
"braintree": { "braintree": {
"production": true "production": true

4
src/Admin/appsettings.json
View File

@ -8,7 +8,9 @@
"vault": "http://localhost:4001", "vault": "http://localhost:4001",
"api": "http://localhost:4000", "api": "http://localhost:4000",
"identity": "http://localhost:33656", "identity": "http://localhost:33656",
"internalIdentity": "http://localhost:33656" "internalIdentity": "http://localhost:33656",
"internalApi": "http://localhost:4000",
"internalVault": "http://localhost:4001"
}, },
"sqlServer": { "sqlServer": {
"connectionString": "SECRET" "connectionString": "SECRET"

4
src/Api/appsettings.Preview.json
View File

@ -4,7 +4,9 @@
"vault": "https://preview-vault.bitwarden.com", "vault": "https://preview-vault.bitwarden.com",
"api": "https://preview-api.bitwarden.com", "api": "https://preview-api.bitwarden.com",
"identity": "https://preview-identity.bitwarden.com", "identity": "https://preview-identity.bitwarden.com",
"internalIdentity": "https://preview-identity.bitwarden.com" "internalIdentity": "https://preview-identity.bitwarden.com",
"internalApi": "https://preview-api.bitwarden.com",
"internalVault": "https://preview-vault.bitwarden.com"
} }
} }
} }

4
src/Api/appsettings.Production.json
View File

@ -4,7 +4,9 @@
"vault": "https://vault.bitwarden.com", "vault": "https://vault.bitwarden.com",
"api": "https://api.bitwarden.com", "api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com", "identity": "https://identity.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com" "internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",
"internalVault": "https://vault.bitwarden.com"
}, },
"braintree": { "braintree": {
"production": true "production": true

4
src/Api/appsettings.Staging.json
View File

@ -4,7 +4,9 @@
"vault": "https://vault.bitwarden.com", "vault": "https://vault.bitwarden.com",
"api": "https://api.bitwarden.com", "api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com", "identity": "https://identity.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com" "internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",
"internalVault": "https://vault.bitwarden.com"
} }
} }
} }

4
src/Api/appsettings.json
View File

@ -8,7 +8,9 @@
"vault": "http://localhost:4001", "vault": "http://localhost:4001",
"api": "http://localhost:4000", "api": "http://localhost:4000",
"identity": "http://localhost:33656", "identity": "http://localhost:33656",
"internalIdentity": "http://localhost:33656" "internalIdentity": "http://localhost:33656",
"internalApi": "http://localhost:4000",
"internalVault": "http://localhost:4001"
}, },
"sqlServer": { "sqlServer": {
"connectionString": "SECRET" "connectionString": "SECRET"

4
src/Billing/appsettings.json
View File

@ -8,7 +8,9 @@
"vault": "http://localhost:4001", "vault": "http://localhost:4001",
"api": "http://localhost:4000", "api": "http://localhost:4000",
"identity": "http://localhost:33656", "identity": "http://localhost:33656",
"internalIdentity": "http://localhost:33656" "internalIdentity": "http://localhost:33656",
"internalApi": "http://localhost:4000",
"internalVault": "http://localhost:4001"
}, },
"sqlServer": { "sqlServer": {
"connectionString": "SECRET" "connectionString": "SECRET"

2
src/Core/GlobalSettings.cs
View File

@ -35,6 +35,8 @@ namespace Bit.Core
public string Api { get; set; } public string Api { get; set; }
public string Identity { get; set; } public string Identity { get; set; }
public string InternalIdentity { get; set; } public string InternalIdentity { get; set; }
public string InternalApi { get; set; }
public string InternalVault { get; set; }
} }
public class SqlServerSettings public class SqlServerSettings

4
src/Events/appsettings.Preview.json
View File

@ -4,7 +4,9 @@
"vault": "https://preview-vault.bitwarden.com", "vault": "https://preview-vault.bitwarden.com",
"api": "https://preview-api.bitwarden.com", "api": "https://preview-api.bitwarden.com",
"identity": "https://preview-identity.bitwarden.com", "identity": "https://preview-identity.bitwarden.com",
"internalIdentity": "https://preview-identity.bitwarden.com" "internalIdentity": "https://preview-identity.bitwarden.com",
"internalApi": "https://preview-api.bitwarden.com",
"internalVault": "https://preview-vault.bitwarden.com"
} }
} }
} }

4
src/Events/appsettings.Production.json
View File

@ -4,7 +4,9 @@
"vault": "https://vault.bitwarden.com", "vault": "https://vault.bitwarden.com",
"api": "https://api.bitwarden.com", "api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com", "identity": "https://identity.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com" "internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",
"internalVault": "https://vault.bitwarden.com"
} }
} }
} }

4
src/Events/appsettings.Staging.json
View File

@ -4,7 +4,9 @@
"vault": "https://vault.bitwarden.com", "vault": "https://vault.bitwarden.com",
"api": "https://api.bitwarden.com", "api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com", "identity": "https://identity.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com" "internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",
"internalVault": "https://vault.bitwarden.com"
} }
} }
} }

4
src/Events/appsettings.json
View File

@ -6,7 +6,9 @@
"vault": "http://localhost:4001", "vault": "http://localhost:4001",
"api": "http://localhost:4000", "api": "http://localhost:4000",
"identity": "http://localhost:33656", "identity": "http://localhost:33656",
"internalIdentity": "http://localhost:33656" "internalIdentity": "http://localhost:33656",
"internalApi": "http://localhost:4000",
"internalVault": "http://localhost:4001"
}, },
"sqlServer": { "sqlServer": {
"connectionString": "SECRET" "connectionString": "SECRET"

4
src/Identity/appsettings.Preview.json
View File

@ -4,7 +4,9 @@
"vault": "https://preview-vault.bitwarden.com", "vault": "https://preview-vault.bitwarden.com",
"api": "https://preview-api.bitwarden.com", "api": "https://preview-api.bitwarden.com",
"identity": "https://preview-identity.bitwarden.com", "identity": "https://preview-identity.bitwarden.com",
"internalIdentity": "https://preview-identity.bitwarden.com" "internalIdentity": "https://preview-identity.bitwarden.com",
"internalApi": "https://preview-api.bitwarden.com",
"internalVault": "https://preview-vault.bitwarden.com"
} }
} }
} }

4
src/Identity/appsettings.Production.json
View File

@ -4,7 +4,9 @@
"vault": "https://vault.bitwarden.com", "vault": "https://vault.bitwarden.com",
"api": "https://api.bitwarden.com", "api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com", "identity": "https://identity.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com" "internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",
"internalVault": "https://vault.bitwarden.com"
}, },
"braintree": { "braintree": {
"production": true "production": true

4
src/Identity/appsettings.Staging.json
View File

@ -4,7 +4,9 @@
"vault": "https://vault.bitwarden.com", "vault": "https://vault.bitwarden.com",
"api": "https://api.bitwarden.com", "api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com", "identity": "https://identity.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com" "internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",
"internalVault": "https://vault.bitwarden.com"
} }
} }
} }

4
src/Identity/appsettings.json
View File

@ -8,7 +8,9 @@
"vault": "http://localhost:4001", "vault": "http://localhost:4001",
"api": "http://localhost:4000", "api": "http://localhost:4000",
"identity": "http://localhost:33656", "identity": "http://localhost:33656",
"internalIdentity": "http://localhost:33656" "internalIdentity": "http://localhost:33656",
"internalApi": "http://localhost:4000",
"internalVault": "http://localhost:4001"
}, },
"sqlServer": { "sqlServer": {
"connectionString": "SECRET" "connectionString": "SECRET"

4
src/Jobs/appsettings.Preview.json
View File

@ -4,7 +4,9 @@
"vault": "https://preview-vault.bitwarden.com", "vault": "https://preview-vault.bitwarden.com",
"api": "https://preview-api.bitwarden.com", "api": "https://preview-api.bitwarden.com",
"identity": "https://preview-identity.bitwarden.com", "identity": "https://preview-identity.bitwarden.com",
"internalIdentity": "https://preview-identity.bitwarden.com" "internalIdentity": "https://preview-identity.bitwarden.com",
"internalApi": "https://preview-api.bitwarden.com",
"internalVault": "https://preview-vault.bitwarden.com"
} }
} }
} }

4
src/Jobs/appsettings.Production.json
View File

@ -4,7 +4,9 @@
"vault": "https://vault.bitwarden.com", "vault": "https://vault.bitwarden.com",
"api": "https://api.bitwarden.com", "api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com", "identity": "https://identity.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com" "internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",
"internalVault": "https://vault.bitwarden.com"
}, },
"braintree": { "braintree": {
"production": true "production": true

4
src/Jobs/appsettings.Staging.json
View File

@ -4,7 +4,9 @@
"vault": "https://vault.bitwarden.com", "vault": "https://vault.bitwarden.com",
"api": "https://api.bitwarden.com", "api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com", "identity": "https://identity.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com" "internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",
"internalVault": "https://vault.bitwarden.com"
} }
} }
} }

4
src/Jobs/appsettings.json
View File

@ -8,7 +8,9 @@
"vault": "http://localhost:4001", "vault": "http://localhost:4001",
"api": "http://localhost:4000", "api": "http://localhost:4000",
"identity": "http://localhost:33656", "identity": "http://localhost:33656",
"internalIdentity": "http://localhost:33656" "internalIdentity": "http://localhost:33656",
"internalApi": "http://localhost:4000",
"internalVault": "http://localhost:4001"
}, },
"sqlServer": { "sqlServer": {
"connectionString": "SECRET" "connectionString": "SECRET"

4
src/Scim/appsettings.Production.json
View File

@ -4,7 +4,9 @@
"vault": "https://vault.bitwarden.com", "vault": "https://vault.bitwarden.com",
"api": "https://api.bitwarden.com", "api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com", "identity": "https://identity.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com" "internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",
"internalVault": "https://vault.bitwarden.com"
}, },
"braintree": { "braintree": {
"production": true "production": true

4
src/Scim/appsettings.json
View File

@ -8,7 +8,9 @@
"vault": "http://localhost:4001", "vault": "http://localhost:4001",
"api": "http://localhost:4000", "api": "http://localhost:4000",
"identity": "http://localhost:33656", "identity": "http://localhost:33656",
"internalIdentity": "http://localhost:33656" "internalIdentity": "http://localhost:33656",
"internalApi": "http://localhost:4000",
"internalVault": "http://localhost:4001"
}, },
"sqlServer": { "sqlServer": {
"connectionString": "SECRET" "connectionString": "SECRET"

2
util/Setup/EnvironmentFileBuilder.cs
View File

@ -127,6 +127,8 @@ globalSettings__baseServiceUri__vault=http://localhost
globalSettings__baseServiceUri__api=http://localhost/api globalSettings__baseServiceUri__api=http://localhost/api
globalSettings__baseServiceUri__identity=http://localhost/identity globalSettings__baseServiceUri__identity=http://localhost/identity
globalSettings__baseServiceUri__internalIdentity=http://identity:5000 globalSettings__baseServiceUri__internalIdentity=http://identity:5000
globalSettings__baseServiceUri__internalApi=http://api:5000
globalSettings__baseServiceUri__internalVault=http://web:5000
globalSettings__pushRelayBaseUri=https://push.bitwarden.com globalSettings__pushRelayBaseUri=https://push.bitwarden.com
globalSettings__installation__identityUri=https://identity.bitwarden.com globalSettings__installation__identityUri=https://identity.bitwarden.com
"); ");