From e1efe3e7c04b4ef76726a0c38a651d077153fb12 Mon Sep 17 00:00:00 2001
From: Shawn Jackson <shawn@resgrid.com>
Date: Sun, 12 May 2024 07:20:32 -0700
Subject: [PATCH] CU-8687yhbz5 fixing issue with config

---
 Core/Resgrid.Config/ConfigProcessor.cs |  18 ++--
 Core/Resgrid.Config/ResgridConfig.json | 114 -------------------------
 2 files changed, 9 insertions(+), 123 deletions(-)
 delete mode 100644 Core/Resgrid.Config/ResgridConfig.json

diff --git a/Core/Resgrid.Config/ConfigProcessor.cs b/Core/Resgrid.Config/ConfigProcessor.cs
index d275aa3c..93eff2b9 100644
--- a/Core/Resgrid.Config/ConfigProcessor.cs
+++ b/Core/Resgrid.Config/ConfigProcessor.cs
@@ -78,9 +78,9 @@ public static bool LoadAndProcessEnvVariables(IEnumerable<KeyValuePair<string, s
 
 			bool hasSetAtLeastOneVariable = false;
 
-			try
+			foreach (var configValue in values)
 			{
-				foreach (var configValue in values)
+				try
 				{
 					if (!String.IsNullOrWhiteSpace(configValue.Value) && configValue.Key.StartsWith("RESGRID"))
 					{
@@ -120,14 +120,14 @@ public static bool LoadAndProcessEnvVariables(IEnumerable<KeyValuePair<string, s
 						}
 					}
 				}
-
-				return hasSetAtLeastOneVariable;
-
-			}
-			catch (Exception ex)
-			{
-				return false;
+				catch (Exception ex)
+				{
+					Console.WriteLine($"Resgrid.Config: Error processing Environment Variable: {configValue.Key}");
+					Console.WriteLine(ex.ToString());
+				}
 			}
+
+			return hasSetAtLeastOneVariable;
 		}
 	}
 }
