Merge pull request #1120 from ITfoxtec/test

Test

Author: Revsgaard

src/FoxIDs.Control/FoxIDs.Control.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.15.7</Version>
+		<Version>1.15.8</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.15.7</Version>
+		<Version>1.15.8</Version>
 		<RootNamespace>FoxIDs.Client</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

src/FoxIDs.ControlClient/Logic/RouteBindingLogic.cs

@@ -37,7 +37,7 @@ public RouteBindingLogic(ClientSettings clientSettings, IServiceProvider service
             this.authenticationStateProvider = authenticationStateProvider;
         }
 
-        public bool IsMasterTenant => Constants.Routes.MasterTenantName.Equals(tenantName, StringComparison.OrdinalIgnoreCase);
+        public bool IsMasterTenant => Constants.Routes.MasterTenantName.Equals(GetTenantNameLocal(), StringComparison.OrdinalIgnoreCase);
 
         public bool IsMasterTrack => trackSelectedLogic.Track != null && Constants.Routes.MasterTrackName.Equals(trackSelectedLogic.Track.Name, StringComparison.OrdinalIgnoreCase);
 
@@ -76,6 +76,15 @@ public async Task<string> GetTenantNameAsync()
             return tenantName;
         }
 
+        private string GetTenantNameLocal()
+        {
+            if (tenantName.IsNullOrEmpty())
+            {
+                SetTenantName(); 
+            }
+            return tenantName;
+        }
+
         public string GetFoxIDsTenantEndpoint()
         {
             if (trackSelectedLogic.Track != null && !IsMasterTrack && !IsMasterTenant && myTenant != null && myTenant.CustomDomainVerified)
@@ -108,15 +117,20 @@ public string GetBaseUri()
 
         public async Task InitRouteBindingAsync()
         {
-            var urlSplit = navigationManager.ToBaseRelativePath(navigationManager.Uri).Split('/');
-            tenantName = urlSplit[0];
+            SetTenantName();
             await ValidateAndUpdateSessionTenantName();
             if (!IsMasterTenant)
             {
                 await LoadMyTenantAsync();
             }
         }
 
+        public void SetTenantName()
+        {
+            var urlSplit = navigationManager.ToBaseRelativePath(navigationManager.Uri).Split('/');
+            tenantName = urlSplit[0];
+        }
+
         private async Task ValidateAndUpdateSessionTenantName()
         {
             var tenanSession = await sessionStorage.GetItemAsync<string>(tenanSessionKey);

src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.15.7</Version>
+		<Version>1.15.8</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

src/FoxIDs.Shared/FoxIDs.Shared.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.15.7</Version>
+		<Version>1.15.8</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.15.7</Version>
+		<Version>1.15.8</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

src/FoxIDs/FoxIDs.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.15.7</Version>
+		<Version>1.15.8</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>