Single client name system

4 files changed, 11 insertions, 26 deletions

diff --git a/src/main.lib/Clients/EmailClient.cs b/src/main.lib/Clients/EmailClient.cs
index 97d3aac..8c51f0a 100644
--- a/src/main.lib/Clients/EmailClient.cs
+++ b/src/main.lib/Clients/EmailClient.cs
@@ -38,7 +38,7 @@ namespace PKISharp.WACS.Clients
             _senderName = _settings.Notification.SenderName;
             if (string.IsNullOrWhiteSpace(_senderName))
             {
-                _senderName = _settings.Client.ClientName[0];
+                _senderName = _settings.Client.ClientName;
             }
             _senderAddress = _settings.Notification.SenderAddress;
             _receiverAddresses = _settings.Notification.ReceiverAddresses ?? new List<string>();
diff --git a/src/main.lib/Services/Legacy/RegistryLegacyRenewalService.cs b/src/main.lib/Services/Legacy/RegistryLegacyRenewalService.cs
index 8de62dd..0e125e2 100644
--- a/src/main.lib/Services/Legacy/RegistryLegacyRenewalService.cs
+++ b/src/main.lib/Services/Legacy/RegistryLegacyRenewalService.cs
@@ -18,7 +18,7 @@ namespace PKISharp.WACS.Services.Legacy
             base(settings, log)
         {
             _baseUri = main.BaseUri;
-            _clientName = settings.Client.ClientName.Last();
+            _clientName = settings.Client.ClientName;
             _hive = $"HKEY_CURRENT_USER{Key}";
             if (RenewalsRaw == null)
             {
diff --git a/src/main.lib/Services/SettingsService.cs b/src/main.lib/Services/SettingsService.cs
index e28f775..b3b0d9d 100644
--- a/src/main.lib/Services/SettingsService.cs
+++ b/src/main.lib/Services/SettingsService.cs
@@ -82,14 +82,10 @@ namespace PKISharp.WACS.Services
                 // check for possible sub directories with client name
                 // to keep bug-compatible with older releases that
                 // created a subfolder inside of the users chosen config path
-                foreach (var clientName in Client.ClientName)
+                var configRootWithClient = Path.Combine(userRoot, Client.ClientName);
+                if (Directory.Exists(configRootWithClient))
                 {
-                    var configRootWithClient = Path.Combine(userRoot, clientName);
-                    if (Directory.Exists(configRootWithClient))
-                    {
-                        configRoot = configRootWithClient;
-                        break;
-                    }
+                    configRoot = configRootWithClient;
                 }
             }
             else
@@ -103,15 +99,7 @@ namespace PKISharp.WACS.Services
                 if (!Directory.Exists(configRoot))
                 {
                     var appData = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData);
-                    foreach (var clientName in Client.ClientName.AsEnumerable().Reverse())
-                    {
-                        configRoot = Path.Combine(appData, clientName);
-                        if (Directory.Exists(configRoot))
-                        {
-                            // Stop looking if the directory has been found
-                            break;
-                        }
-                    }
+                    configRoot = Path.Combine(appData, Client.ClientName);
                 }
             }
 
diff --git a/src/main.lib/Services/TaskSchedulerService.cs b/src/main.lib/Services/TaskSchedulerService.cs
index 38decfb..069d0a0 100644
--- a/src/main.lib/Services/TaskSchedulerService.cs
+++ b/src/main.lib/Services/TaskSchedulerService.cs
@@ -40,14 +40,11 @@ namespace PKISharp.WACS.Services
             {
                 using (var taskService = new TaskService())
                 {
-                    foreach (var clientName in _settings.Client.ClientName.AsEnumerable().Reverse())
+                    var taskName = TaskName(_settings.Client.ClientName);
+                    var existingTask = taskService.GetTask(taskName);
+                    if (existingTask != null)
                     {
-                        var taskName = TaskName(clientName);
-                        var existingTask = taskService.GetTask(taskName);
-                        if (existingTask != null)
-                        {
-                            return existingTask;
-                        }
+                        return existingTask;
                     }
                 }
                 return null;
@@ -92,7 +89,7 @@ namespace PKISharp.WACS.Services
 
             taskName = existingTask != null ? 
                 existingTask.Name : 
-                TaskName(_settings.Client.ClientName.First());
+                TaskName(_settings.Client.ClientName);
 
             using var taskService = new TaskService();
             if (existingTask != null)