Merge pull request #91 from qJake/auth-fix

Fix initial setup bug
qJake · Apr 11, 2020 · 0b5d13d · 0b5d13d
2 parents 0813ab5 + ba2edfc
commit 0b5d13d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Docker/BuildHaccContainers.ps1 b/Docker/BuildHaccContainers.ps1
@@ -1,4 +1,4 @@
-$version = '1.0.17'
+$version = '1.0.18'
 
 function Test-ExitCode ([int] $Expected = 0)
 {

diff --git a/HADotNet.CommandCenter/Controllers/AdminController.cs b/HADotNet.CommandCenter/Controllers/AdminController.cs
@@ -4,6 +4,7 @@
 using HADotNet.CommandCenter.Services.Interfaces;
 using HADotNet.CommandCenter.Utils;
 using HADotNet.CommandCenter.ViewModels;
+using HADotNet.Core;
 using HADotNet.Core.Clients;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -75,6 +76,8 @@ public async Task<IActionResult> Settings()
             {
                 await ConfigStore.ManipulateConfig(c => c.Settings.AccessToken = c.Settings.BaseUri = null);
 
+                ClientFactory.Reset();
+
                 config = await ConfigStore.GetConfigAsync();
 
                 TempData.Remove(AlertManager.GRP_SUCCESS);
@@ -96,9 +99,11 @@ public async Task<IActionResult> Settings([FromForm] SystemSettings newSettings)
                 if (ModelState.IsValid)
                 {
                     newSettings ??= new SystemSettings();
-                    newSettings.BaseUri = newSettings.BaseUri.TrimEnd('/');
+                    newSettings.BaseUri = newSettings.BaseUri?.TrimEnd('/');
                     await ConfigStore.ManipulateConfig(c => c.Settings = newSettings);
 
+                    ClientFactory.Reset();
+
                     TempData["check-settings"] = true;
 
                     return RedirectToAction("Settings");

diff --git a/HADotNet.CommandCenter/HADotNet.CommandCenter.csproj b/HADotNet.CommandCenter/HADotNet.CommandCenter.csproj
@@ -5,8 +5,8 @@
     <RuntimeIdentifiers>win10;alpine.3.10-x64;debian.10-arm</RuntimeIdentifiers>
     <TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <AssemblyVersion>1.0.17.0</AssemblyVersion>
-    <FileVersion>1.0.17.0</FileVersion>
+    <AssemblyVersion>1.0.18.0</AssemblyVersion>
+    <FileVersion>1.0.18.0</FileVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Deterministic>false</Deterministic>