From 1ffa712b7570179de3adc681009a8ce797b4bfbd Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 16 Aug 2018 13:50:41 -0400 Subject: [PATCH] more notification hub renames --- src/Admin/appsettings.Production.json | 4 ++-- src/Admin/appsettings.json | 4 ++-- src/Api/appsettings.Production.json | 4 ++-- src/Api/appsettings.json | 4 ++-- src/Billing/appsettings.Production.json | 4 ++-- src/Billing/appsettings.json | 4 ++-- src/Core/GlobalSettings.cs | 4 ++-- .../Implementations/HubApiPushNotificationService.cs | 2 +- .../Implementations/MultiServicePushNotificationService.cs | 2 +- src/Events/appsettings.Production.json | 4 ++-- src/Events/appsettings.json | 4 ++-- src/Identity/appsettings.Production.json | 4 ++-- src/Identity/appsettings.json | 4 ++-- src/Notifications/appsettings.Production.json | 4 ++-- src/Notifications/appsettings.json | 4 ++-- util/Setup/EnvironmentFileBuilder.cs | 6 +++--- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/Admin/appsettings.Production.json b/src/Admin/appsettings.Production.json index 0b7bb7faef..5ea6892d03 100644 --- a/src/Admin/appsettings.Production.json +++ b/src/Admin/appsettings.Production.json @@ -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", diff --git a/src/Admin/appsettings.json b/src/Admin/appsettings.json index 931682f7fc..8c66947b49 100644 --- a/src/Admin/appsettings.json +++ b/src/Admin/appsettings.json @@ -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", diff --git a/src/Api/appsettings.Production.json b/src/Api/appsettings.Production.json index 0b7bb7faef..5ea6892d03 100644 --- a/src/Api/appsettings.Production.json +++ b/src/Api/appsettings.Production.json @@ -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", diff --git a/src/Api/appsettings.json b/src/Api/appsettings.json index 06a5d57ee0..b17929bc08 100644 --- a/src/Api/appsettings.json +++ b/src/Api/appsettings.json @@ -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", diff --git a/src/Billing/appsettings.Production.json b/src/Billing/appsettings.Production.json index 0b7bb7faef..5ea6892d03 100644 --- a/src/Billing/appsettings.Production.json +++ b/src/Billing/appsettings.Production.json @@ -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", diff --git a/src/Billing/appsettings.json b/src/Billing/appsettings.json index ac43dc17dd..82c91ba599 100644 --- a/src/Billing/appsettings.json +++ b/src/Billing/appsettings.json @@ -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", diff --git a/src/Core/GlobalSettings.cs b/src/Core/GlobalSettings.cs index dfe40e4fa9..ba8dc3f86e 100644 --- a/src/Core/GlobalSettings.cs +++ b/src/Core/GlobalSettings.cs @@ -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; } diff --git a/src/Core/Services/Implementations/HubApiPushNotificationService.cs b/src/Core/Services/Implementations/HubApiPushNotificationService.cs index 610785d075..54a4717fe7 100644 --- a/src/Core/Services/Implementations/HubApiPushNotificationService.cs +++ b/src/Core/Services/Implementations/HubApiPushNotificationService.cs @@ -25,7 +25,7 @@ namespace Bit.Core.Services IHttpContextAccessor httpContextAccessor, ILogger logger) : base( - globalSettings.BaseServiceUri.InternalHub, + globalSettings.BaseServiceUri.InternalNotifications, globalSettings.BaseServiceUri.InternalIdentity, "internal", $"internal.{globalSettings.ProjectName}", diff --git a/src/Core/Services/Implementations/MultiServicePushNotificationService.cs b/src/Core/Services/Implementations/MultiServicePushNotificationService.cs index 7c83e45bc1..7550932d34 100644 --- a/src/Core/Services/Implementations/MultiServicePushNotificationService.cs +++ b/src/Core/Services/Implementations/MultiServicePushNotificationService.cs @@ -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)); } diff --git a/src/Events/appsettings.Production.json b/src/Events/appsettings.Production.json index 1a13dcf181..c0717e38e3 100644 --- a/src/Events/appsettings.Production.json +++ b/src/Events/appsettings.Production.json @@ -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", diff --git a/src/Events/appsettings.json b/src/Events/appsettings.json index 3d94343d64..eacfc1892c 100644 --- a/src/Events/appsettings.json +++ b/src/Events/appsettings.json @@ -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", diff --git a/src/Identity/appsettings.Production.json b/src/Identity/appsettings.Production.json index 0b7bb7faef..5ea6892d03 100644 --- a/src/Identity/appsettings.Production.json +++ b/src/Identity/appsettings.Production.json @@ -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", diff --git a/src/Identity/appsettings.json b/src/Identity/appsettings.json index 07d1a939c6..24f173eb3e 100644 --- a/src/Identity/appsettings.json +++ b/src/Identity/appsettings.json @@ -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", diff --git a/src/Notifications/appsettings.Production.json b/src/Notifications/appsettings.Production.json index 1a13dcf181..c0717e38e3 100644 --- a/src/Notifications/appsettings.Production.json +++ b/src/Notifications/appsettings.Production.json @@ -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", diff --git a/src/Notifications/appsettings.json b/src/Notifications/appsettings.json index 507901b23d..7a817d365b 100644 --- a/src/Notifications/appsettings.json +++ b/src/Notifications/appsettings.json @@ -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", diff --git a/util/Setup/EnvironmentFileBuilder.cs b/util/Setup/EnvironmentFileBuilder.cs index 3f73500230..e3768ea833 100644 --- a/util/Setup/EnvironmentFileBuilder.cs +++ b/util/Setup/EnvironmentFileBuilder.cs @@ -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