Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-01-22 21:51:22 +01:00
Code Issues Projects Releases Wiki Activity

more notification hub renames

Browse Source
This commit is contained in:
Kyle Spearrin 2018-08-16 13:50:41 -04:00
parent 80a49e53ac
commit 1ffa712b75
16 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,8 +5,8 @@
"api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com",
"admin": "https://admin.bitwarden.com",
"hub": "https://hub.bitwarden.com",
"internalHub": "https://hub.bitwarden.com",
"notifications": "https://notifications.bitwarden.com",
"internalNotifications": "https://notifications.bitwarden.com",
"internalAdmin": "https://admin.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",

4
src/Admin/appsettings.json
View File

@ -9,8 +9,8 @@
"api": "http://localhost:4000",
"identity": "http://localhost:33656",
"admin": "http://localhost:62911",
"hub": "http://localhost:61840",
"internalHub": "http://localhost:61840",
"notifications": "http://localhost:61840",
"internalNotifications": "http://localhost:61840",
"internalAdmin": "http://localhost:62911",
"internalIdentity": "http://localhost:33656",
"internalApi": "http://localhost:4000",

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

@ -5,8 +5,8 @@
"api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com",
"admin": "https://admin.bitwarden.com",
"hub": "https://hub.bitwarden.com",
"internalHub": "https://hub.bitwarden.com",
"notifications": "https://notifications.bitwarden.com",
"internalNotifications": "https://notifications.bitwarden.com",
"internalAdmin": "https://admin.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",

4
src/Api/appsettings.json
View File

@ -9,8 +9,8 @@
"api": "http://localhost:4000",
"identity": "http://localhost:33656",
"admin": "http://localhost:62911",
"hub": "http://localhost:61840",
"internalHub": "http://localhost:61840",
"notifications": "http://localhost:61840",
"internalNotifications": "http://localhost:61840",
"internalAdmin": "http://localhost:62911",
"internalIdentity": "http://localhost:33656",
"internalApi": "http://localhost:4000",

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

@ -5,8 +5,8 @@
"api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com",
"admin": "https://admin.bitwarden.com",
"hub": "https://hub.bitwarden.com",
"internalHub": "https://hub.bitwarden.com",
"notifications": "https://notifications.bitwarden.com",
"internalNotifications": "https://notifications.bitwarden.com",
"internalAdmin": "https://admin.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",

4
src/Billing/appsettings.json
View File

@ -9,8 +9,8 @@
"api": "http://localhost:4000",
"identity": "http://localhost:33656",
"admin": "http://localhost:62911",
"hub": "http://localhost:61840",
"internalHub": "http://localhost:61840",
"notifications": "http://localhost:61840",
"internalNotifications": "http://localhost:61840",
"internalAdmin": "http://localhost:62911",
"internalIdentity": "http://localhost:33656",
"internalApi": "http://localhost:4000",

4
src/Core/GlobalSettings.cs
View File

@ -37,8 +37,8 @@ namespace Bit.Core
public string Api { get; set; }
public string Identity { get; set; }
public string Admin { get; set; }
public string Hub { get; set; }
public string InternalHub { get; set; }
public string Notifications { get; set; }
public string InternalNotifications { get; set; }
public string InternalAdmin { get; set; }
public string InternalIdentity { get; set; }
public string InternalApi { get; set; }

2
src/Core/Services/Implementations/HubApiPushNotificationService.cs
View File

@ -25,7 +25,7 @@ namespace Bit.Core.Services
IHttpContextAccessor httpContextAccessor,
ILogger<HubApiPushNotificationService> logger)
: base(
globalSettings.BaseServiceUri.InternalHub,
globalSettings.BaseServiceUri.InternalNotifications,
globalSettings.BaseServiceUri.InternalIdentity,
"internal",
$"internal.{globalSettings.ProjectName}",

2
src/Core/Services/Implementations/MultiServicePushNotificationService.cs
View File

@ -28,7 +28,7 @@ namespace Bit.Core.Services
_services.Add(new RelayPushNotificationService(globalSettings, httpContextAccessor, relayLogger));
}
if(CoreHelpers.SettingHasValue(globalSettings.InternalIdentityKey) &&
CoreHelpers.SettingHasValue(globalSettings.BaseServiceUri.InternalHub))
CoreHelpers.SettingHasValue(globalSettings.BaseServiceUri.InternalNotifications))
{
// _services.Add(new HubApiPushNotificationService(globalSettings, httpContextAccessor, hubLogger));
}

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

