Skip to content

Test #1247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 3, 2025
Merged

Test #1247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f04ad71
Token request with basic auth client credentials require client_id, s…
Revsgaard Jul 3, 2025
e17f638
HandleClaimTransformationSecretLoginUpPartyAsync accept null.
Revsgaard Jul 3, 2025
ded14f2
Version 2.0.11
Revsgaard Jul 3, 2025
b88a768
Merge pull request #1246 from ITfoxtec/1.20.x-development
Revsgaard Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/FoxIDs.Control/FoxIDs.Control.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Version>2.0.10</Version>
<Version>2.0.11</Version>
<RootNamespace>FoxIDs</RootNamespace>
<Authors>Anders Revsgaard</Authors>
<Company>FoxIDs</Company>
Expand Down
38 changes: 19 additions & 19 deletions src/FoxIDs.Control/Logic/Validators/ValidateModelGenericPartyLogic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,25 +313,25 @@ private async Task HandleClaimTransformationSecretLoginUpPartyAsync<AUpParty, MU
var apiClaimTransforms = aUpParty.ClaimTransforms?.Where(c => c.ExternalConnectType == Api.ExternalConnectTypes.Api && c.Secret == c.SecretLoaded);
var apiExitClaimTransforms = aUpParty.ExitClaimTransforms?.Where(c => c.ExternalConnectType == Api.ExternalConnectTypes.Api && c.Secret == c.SecretLoaded);
var apiCreateUserClaimTransforms = aUpParty.CreateUser?.ClaimTransforms?.Where(c => c.ExternalConnectType == Api.ExternalConnectTypes.Api && c.Secret == c.SecretLoaded);
if (apiClaimTransforms.Any() || apiExitClaimTransforms.Any() || apiCreateUserClaimTransforms.Any())
if (apiClaimTransforms?.Any() == true || apiExitClaimTransforms?.Any() == true || apiCreateUserClaimTransforms?.Any() == true)
{
var dbUpParty = await tenantDataRepository.GetAsync<MUpParty>(mUpParty.Id);

if (apiClaimTransforms.Any())
if (apiClaimTransforms?.Any() == true)
{
foreach (var mClaimTransforms in mUpParty.ClaimTransforms.Where(c => apiClaimTransforms.Any(ac => ac.Name == c.Name)))
{
mClaimTransforms.Secret = dbUpParty.ClaimTransforms?.Where(u => u.Name == mClaimTransforms.Name).Select(c => c.Secret).FirstOrDefault();
}
}
if (apiExitClaimTransforms.Any())
if (apiExitClaimTransforms?.Any() == true)
{
foreach (var mExitClaimTransforms in mUpParty.ExitClaimTransforms.Where(c => apiExitClaimTransforms.Any(ac => ac.Name == c.Name)))
{
mExitClaimTransforms.Secret = dbUpParty.ExitClaimTransforms?.Where(u => u.Name == mExitClaimTransforms.Name).Select(c => c.Secret).FirstOrDefault();
}
}
if (apiCreateUserClaimTransforms.Any())
if (apiCreateUserClaimTransforms?.Any() == true)
{
foreach (var mCreateUserClaimTransforms in mUpParty.CreateUser.ClaimTransforms.Where(c => apiCreateUserClaimTransforms.Any(ac => ac.Name == c.Name)))
{
Expand All @@ -348,25 +348,25 @@ private async Task HandleClaimTransformationSecretUpPartyAsync<AUpParty, MUpPart
var apiClaimTransforms = aUpParty.ClaimTransforms?.Where(c => c.ExternalConnectType == Api.ExternalConnectTypes.Api && c.Secret == c.SecretLoaded);
var apiExitClaimTransforms = aUpParty.ExitClaimTransforms?.Where(c => c.ExternalConnectType == Api.ExternalConnectTypes.Api && c.Secret == c.SecretLoaded);
var apiLinkExternalUserClaimTransforms = aUpParty.LinkExternalUser?.ClaimTransforms?.Where(c => c.ExternalConnectType == Api.ExternalConnectTypes.Api && c.Secret == c.SecretLoaded);
if (apiClaimTransforms.Any() || apiExitClaimTransforms.Any() || apiLinkExternalUserClaimTransforms.Any())
if (apiClaimTransforms?.Any() == true || apiExitClaimTransforms?.Any() == true || apiLinkExternalUserClaimTransforms?.Any() == true)
{
var dbUpParty = await tenantDataRepository.GetAsync<MUpParty>(mUpParty.Id);

if (apiClaimTransforms.Any())
if (apiClaimTransforms?.Any() == true)
{
foreach (var mClaimTransforms in mUpParty.ClaimTransforms.Where(c => apiClaimTransforms.Any(ac => ac.Name == c.Name)))
{
mClaimTransforms.Secret = dbUpParty.ClaimTransforms?.Where(u => u.Name == mClaimTransforms.Name).Select(c => c.Secret).FirstOrDefault();
}
}
if (apiExitClaimTransforms.Any())
if (apiExitClaimTransforms?.Any() == true)
{
foreach (var mExitClaimTransforms in mUpParty.ExitClaimTransforms.Where(c => apiExitClaimTransforms.Any(ac => ac.Name == c.Name)))
{
mExitClaimTransforms.Secret = dbUpParty.ExitClaimTransforms?.Where(u => u.Name == mExitClaimTransforms.Name).Select(c => c.Secret).FirstOrDefault();
}
}
if (apiLinkExternalUserClaimTransforms.Any())
if (apiLinkExternalUserClaimTransforms?.Any() == true)
{
foreach (var mLinkExternalUserClaimTransforms in mUpParty.LinkExternalUser.ClaimTransforms.Where(c => apiLinkExternalUserClaimTransforms.Any(ac => ac.Name == c.Name)))
{
Expand All @@ -381,11 +381,11 @@ private async Task HandleClaimTransformationSecretUpPartyOnlyOAuthAsync<AUpParty
where MUpParty : UpParty, IOAuthClaimTransformsRef, ILinkExternalUserRef
{
var apiClaimTransforms = aUpParty.ClaimTransforms?.Where(c => c.ExternalConnectType == Api.ExternalConnectTypes.Api && c.Secret == c.SecretLoaded);
if (apiClaimTransforms.Any())
if (apiClaimTransforms?.Any() == true)
{
var dbUpParty = await tenantDataRepository.GetAsync<MUpParty>(mUpParty.Id);

if (apiClaimTransforms.Any())
if (apiClaimTransforms?.Any() == true)
{
foreach (var mClaimTransforms in mUpParty.ClaimTransforms.Where(c => apiClaimTransforms.Any(ac => ac.Name == c.Name)))
{
Expand All @@ -402,25 +402,25 @@ private async Task HandleClaimTransformationSecretSamlUpPartyAsync<AUpParty, MUp
var apiClaimTransforms = aUpParty.ClaimTransforms?.Where(c => c.ExternalConnectType == Api.ExternalConnectTypes.Api && c.Secret == c.SecretLoaded);
var apiExitClaimTransforms = aUpParty.ExitClaimTransforms?.Where(c => c.ExternalConnectType == Api.ExternalConnectTypes.Api && c.Secret == c.SecretLoaded);
var apiLinkExternalUserClaimTransforms = aUpParty.LinkExternalUser?.ClaimTransforms?.Where(c => c.ExternalConnectType == Api.ExternalConnectTypes.Api && c.Secret == c.SecretLoaded);
if (apiClaimTransforms.Any() || apiExitClaimTransforms.Any() || apiLinkExternalUserClaimTransforms.Any())
if (apiClaimTransforms?.Any() == true || apiExitClaimTransforms?.Any() == true || apiLinkExternalUserClaimTransforms?.Any() == true)
{
var dbUpParty = await tenantDataRepository.GetAsync<MUpParty>(mUpParty.Id);

if (apiClaimTransforms.Any())
if (apiClaimTransforms?.Any() == true)
{
foreach (var mClaimTransforms in mUpParty.ClaimTransforms.Where(c => apiClaimTransforms.Any(ac => ac.Name == c.Name)))
{
mClaimTransforms.Secret = dbUpParty.ClaimTransforms?.Where(u => u.Name == mClaimTransforms.Name).Select(c => c.Secret).FirstOrDefault();
}
}
if (apiExitClaimTransforms.Any())
if (apiExitClaimTransforms?.Any() == true)
{
foreach (var mExitClaimTransforms in mUpParty.ExitClaimTransforms.Where(c => apiExitClaimTransforms.Any(ac => ac.Name == c.Name)))
{
mExitClaimTransforms.Secret = dbUpParty.ExitClaimTransforms?.Where(u => u.Name == mExitClaimTransforms.Name).Select(c => c.Secret).FirstOrDefault();
}
}
if (apiLinkExternalUserClaimTransforms.Any())
if (apiLinkExternalUserClaimTransforms?.Any() == true)
{
foreach (var mLinkExternalUserClaimTransforms in mUpParty.LinkExternalUser.ClaimTransforms.Where(c => apiLinkExternalUserClaimTransforms.Any(ac => ac.Name == c.Name)))
{
Expand All @@ -435,11 +435,11 @@ private async Task HandleClaimTransformationSecretDownPartyAsync<ADownParty, MDo
where MDownParty : DownParty, IOAuthClaimTransformsRef
{
var apiClaimTransforms = aDownParty.ClaimTransforms?.Where(c => c.ExternalConnectType == Api.ExternalConnectTypes.Api && c.Secret == c.SecretLoaded);
if (apiClaimTransforms.Any())
if (apiClaimTransforms?.Any() == true)
{
var dbUpParty = await tenantDataRepository.GetAsync<MDownParty>(mDownParty.Id);

if (apiClaimTransforms.Any())
if (apiClaimTransforms?.Any() == true)
{
foreach (var mClaimTransforms in mDownParty.ClaimTransforms.Where(c => apiClaimTransforms.Any(ac => ac.Name == c.Name)))
{
Expand All @@ -454,11 +454,11 @@ private async Task HandleClaimTransformationSecretSamlDownPartyAsync<ADownParty,
where MDownParty : DownParty, ISamlClaimTransformsRef
{
var apiClaimTransforms = aDownParty.ClaimTransforms?.Where(c => c.ExternalConnectType == Api.ExternalConnectTypes.Api && c.Secret == c.SecretLoaded);
if (apiClaimTransforms.Any())
if (apiClaimTransforms?.Any() == true)
{
var dbUpParty = await tenantDataRepository.GetAsync<MDownParty>(mDownParty.Id);

if (apiClaimTransforms.Any())
if (apiClaimTransforms?.Any() == true)
{
foreach (var mClaimTransforms in mDownParty.ClaimTransforms.Where(c => apiClaimTransforms.Any(ac => ac.Name == c.Name)))
{
Expand Down Expand Up @@ -501,7 +501,7 @@ private async Task SetExtendedUiSecretAsync<AUpParty, MUpParty>(AUpParty aUpPart
where MUpParty : UpParty
{
var apiPartyExtendedUis = aUpParty.ExtendedUis.Where(u => u.ExternalConnectType == Api.ExternalConnectTypes.Api && u.Secret == u.SecretLoaded);
if (apiPartyExtendedUis.Any())
if (apiPartyExtendedUis?.Any() == true)
{
var dbUpParty = await tenantDataRepository.GetAsync<MUpParty>(mParty.Id);
foreach (var mExtendedUi in mParty.ExtendedUis.Where(u => apiPartyExtendedUis.Any(au => au.Name == u.Name)))
Expand Down
2 changes: 1 addition & 1 deletion src/FoxIDs.ControlClient/FoxIDs.ControlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Version>2.0.10</Version>
<Version>2.0.11</Version>
<RootNamespace>FoxIDs.Client</RootNamespace>
<Authors>Anders Revsgaard</Authors>
<Company>FoxIDs</Company>
Expand Down
2 changes: 1 addition & 1 deletion src/FoxIDs.ControlShared/FoxIDs.ControlShared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Version>2.0.10</Version>
<Version>2.0.11</Version>
<RootNamespace>FoxIDs</RootNamespace>
<Authors>Anders Revsgaard</Authors>
<Company>FoxIDs</Company>
Expand Down
2 changes: 1 addition & 1 deletion src/FoxIDs.Shared/FoxIDs.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Version>2.0.10</Version>
<Version>2.0.11</Version>
<RootNamespace>FoxIDs</RootNamespace>
<Authors>Anders Revsgaard</Authors>
<Company>FoxIDs</Company>
Expand Down
4 changes: 2 additions & 2 deletions src/FoxIDs.SharedBase/FoxIDs.SharedBase.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Version>2.0.10</Version>
<Version>2.0.11</Version>
<RootNamespace>FoxIDs</RootNamespace>
<Authors>Anders Revsgaard</Authors>
<Company>FoxIDs</Company>
<Copyright>Copyright © 2025</Copyright>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ITfoxtec.Identity" Version="2.13.10" />
<PackageReference Include="ITfoxtec.Identity" Version="2.13.11" />
<PackageReference Include="ITfoxtec.Identity.Saml2" Version="4.15.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.DataAnnotations.Validation" Version="3.2.0-rc1.20223.4" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/FoxIDs/FoxIDs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Version>2.0.10</Version>
<Version>2.0.11</Version>
<RootNamespace>FoxIDs</RootNamespace>
<Authors>Anders Revsgaard</Authors>
<Company>FoxIDs</Company>
Expand Down
Loading