Merge pull request #1317 from ITfoxtec/test

Revsgaard · web-flow · commit ffa51b1411c4 · 2025-09-23T22:37:40.000+02:00
Test
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>2.5.2</Version>
+		<Version>2.5.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</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>2.5.2</Version>
+		<Version>2.5.3</Version>
 		<RootNamespace>FoxIDs.Client</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>
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>2.5.2</Version>
+		<Version>2.5.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</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>2.5.2</Version>
+		<Version>2.5.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>
diff --git a/src/FoxIDs.Shared/Models/Base/IUiLoginUpParty.cs b/src/FoxIDs.Shared/Models/Base/IUiLoginUpParty.cs
@@ -1,4 +1,6 @@
-﻿namespace FoxIDs.Models
+﻿using System.Collections.Generic;
+
+namespace FoxIDs.Models
 {
     public interface IUiLoginUpParty : IDataDocument
     {
@@ -7,5 +9,7 @@ public interface IUiLoginUpParty : IDataDocument
         public string Title { get; set; }
         public string IconUrl { get; set; }
         string Css { get; set; }
+
+        public List<DynamicElement> Elements { get; set; }
     }
 }
diff --git a/src/FoxIDs.Shared/Models/Base/UiLoginUpPartyData.cs b/src/FoxIDs.Shared/Models/Base/UiLoginUpPartyData.cs
@@ -1,4 +1,6 @@
-﻿using Newtonsoft.Json;
+﻿using FoxIDs.Infrastructure.DataAnnotations;
+using Newtonsoft.Json;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 namespace FoxIDs.Models
@@ -38,5 +40,9 @@ public bool? DisableResetPassword
         [MaxLength(Constants.Models.LoginUpParty.CssStyleLength)]
         [JsonProperty(PropertyName = "css")]
         public string Css { get; set; }
+
+        [ListLength(Constants.Models.DynamicElements.ElementsMin, Constants.Models.DynamicElements.ElementsMax)]
+        [JsonProperty(PropertyName = "login_elements")]
+        public List<DynamicElement> Elements { get; set; }
     }
 }
diff --git a/src/FoxIDs.Shared/Models/Parties/ExternalLoginUpParty.cs b/src/FoxIDs.Shared/Models/Parties/ExternalLoginUpParty.cs
@@ -46,6 +46,9 @@ public ExternalLoginUpParty()
         [JsonProperty(PropertyName = "logout_consent")]
         public LoginUpPartyLogoutConsents LogoutConsent { get; set; }
 
+        [JsonProperty(PropertyName = "disable_set_password")]
+        public bool DisableSetPassword { get; set; }
+
         [ListLength(Constants.Models.OAuthUpParty.Client.ClaimsMin, Constants.Models.OAuthUpParty.Client.ClaimsMax, Constants.Models.Claim.JwtTypeLength, Constants.Models.Claim.JwtTypeWildcardRegExPattern)]
         [JsonProperty(PropertyName = "claims")]
         public List<string> Claims { get; set; }
@@ -67,8 +70,9 @@ public ExternalLoginUpParty()
         [JsonProperty(PropertyName = "css")]
         public string Css { get; set; }
 