@ -5,8 +5,8 @@
"api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com",
"admin": "https://admin.bitwarden.com",
"hub": "https://hub.bitwarden.com",
"internalHub": "https://hub.bitwarden.com",
"notifications": "https://notifications.bitwarden.com",
"internalNotifications": "https://notifications.bitwarden.com",
"internalAdmin": "https://admin.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",

4
src/Events/appsettings.json
View File

@ -7,8 +7,8 @@
"api": "http://localhost:4000",
"identity": "http://localhost:33656",
"admin": "http://localhost:62911",
"hub": "http://localhost:61840",
"internalHub": "http://localhost:61840",
"notifications": "http://localhost:61840",
"internalNotifications": "http://localhost:61840",
"internalAdmin": "http://localhost:62911",
"internalIdentity": "http://localhost:33656",
"internalApi": "http://localhost:4000",

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

@ -5,8 +5,8 @@
"api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com",
"admin": "https://admin.bitwarden.com",
"hub": "https://hub.bitwarden.com",
"internalHub": "https://hub.bitwarden.com",
"notifications": "https://notifications.bitwarden.com",
"internalNotifications": "https://notifications.bitwarden.com",
"internalAdmin": "https://admin.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",

4
src/Identity/appsettings.json
View File

@ -9,8 +9,8 @@
"api": "http://localhost:4000",
"identity": "http://localhost:33656",
"admin": "http://localhost:62911",
"hub": "http://localhost:61840",
"internalHub": "http://localhost:61840",
"notifications": "http://localhost:61840",
"internalNotifications": "http://localhost:61840",
"internalAdmin": "http://localhost:62911",
"internalIdentity": "http://localhost:33656",
"internalApi": "http://localhost:4000",

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

@ -5,8 +5,8 @@
"api": "https://api.bitwarden.com",
"identity": "https://identity.bitwarden.com",
"admin": "https://admin.bitwarden.com",
"hub": "https://hub.bitwarden.com",
"internalHub": "https://hub.bitwarden.com",
"notifications": "https://notifications.bitwarden.com",
"internalNotifications": "https://notifications.bitwarden.com",
"internalAdmin": "https://admin.bitwarden.com",
"internalIdentity": "https://identity.bitwarden.com",
"internalApi": "https://api.bitwarden.com",

4
src/Notifications/appsettings.json
View File

@ -7,8 +7,8 @@
"api": "http://localhost:4000",
"identity": "http://localhost:33656",
"admin": "http://localhost:62911",
"hub": "http://localhost:61840",
"internalHub": "http://localhost:61840",
"notifications": "http://localhost:61840",
"internalNotifications": "http://localhost:61840",
"internalAdmin": "http://localhost:62911",
"internalIdentity": "http://localhost:33656",
"internalApi": "http://localhost:4000",

6
util/Setup/EnvironmentFileBuilder.cs
View File

@ -42,7 +42,7 @@ namespace Bit.Setup
["globalSettings__baseServiceUri__api"] = $"{Url}/api",
["globalSettings__baseServiceUri__identity"] = $"{Url}/identity",
["globalSettings__baseServiceUri__admin"] = $"{Url}/admin",
["globalSettings__baseServiceUri__hub"] = $"{Url}/hub",
["globalSettings__baseServiceUri__notifications"] = $"{Url}/notifications",
["globalSettings__sqlServer__connectionString"] = $"\"{ dbConnectionString }\"",
["globalSettings__identityServer__certificatePassword"] = IdentityCertPassword,
["globalSettings__attachment__baseDirectory"] = $"{OutputDirectory}/core/attachments",
@ -130,8 +130,8 @@ globalSettings__baseServiceUri__vault=http://localhost
globalSettings__baseServiceUri__api=http://localhost/api
globalSettings__baseServiceUri__identity=http://localhost/identity
globalSettings__baseServiceUri__admin=http://localhost/admin
globalSettings__baseServiceUri__hub=http://localhost/hub
globalSettings__baseServiceUri__internalHub=http://hub:5000
globalSettings__baseServiceUri__notifications=http://localhost/notifications
globalSettings__baseServiceUri__internalNotifications=http://notifications:5000
globalSettings__baseServiceUri__internalAdmin=http://admin:5000
globalSettings__baseServiceUri__internalIdentity=http://identity:5000
globalSettings__baseServiceUri__internalApi=http://api:5000