Added resilience for lacking configuration

eurofurence · Jan 6, 2021 · 204fc97 · 204fc97
1 parent f43222d
commit 204fc97
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/src/Eurofurence.App.Server.Services/Abstractions/PushNotifications/FirebaseConfiguration.cs b/src/Eurofurence.App.Server.Services/Abstractions/PushNotifications/FirebaseConfiguration.cs
@@ -4,6 +4,7 @@ namespace Eurofurence.App.Server.Services.Abstractions.PushNotifications
 {
     public class FirebaseConfiguration
     {
+        public bool IsConfigured => !string.IsNullOrEmpty(AuthorizationKey);
         public string AuthorizationKey { get; set; }
 
         public static FirebaseConfiguration FromConfiguration(IConfiguration configuration)

diff --git a/src/Eurofurence.App.Server.Services/Abstractions/PushNotifications/WnsConfiguration.cs b/src/Eurofurence.App.Server.Services/Abstractions/PushNotifications/WnsConfiguration.cs
@@ -4,6 +4,10 @@ namespace Eurofurence.App.Server.Services.Abstractions.PushNotifications
 {
     public class WnsConfiguration
     {
+        public bool IsConfigured => !string.IsNullOrEmpty(ClientId) 
+            && !string.IsNullOrEmpty(ClientSecret)
+            && !string.IsNullOrEmpty(TargetTopic);
+
         public string ClientId { get; set; }
         public string ClientSecret { get; set; }
         public string TargetTopic { get; set; }

diff --git a/src/Eurofurence.App.Server.Services/Abstractions/Telegram/TelegramConfiguration.cs b/src/Eurofurence.App.Server.Services/Abstractions/Telegram/TelegramConfiguration.cs
@@ -4,6 +4,7 @@ namespace Eurofurence.App.Server.Services.Abstractions.Telegram
 {
     public class TelegramConfiguration
     {
+        public bool IsConfigured => !string.IsNullOrEmpty(AccessToken);
         public string AccessToken { get; set; }
         public string Proxy { get; set; }
 

diff --git a/src/Eurofurence.App.Server.Services/PushNotifications/FirebaseChannelManager.cs b/src/Eurofurence.App.Server.Services/PushNotifications/FirebaseChannelManager.cs
@@ -41,6 +41,8 @@ private Task<IEnumerable<PushNotificationChannelRecord>> GetRecipientChannelAsyn
 
         public Task PushAnnouncementNotificationAsync(AnnouncementRecord announcement)
         {
+            if (!_configuration.IsConfigured) return Task.CompletedTask;
+
             return Task.WhenAll(
                 SendPushNotificationAsync(new
                 {
@@ -82,6 +84,8 @@ public Task PushAnnouncementNotificationAsync(AnnouncementRecord announcement)
 
         public async Task PushPrivateMessageNotificationAsync(string recipientUid, string toastTitle, string toastMessage, Guid relatedId)
         {
+            if (!_configuration.IsConfigured) return;
+
             var recipients = await GetRecipientChannelAsync(recipientUid);
 
             foreach (var recipient in recipients)
@@ -132,6 +136,8 @@ await SendPushNotificationAsync(new
 
         public Task PushSyncRequestAsync()
         {
+            if (!_configuration.IsConfigured) return Task.CompletedTask;
+
             return Task.WhenAll(
                 SendPushNotificationAsync(new
                 {
@@ -165,7 +171,6 @@ public Task PushSyncRequestAsync()
 
         private async Task SendPushNotificationAsync(object payload)
         {
-
             var jsonPayload = JsonConvert.SerializeObject(payload);
 
             using (var client = new HttpClient())

diff --git a/src/Eurofurence.App.Server.Services/Telegram/BotManager.cs b/src/Eurofurence.App.Server.Services/Telegram/BotManager.cs
@@ -107,9 +107,9 @@ ITelegramMessageBroker telegramMessageBroker
             _conventionSettings = conventionSettings;
             _telegramMessageBroker = telegramMessageBroker;
 
-            if (string.IsNullOrWhiteSpace(telegramConfiguration.AccessToken))
+            if (!telegramConfiguration.IsConfigured)
             {
-                _logger.LogInformation("No access token for Telegram Bot provided - not running bot.");
+                _logger.LogWarning("Telegram configuration not available. Telegram bot will not be run.");
                 return;
             }