qol: make Online Services Connect more reliable

Disco.Web/App_Start/AppConfig.cs

@@ -90,7 +90,7 @@ namespace Disco.Web
 
             // Connect to Online Services
             if (Database.DiscoConfiguration.IsActivated)
-                ThreadPool.QueueUserWorkItem(async _ => await OnlineServicesConnect.StartAsync());
+                OnlineServicesConnect.QueueStart();
         }
 
         public static void InitializeUpdateEnvironment(DiscoDataContext Database, Version PreviousVersion)

Disco.Web/Areas/API/Controllers/SystemController.cs

@@ -70,6 +70,14 @@ namespace Disco.Web.Areas.API.Controllers
             return RedirectToAction(MVC.Config.Logging.TaskStatus(ts.SessionId));
         }
 
+        [HttpPost, ValidateAntiForgeryToken, DiscoAuthorize(Claims.Config.System.Show)]
+        public virtual ActionResult OnlineServicesConnectStart()
+        {
+            OnlineServicesConnect.QueueStart();
+
+            return RedirectToAction(MVC.Config.SystemConfig.Index());
+        }
+
         #region Organisation
 
         #region Organisation Name

Disco.Web/Areas/Config/Models/SystemConfig/IndexModel.cs

@@ -120,7 +120,7 @@ namespace Disco.Web.Areas.Config.Models.SystemConfig
         public bool IsActivated { get; set; }
         public DateTime? ActivatedOn { get; set; }
         public string ActivatedBy { get; set; }
-        public string OnlineServicesState { get; set; }
+        public OnlineServicesConnect.ConnectionState OnlineServicesState { get; set; }
 
         public ScheduledTaskStatus UpdateRunningStatus { get; set; }
         public DateTime? UpdateNextScheduled { get; set; }

Disco.Web/Areas/Config/Views/SystemConfig/Index.cshtml

@@ -1,4 +1,5 @@
 @model Disco.Web.Areas.Config.Models.SystemConfig.IndexModel
+@using Disco.Services.Interop.DiscoServices
 @{
     Authorization.Require(Claims.Config.System.Show);
 
@@ -83,18 +84,23 @@
 
                     switch (Model.OnlineServicesState)
                     {
-                        case "Disconnected":
+                        case OnlineServicesConnect.ConnectionState.Disconnected:
                             <div class="info-box error">
                                 <p class="fa-p"><i class="fa fa-globe"></i> Disconnected from Online Services</p>
+                                @using (Html.BeginForm(MVC.API.System.OnlineServicesConnectStart()))
+                                {
+                                    @Html.AntiForgeryToken()
+                                    <button type="submit" class="button small">Connect</button>
+                                }
                             </div>
                             break;
-                        case "Connected":
+                        case OnlineServicesConnect.ConnectionState.Connected:
                             <div class="info-box success">
                                 <p class="fa-p"><i class="fa fa-globe"></i> Connected to Online Services</p>
                             </div>
                             break;
-                        case "Connecting":
-                        case "Reconnecting":
+                        case OnlineServicesConnect.ConnectionState.Connecting:
+                        case OnlineServicesConnect.ConnectionState.Reconnecting:
                             <div class="info-box warning">
                                 <p class="fa-p"><i class="fa fa-globe"></i> @Model.OnlineServicesState to Online Services</p>
                             </div>

Disco.Web/Extensions/T4MVC/API.SystemController.generated.cs

@@ -170,6 +170,7 @@ namespace Disco.Web.Areas.API.Controllers
             public readonly string UpdateADDeviceDescriptions = "UpdateADDeviceDescriptions";
             public readonly string LicenseCheck = "LicenseCheck";
             public readonly string UpdateCheck = "UpdateCheck";
+            public readonly string OnlineServicesConnectStart = "OnlineServicesConnectStart";
             public readonly string UpdateOrganisationName = "UpdateOrganisationName";
             public readonly string OrganisationLogo = "OrganisationLogo";
             public readonly string UpdateOrganisationAddress = "UpdateOrganisationAddress";
@@ -196,6 +197,7 @@ namespace Disco.Web.Areas.API.Controllers
             public const string UpdateADDeviceDescriptions = "UpdateADDeviceDescriptions";
             public const string LicenseCheck = "LicenseCheck";
             public const string UpdateCheck = "UpdateCheck";
+            public const string OnlineServicesConnectStart = "OnlineServicesConnectStart";
             public const string UpdateOrganisationName = "UpdateOrganisationName";
             public const string OrganisationLogo = "OrganisationLogo";
             public const string UpdateOrganisationAddress = "UpdateOrganisationAddress";
@@ -443,6 +445,17 @@ namespace Disco.Web.Areas.API.Controllers
             return callInfo;
         }
 
+        [NonAction]
+        partial void OnlineServicesConnectStartOverride(T4MVC_System_Web_Mvc_ActionResult callInfo);
+
+        [NonAction]
+        public override System.Web.Mvc.ActionResult OnlineServicesConnectStart()
+        {
+            var callInfo = new T4MVC_System_Web_Mvc_ActionResult(Area, Name, ActionNames.OnlineServicesConnectStart);
+            OnlineServicesConnectStartOverride(callInfo);
+            return callInfo;
+        }
+
         [NonAction]
         partial void UpdateOrganisationNameOverride(T4MVC_System_Web_Mvc_ActionResult callInfo, string OrganisationName, bool redirect);