-        [JsonProperty(PropertyName = "disable_set_password")]
-        public bool DisableSetPassword { get; set; }
+        [ListLength(Constants.Models.DynamicElements.ElementsMin, Constants.Models.DynamicElements.ElementsMax)]
+        [JsonProperty(PropertyName = "login_elements")]
+        public List<DynamicElement> Elements { get; set; }
 
         public override IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
         {
diff --git a/src/FoxIDs.Shared/Models/Parties/LoginUpParty.cs b/src/FoxIDs.Shared/Models/Parties/LoginUpParty.cs
@@ -110,7 +110,7 @@ public bool? DisableResetPassword
 
         [ListLength(Constants.Models.DynamicElements.ElementsMin, Constants.Models.DynamicElements.ElementsMax)]
         [JsonProperty(PropertyName = "login_elements")]
-        public List<DynamicElement> Elements { get; set; } = new List<DynamicElement>();
+        public List<DynamicElement> Elements { get; set; }
 
         [ValidateComplexType]
         [JsonProperty(PropertyName = "create_user")]
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>2.5.2</Version>
+		<Version>2.5.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>
diff --git a/src/FoxIDs/Controllers/ExtController.cs b/src/FoxIDs/Controllers/ExtController.cs
@@ -7,7 +7,6 @@
 using FoxIDs.Repository;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Localization;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
@@ -19,18 +18,16 @@ public class ExtController : EndpointController
     {
         private readonly TelemetryScopedLogger logger;
         private readonly IServiceProvider serviceProvider;
-        private readonly IStringLocalizer localizer;
         private readonly ITenantDataRepository tenantDataRepository;
         private readonly SequenceLogic sequenceLogic;
         private readonly SecurityHeaderLogic securityHeaderLogic;
         private readonly ExternalUserLogic externalUserLogic;
         private readonly DynamicElementLogic dynamicElementLogic;
 
-        public ExtController(TelemetryScopedLogger logger, IServiceProvider serviceProvider, IStringLocalizer localizer, ITenantDataRepository tenantDataRepository, SequenceLogic sequenceLogic, SecurityHeaderLogic securityHeaderLogic, ExternalUserLogic externalUserLogic, DynamicElementLogic dynamicElementLogic) : base(logger)
+        public ExtController(TelemetryScopedLogger logger, IServiceProvider serviceProvider, ITenantDataRepository tenantDataRepository, SequenceLogic sequenceLogic, SecurityHeaderLogic securityHeaderLogic, ExternalUserLogic externalUserLogic, DynamicElementLogic dynamicElementLogic) : base(logger)
         {
             this.logger = logger;
             this.serviceProvider = serviceProvider;
-            this.localizer = localizer;
             this.tenantDataRepository = tenantDataRepository;
             this.sequenceLogic = sequenceLogic;
             this.securityHeaderLogic = securityHeaderLogic;
@@ -63,7 +60,7 @@ public async Task<IActionResult> CreateUser()
                     Title = loginUpParty.Title ?? RouteBinding.DisplayName,
                     IconUrl = loginUpParty.IconUrl,
                     Css = loginUpParty.Css,
-                    ExtElements = dynamicElementLogic.ToUiElementsViewModel(externalUserUpParty.LinkExternalUser.Elements, initClaims: sequenceData.Claims?.ToClaimList()).ToList(),
+                    InputElements = dynamicElementLogic.ToUiElementsViewModel(externalUserUpParty.LinkExternalUser.Elements, initClaims: sequenceData.Claims?.ToClaimList()).ToList(),
                     Elements = dynamicElementLogic.GetLoginElementsViewModel(loginUpParty)
                 });
 
@@ -91,7 +88,7 @@ public async Task<IActionResult> CreateUser(CreateExternalUserViewModel createEx
                 securityHeaderLogic.AddImgSrc(loginUpParty);
                 securityHeaderLogic.AddImgSrcFromDynamicElements(externalUserUpParty.LinkExternalUser?.Elements);
 
-                createExternalUser.ExtElements = dynamicElementLogic.ToUiElementsViewModel(externalUserUpParty.LinkExternalUser.Elements, valueElements: createExternalUser.ExtElements).ToList();
+                createExternalUser.InputElements = dynamicElementLogic.ToUiElementsViewModel(externalUserUpParty.LinkExternalUser.Elements, valueElements: createExternalUser.InputElements).ToList();
 
                 Func<IActionResult> viewError = () =>
                 {
@@ -104,15 +101,15 @@ public async Task<IActionResult> CreateUser(CreateExternalUserViewModel createEx
                 };
 
                 ModelState.Clear();
-                await dynamicElementLogic.ValidateViewModelElementsAsync(ModelState, createExternalUser.ExtElements);
+                await dynamicElementLogic.ValidateViewModelElementsAsync(ModelState, createExternalUser.InputElements);
                 if (!ModelState.IsValid)
                 {
                     return viewError();
                 }
 
                 logger.ScopeTrace(() => "Create external user post.");
 
-                (var dynamicElementClaims, _) = dynamicElementLogic.GetClaims(createExternalUser.ExtElements);
+                (var dynamicElementClaims, _) = dynamicElementLogic.GetClaims(createExternalUser.InputElements);
                 (var externalAccountClaims, var actionResult) = await externalUserLogic.CreateUserAsync(externalUserUpParty, sequenceData, sequenceData.LinkClaimValue, sequenceData.Claims?.ToClaimList(), dynamicElementClaims);
                 if (actionResult != null)
                 {
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>2.5.2</Version>
+		<Version>2.5.3</Version>
 		<RootNamespace>FoxIDs</RootNamespace>
 		<Authors>Anders Revsgaard</Authors>
 		<Company>FoxIDs</Company>
diff --git a/src/FoxIDs/Logic/SecurityHeaderLogic.cs b/src/FoxIDs/Logic/SecurityHeaderLogic.cs
@@ -43,6 +43,8 @@ public void AddImgSrc(IUiLoginUpParty uiLoginUpParty)
                 uiLoginUpParty.Css = cssCommentRegex.Replace(uiLoginUpParty.Css, string.Empty).Trim();
                 AddImgSrcFromCss(uiLoginUpParty.Css);
             }
+
+            AddImgSrcFromDynamicElements(uiLoginUpParty.Elements);
         }
 
         public void AddImgSrc(string url)
diff --git a/src/FoxIDs/Logic/Tracks/DynamicElementLogic.cs b/src/FoxIDs/Logic/Tracks/DynamicElementLogic.cs
@@ -17,13 +17,11 @@ namespace FoxIDs.Logic
     public class DynamicElementLogic : LogicBase
     {
         private readonly CountryCodesLogic countryCodesLogic;
-        private readonly SecurityHeaderLogic securityHeaderLogic;
         private readonly IStringLocalizer localizer;
 
-        public DynamicElementLogic(CountryCodesLogic countryCodesLogic, SecurityHeaderLogic securityHeaderLogic, IStringLocalizer localizer, IHttpContextAccessor httpContextAccessor) : base(httpContextAccessor)
+        public DynamicElementLogic(CountryCodesLogic countryCodesLogic, IStringLocalizer localizer, IHttpContextAccessor httpContextAccessor) : base(httpContextAccessor)
         {
             this.countryCodesLogic = countryCodesLogic;
-            this.securityHeaderLogic = securityHeaderLogic;
             this.localizer = localizer;
         }
 
@@ -97,7 +95,6 @@ public IEnumerable<DynamicElementBase> ToUiElementsViewModel(List<DynamicElement
         public List<DynamicElementBase> GetLoginElementsViewModel(LoginUpParty loginUpParty)
         {
             var elements = EnsureLoginElements(loginUpParty.Elements);
-            securityHeaderLogic.AddImgSrcFromDynamicElements(elements);
             return ToLoginElementsViewModel(elements);
         }
 
@@ -241,11 +238,11 @@ public async Task ValidateViewModelElementsAsync(ModelStateDictionary modelState
             var index = 0;
             foreach (var element in elements)
             {
-                await ValidateViewModelElementAsync(modelState, element, index);
+                index = await ValidateViewModelElementAsync(modelState, element, index);
             }
         }
 
-        public async Task ValidateViewModelElementAsync(ModelStateDictionary modelState, DynamicElementBase element, int index)
+        public async Task<int> ValidateViewModelElementAsync(ModelStateDictionary modelState, DynamicElementBase element, int index)
         {
             string phoneTempValue = null;
             if (element is PhoneDElement)
@@ -283,6 +280,8 @@ public async Task ValidateViewModelElementAsync(ModelStateDictionary modelState,
             {
                 element.DField1 = phoneTempValue;
             }
+
+            return index;
         }
 
         public void SetModelElementError(ModelStateDictionary modelState, List<DynamicElementBase> elements, string name, string errorMessage)
diff --git a/src/FoxIDs/Models/ViewModels/Ext/CreateExternalUserViewModel.cs b/src/FoxIDs/Models/ViewModels/Ext/CreateExternalUserViewModel.cs
@@ -6,7 +6,7 @@ public class CreateExternalUserViewModel : ViewModel
     {
         public string SequenceString { get; set; }
 
-        public List<DynamicElementBase> ExtElements { get; set; }
+        public List<DynamicElementBase> InputElements { get; set; }
 
         public List<DynamicElementBase> Elements { get; set; }
     }
diff --git a/src/FoxIDs/Views/Ext/CreateUser.cshtml b/src/FoxIDs/Views/Ext/CreateUser.cshtml
@@ -17,7 +17,7 @@
             {
                 if (element is LoginInputDElement)
                 {
-                    await Html.RenderPartialAsync("_DynamicElements", Model.ExtElements);
+                    await Html.RenderPartialAsync("_DynamicElements", Model.InputElements);
                 }
                 else if (element is LoginButtonDElement)
                 {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace FoxIDs.Models`
	`1`	`+using System.Collections.Generic;`
	`2`	`+`
	`3`	`+namespace FoxIDs.Models`
`2`	`4`	`{`
`3`	`5`	`public interface IUiLoginUpParty : IDataDocument`
`4`	`6`	`{`
`@@ -7,5 +9,7 @@ public interface IUiLoginUpParty : IDataDocument`
`7`	`9`	`public string Title { get; set; }`
`8`	`10`	`public string IconUrl { get; set; }`
`9`	`11`	`string Css { get; set; }`
	`12`	`+`
	`13`	`+ public List<DynamicElement> Elements { get; set; }`
`10`	`14`	`}`
`11`	`15`	`}`