diff --git a/Core/Resgrid.Config/ResgridConfig.json b/Core/Resgrid.Config/ResgridConfig.json
deleted file mode 100644
index 6b42dc74..00000000
--- a/Core/Resgrid.Config/ResgridConfig.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-  "InfoConfig.ConfigVersion": "1",
-
-  "DataConfig.ConnectionString": "Server=rgdevserver;Database=Resgrid;User Id=resgrid_app;Password=resgrid123;MultipleActiveResultSets=True;",
-
-  "SystemBehaviorConfig.ResgridBaseUrl": "https://resgrid.local",
-  "SystemBehaviorConfig.ResgridApiBaseUrl": "https://resgridapi.local",
-  "SystemBehaviorConfig.ResgridEventingBaseUrl": "https://rgdevinfaserver.local",
-  "SystemBehaviorConfig.DoNotBroadcast": "false",
-  "SystemBehaviorConfig.RedirectHomeToLogin": "true",
-  "SystemBehaviorConfig.IsAzure": "false",
-  "SystemBehaviorConfig.CacheEnabled": "true",
-  "SystemBehaviorConfig.UseInternalCache": "true",
-  "SystemBehaviorConfig.ExternalLinkUrlParamPassphrase": "NvM28Q8EJejQSdxS",
-  "SystemBehaviorConfig.ExternalAudioUrlParamPasshprase": "5a4tALka7bz6h4CY",
-  "SystemBehaviorConfig.ApiTokenEncryptionPassphrase": "exjk3TB)&3ky`sWUH}y!r$x#6jsEX'H-UDQn6(v=w:#*#Pr",
-  "SystemBehaviorConfig.APITokenMonthsTTL": "1",
-  "SystemBehaviorConfig.ServiceBusType": "1",
-  "SystemBehaviorConfig.ErrorLoggerType": "0",
-  "SystemBehaviorConfig.OutboundEmailType": "1",
-  "SystemBehaviorConfig.SiteKey": "",
-
-  "SymmetricEncryptionConfig.Iterations": "2",
-  "SymmetricEncryptionConfig.KeySize": "256",
-  "SymmetricEncryptionConfig.HashAlgorithm": "SHA1",
-  "SymmetricEncryptionConfig.InitVector": "A+L!B*DJud7Vb2*u",
-  "SymmetricEncryptionConfig.SaltValue": ")C9X!&}4~Dg6!H<=uj+BGW>Df$/D97(K}b$uJ>&STKepy[#L+Rc=Nf6dnGL,#@8b)",
-
-  "OutboundEmailServerConfig.FromMail": "do-not-reply@yourcompany.local",
-  "OutboundEmailServerConfig.ToMail": "administrator@yourcompany.local",
-  "OutboundEmailServerConfig.Host": "localhost",
-  "OutboundEmailServerConfig.EnableSsl": "false",
-  "OutboundEmailServerConfig.Port": "25",
-  "OutboundEmailServerConfig.UserName": "",
-  "OutboundEmailServerConfig.Password": "",
-  "OutboundEmailServerConfig.PostmarkApiKey": "",
-  "OutboundEmailServerConfig.AwsAccessKey": "",
-  "OutboundEmailServerConfig.AwsSecretKey": "",
-  "OutboundEmailServerConfig.PostmarkCallEmailTemplateId": "",
-  "OutboundEmailServerConfig.PostmarkTroubleAlertTemplateId": "",
-  "OutboundEmailServerConfig.PostmarkInviteTemplateId": "",
-  "OutboundEmailServerConfig.PostmarkMessageTemplateId": "",
-  "OutboundEmailServerConfig.PostmarkResetPasswordTemplateId": "",
-  "OutboundEmailServerConfig.PostmarkWelcomeTemplateId": "",
-  "OutboundEmailServerConfig.PostmarkNewDepLinkTemplateId": "",
-
-  "WorkerConfig.WorkerDbConnectionString": "Server=rgdevserver;Database=ResgridWorkers;User Id=resgrid_app;Password=resgrid123;MultipleActiveResultSets=True;",
-  "WorkerConfig.PayloadKey": "XsBYpdbdHkhuGsU3tvTMawyV6d3M2F8EQ8wQ2jVLBREECQmwngACk2hm4Ykb7eW7Qsm6za8RdJBY5Z3xvN6erYry47nJ5XmL",
-
-  "ServiceBusConfig.RabbitHostname": "localhost",
-  "ServiceBusConfig.RabbitUsername": "resgrid",
-  "ServiceBusConfig.RabbbitPassword": "resgrid!",
-  "ServiceBusConfig.RabbbitExchange": "",
-  "ServiceBusConfig.SignalRServiceBusConnectionString": "",
-  "ServiceBusConfig.SignalRTopicName": "",
-  "ServiceBusConfig.AzureQueueSystemConnectionString": "",
-  "ServiceBusConfig.SystemQueueName": "",
-  "ServiceBusConfig.AzureEventingTopicConnectionString": "",
-  "ServiceBusConfig.EventingTopicQueueName": "",
-  "ServiceBusConfig.AzureNotificationHub_FullConnectionString": "",
-  "ServiceBusConfig.AzureNotificationHub_PushUrl": "",
-  "ServiceBusConfig.AzureServiceBusConnectionString": "",
-  "ServiceBusConfig.AzureServiceBusWorkerConnectionString": "",
-  "ServiceBusConfig.AzureQueueConnectionString": "",
-  "ServiceBusConfig.AzureQueueMessageConnectionString": "",
-  "ServiceBusConfig.AzureQueueNotificationConnectionString": "",
-  "ServiceBusConfig.AzureQueueShiftsConnectionString": "",
-  "ServiceBusConfig.AzureQueueEmailConnectionString": "",
-  "ServiceBusConfig.AzureUnitNotificationHub_FullConnectionString": "",
-  "ServiceBusConfig.AzureUnitNotificationHub_PushUrl": "",
-
-  "NumberProviderConfig.NexmoApiKey": "",
-  "NumberProviderConfig.NexmoApiSecret": "",
-  "NumberProviderConfig.BaseNexmoUrl": "",
-  "NumberProviderConfig.TwilioAccountSid": "",
-  "NumberProviderConfig.TwilioAuthToken": "",
-  "NumberProviderConfig.TwilioResgridNumber": "",
-  "NumberProviderConfig.TwilioApiUrl": "",
-  "NumberProviderConfig.TwilioVoiceCallApiTurl": "",
-  "NumberProviderConfig.TwilioVoiceApiUrl": "",
-  "NumberProviderConfig.DiafaanSmsGatewayUrl": "",
-  "NumberProviderConfig.DiafaanSmsGatewayUserName": "",
-  "NumberProviderConfig.DiafaanSmsGatewayPassword": "",
-
-  "MappingConfig.GoogleMapsApiKey": "",
-  "MappingConfig.GoogleMapsJSKey": "",
-  "MappingConfig.BingMapsApiKey": "",
-  "MappingConfig.What3WordsApiKey": "",
-  "MappingConfig.LocationIQApiKey": "",
-  "MappingConfig.OSMKey": "",
-  "MappingConfig.LoqateApiUrl": "",
-  "MappingConfig.LoqateApiKey": "",
-
-  "MappingConfig.BitlyAccessToken": "",
-
-  "InboundEmailConfig.DispatchDomain": "",
-  "InboundEmailConfig.DispatchTestDomain": "",
-  "InboundEmailConfig.ListsDomain": "",
-  "InboundEmailConfig.ListsTestDomain": "",
-  "InboundEmailConfig.GroupsDomain": "",
-  "InboundEmailConfig.GroupsTestDomain": "",
-  "InboundEmailConfig.GroupMessageDomain": "",
-  "InboundEmailConfig.GroupTestMessageDomain": "",
-
-  "FirebaseConfig.ResponderProjectId": "",
-  "FirebaseConfig.ResponderProjectEmail": "",
-  "FirebaseConfig.ResponderJsonFile": "",
-
-  "ExternalErrorConfig.ElkServiceUrl": "http://localhost:9200",
-  "ExternalErrorConfig.ExternalErrorServiceUrl": "",
-  "ExternalErrorConfig.ExternalErrorServiceUrlForWebsite": "",
-
-  "CacheConfig.RedisConnectionString": "rgdevinfaserver,abortConnect=false,syncTimeout=10000"
-}