Merge pull request #1053 from ITfoxtec/1.12.x-development

1.12.x development
ITfoxtec · Nov 26, 2024 · a40fc98 · a40fc98
2 parents cb9c3e1 + 60545bc
commit a40fc98
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 14 deletions.
diff --git a/src/FoxIDs.Control/Controllers/Helpers/TDownPartyTestController.cs b/src/FoxIDs.Control/Controllers/Helpers/TDownPartyTestController.cs
@@ -271,21 +271,20 @@ private string GetUpPartyDisplayName(UpPartyLink upParty)
                 throw;
             }
         }
-        private string GetAuthority(string partyName, bool backendCall = false)
+        private string GetAuthority(string partyName)
         {
             var routeBinding = RouteBinding;
-            var useBackendCall = backendCall && !settings.FoxIDsBackendEndpoint.IsNullOrWhiteSpace();
             var useValidCustomDomain = !routeBinding.TrackName.Equals(Constants.Routes.MasterTrackName, StringComparison.OrdinalIgnoreCase) && routeBinding.HasVerifiedCustomDomain;
 
             var urlItems = new List<string>();
-            if (useBackendCall || !useValidCustomDomain)
+            if (!useValidCustomDomain)
             {
                 urlItems.Add(routeBinding.TenantName);
             }
             urlItems.Add(routeBinding.TrackName);
             urlItems.Add($"{partyName}(*)");
 
-            return UrlCombine.Combine(useBackendCall ? settings.FoxIDsBackendEndpoint : (useValidCustomDomain ? $"{HttpContext.Request.Scheme}://{routeBinding.CustomDomain}" : settings.FoxIDsEndpoint), urlItems.ToArray());
+            return UrlCombine.Combine(useValidCustomDomain ? $"{HttpContext.Request.Scheme}://{routeBinding.CustomDomain}" : settings.FoxIDsEndpoint, urlItems.ToArray());
         }
 
         private async Task<(TokenResponse tokenResponse, ClaimsPrincipal idTokenPrincipal, ClaimsPrincipal accessTokenPrincipal)> AcquireTokensAsync(OidcDownParty mParty, string clientSecret, string nonce, string code)
@@ -308,7 +307,7 @@ private string GetAuthority(string partyName, bool backendCall = false)
                 CodeVerifier = mParty.CodeVerifier,
             };
 
-            (var oidcDiscovery, var jsonWebKeySet) = await oidcDiscoveryReadLogic.GetOidcDiscoveryAndValidateAsync(GetAuthority(mParty.Name, backendCall: true));
+            (var oidcDiscovery, var jsonWebKeySet) = await oidcDiscoveryReadLogic.GetOidcDiscoveryAndValidateAsync(GetAuthority(mParty.Name));
 
             var requestDictionary = tokenRequest.ToDictionary().AddToDictionary(clientCredentials).AddToDictionary(codeVerifierSecret);
 

diff --git a/src/FoxIDs.Control/FoxIDs.Control.csproj b/src/FoxIDs.Control/FoxIDs.Control.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.12.5</Version>
+		<Version>1.12.6</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>net8.0</TargetFramework>
-		<Version>1.12.5</Version>
+		<Version>1.12.6</Version>
 		<RootNamespace>FoxIDs.Client</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs.ControlClient/Pages/Components/ELoginUpParty.cs b/src/FoxIDs.ControlClient/Pages/Components/ELoginUpParty.cs
@@ -1,16 +1,15 @@
 using FoxIDs.Client.Models.ViewModels;
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using FoxIDs.Infrastructure;
 using FoxIDs.Client.Services;
 using Microsoft.AspNetCore.Components.Forms;
 using ITfoxtec.Identity.BlazorWebAssembly.OpenidConnect;
 using FoxIDs.Client.Infrastructure.Security;
 using FoxIDs.Models.Api;
-using System.Collections.Generic;
 using ITfoxtec.Identity;
 using System.Net.Http;
+using System.Linq;
 
 namespace FoxIDs.Client.Pages.Components
 {
@@ -62,6 +61,18 @@ private LoginUpPartyViewModel ToViewModel(LoginUpParty loginUpParty)
                 {
                     afterMap.CreateUser.ClaimTransforms = afterMap.CreateUser.ClaimTransforms.MapOAuthClaimTransforms();
                 }
+
+                if (afterMap.CreateUser.Elements?.Any() == true)
+                {
+                    foreach (var element in afterMap.CreateUser.Elements)
+                    {
+                        if (element.Type == DynamicElementTypes.EmailAndPassword)
+                        {
+                            element.IsStaticRequired = true;
+                            element.Required = true;
+                        }
+                    }
+                }
             });           
         }
 

diff --git a/src/FoxIDs.ControlClient/Pages/Components/UpPartyBase.cs b/src/FoxIDs.ControlClient/Pages/Components/UpPartyBase.cs
@@ -130,6 +130,7 @@ private void InitCreateUser(GeneralLoginUpPartyViewModel generalLoginUpParty)
                     if (element.Type == DynamicElementTypes.EmailAndPassword)
                     {
                         element.IsStaticRequired = true;
+                        element.Required = true;
                     }
                 }
             }

diff --git a/src/FoxIDs.ControlClient/Shared/Components/FInputToggle.razor b/src/FoxIDs.ControlClient/Shared/Components/FInputToggle.razor
@@ -74,6 +74,11 @@
 
     private async Task ToggleCurrentValueAsync()
     {
+        if (Disabled) 
+        {
+            return;
+        }
+
         var oldCurrentValue = CurrentValue;
         if (CurrentValue == true)
         {

diff --git a/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj b/src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
-		<Version>1.12.5</Version>
+		<Version>1.12.6</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>net8.0</TargetFramework>
-		<Version>1.12.5</Version>
+		<Version>1.12.6</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>net8.0</TargetFramework>
-		<Version>1.12.5</Version>
+		<Version>1.12.6</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>net8.0</TargetFramework>
-		<Version>1.12.5</Version>
+		<Version>1.12.6</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>ITfoxtec</Company>

diff --git a/src/FoxIDs/Logic/Tracks/SendEmailLogic.cs b/src/FoxIDs/Logic/Tracks/SendEmailLogic.cs
@@ -179,7 +179,7 @@ private SendEmail GetSettings()
             {
                 return new SendEmail
                 {
-                    FromName =settings.Smtp.FromName,
+                    FromName = settings.Smtp.FromName,
                     FromEmail = settings.Smtp.FromEmail,
                     SmtpHost = settings.Smtp.Host,
                     SmtpPort = settings.Smtp.Port,
-Original file line number
+Diff line change
@@ Expand Up @@
                         if (element.Type == DynamicElementTypes.EmailAndPassword)
                         {
                             element.IsStaticRequired = true;
+                            element.Required = true;
                         }
                     }
                 }
@@ Expand Down @@