Merge pull request #1119 from ITfoxtec/1.15.x-development

Revsgaard · web-flow · commit b99821299c42 · 2025-02-16T16:46:54.000+01:00
Client master not load user profile.
diff --git a/src/FoxIDs.Control/FoxIDs.Control.csproj b/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>
diff --git a/src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj b/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>
diff --git a/src/FoxIDs.ControlClient/Logic/RouteBindingLogic.cs b/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);
diff --git a/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj b/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>
diff --git a/src/FoxIDs.Shared/FoxIDs.Shared.csproj b/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>
diff --git a/src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj b/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>
diff --git a/src/FoxIDs/FoxIDs.csproj b/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>

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public RouteBindingLogic(ClientSettings clientSettings, IServiceProvider service`
`37`	`37`	`this.authenticationStateProvider = authenticationStateProvider;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public bool IsMasterTenant => Constants.Routes.MasterTenantName.Equals(tenantName, StringComparison.OrdinalIgnoreCase);`
	`40`	`+ public bool IsMasterTenant => Constants.Routes.MasterTenantName.Equals(GetTenantNameLocal(), StringComparison.OrdinalIgnoreCase);`
`41`	`41`
`42`	`42`	`public bool IsMasterTrack => trackSelectedLogic.Track != null && Constants.Routes.MasterTrackName.Equals(trackSelectedLogic.Track.Name, StringComparison.OrdinalIgnoreCase);`
`43`	`43`
`@@ -76,6 +76,15 @@ public async Task<string> GetTenantNameAsync()`
`76`	`76`	`return tenantName;`
`77`	`77`	`}`
`78`	`78`
	`79`	`+ private string GetTenantNameLocal()`
	`80`	`+ {`
	`81`	`+ if (tenantName.IsNullOrEmpty())`
	`82`	`+ {`
	`83`	`+ SetTenantName();`
	`84`	`+ }`
	`85`	`+ return tenantName;`
	`86`	`+ }`
	`87`	`+`
`79`	`88`	`public string GetFoxIDsTenantEndpoint()`
`80`	`89`	`{`
`81`	`90`	`if (trackSelectedLogic.Track != null && !IsMasterTrack && !IsMasterTenant && myTenant != null && myTenant.CustomDomainVerified)`
`@@ -108,15 +117,20 @@ public string GetBaseUri()`
`108`	`117`
`109`	`118`	`public async Task InitRouteBindingAsync()`
`110`	`119`	`{`
`111`		`- var urlSplit = navigationManager.ToBaseRelativePath(navigationManager.Uri).Split('/');`
`112`		`- tenantName = urlSplit[0];`
	`120`	`+ SetTenantName();`
`113`	`121`	`await ValidateAndUpdateSessionTenantName();`
`114`	`122`	`if (!IsMasterTenant)`
`115`	`123`	`{`
`116`	`124`	`await LoadMyTenantAsync();`
`117`	`125`	`}`
`118`	`126`	`}`
`119`	`127`
	`128`	`+ public void SetTenantName()`
	`129`	`+ {`
	`130`	`+ var urlSplit = navigationManager.ToBaseRelativePath(navigationManager.Uri).Split('/');`
	`131`	`+ tenantName = urlSplit[0];`
	`132`	`+ }`
	`133`	`+`
`120`	`134`	`private async Task ValidateAndUpdateSessionTenantName()`
`121`	`135`	`{`
`122`	`136`	`var tenanSession = await sessionStorage.GetItemAsync<string>(tenanSessionKey);`