Cleanup

Author: webprofusion-chrisc

src/Certify.Core/Management/CertifyManager/CertifyManager.ServerType.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -23,6 +23,7 @@ private async Task<ICollection<string>> GetTargetServiceTypes()
             {
                 list.Add(StandardServerTypes.Nginx.ToString());
             }
+
             return list;
         }
 

src/Certify.Core/Management/CertifyManager/CertifyManager.cs

@@ -205,7 +205,7 @@ public async Task Init()
         /// </summary>
         private void SetupJobs()
         {
-            // 1 shot init of async startup dependencyies (e.g. initial connection to mgmt hub instance)
+            // one shot init of async startup dependencies (e.g. initial connection to mgmt hub instance)
             _initTimer = new System.Timers.Timer(2 * 1000); // 2 seconds
             _initTimer.Elapsed += async (s, e) =>
             {

src/Certify.Server/Certify.Server.Hub.Api/Controllers/internal/HubController.cs

@@ -152,15 +152,10 @@ public async Task<IActionResult> GetHubInfo()
 
             hubInfo.InstanceId = hubprefs.InstanceId;
 
-            // TODO: there is probably be a better place to set this
-            _mgmtStateProvider.SetManagementHubInstanceId(hubInfo.InstanceId);
-
             var versionInfo = await _client.GetAppVersion();
 
             hubInfo.Version = new Models.Hub.VersionInfo { Version = versionInfo, Product = "Certify Management Hub" };
 
-            hubInfo.HubEndpoint = "api/internal/managementhub";
-
             return new OkObjectResult(hubInfo);
         }
     }

src/Certify.Server/Certify.Server.HubService/Program.cs

@@ -122,7 +122,7 @@
 // setup public/hub api
 builder.Services.AddSingleton<Certify.Management.ICertifyManager, Certify.Management.CertifyManager>();
 
-builder.Services.AddTransient(typeof(ICertifyInternalApiClient), typeof(CertifyHubService));
+builder.Services.AddTransient(typeof(ICertifyInternalApiClient), typeof(CertifyDirectHubService));
 
 // setup server core
 builder.Services.AddSingleton<IInstanceManagementStateProvider, InstanceManagementStateProvider>();

src/Certify.Server/Certify.Server.HubService/Services/DirectManagementServerClient.cs

@@ -48,6 +48,7 @@ public DirectManagementServerClient(ICertifyManager certifyManager, IServiceProv
         {
             _certifyManager = certifyManager;
             _managementHub = instanceManagementHub;
+
             _instanceInfo = certifyManager.GetManagedInstanceInfo();
         }
 

src/Certify.UI.Shared/Controls/Settings/ManagementHub.xaml.cs

@@ -49,23 +49,14 @@ private async void UserControl_Loaded(object sender, RoutedEventArgs e)
 
         private async void Join_Click(object sender, System.Windows.RoutedEventArgs e)
         {
-            var credentialsCheckResult = await EditModel.MainViewModel.CheckManagementHubCredentials(EditModel.ManagementHubAPIUrl, EditModel.ClientID, EditModel.ClientSecret);
-
-            if (credentialsCheckResult.IsSuccess)
+            var result = await EditModel.MainViewModel.JoinManagementHub(EditModel.ManagementHubAPIUrl, EditModel.ClientID, EditModel.ClientSecret);
+            if (result.IsSuccess)
             {
-                var result = await EditModel.MainViewModel.JoinManagementHub(EditModel.ManagementHubAPIUrl, EditModel.ClientID, EditModel.ClientSecret);
-                if (result.IsSuccess)
-                {
-                    MessageBox.Show("Successfully joined Management Hub.");
-                }
-                else
-                {
-                    MessageBox.Show("Failed to join Management Hub.");
-                }
+                MessageBox.Show("Successfully joined Management Hub.");
             }
             else
             {
-                MessageBox.Show(credentialsCheckResult.Message);
+                MessageBox.Show(result.Message);
             }
         }
     }