Merge pull request #111 from ITfoxtec/development

Revsgaard · web-flow · commit 7cfe256c61e0 · 2025-03-05T15:34:57.000+01:00
Development
diff --git a/src/AspNetCoreOidcAuthCodeAllUpPartiesSample/AspNetCoreOidcAuthCodeAllUpPartiesSample.csproj b/src/AspNetCoreOidcAuthCodeAllUpPartiesSample/AspNetCoreOidcAuthCodeAllUpPartiesSample.csproj
@@ -5,6 +5,7 @@
 		<Version>1.4.9</Version>
 		<Nullable>disable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
+		<UserSecretsId>a28eb258-4dba-4ab8-8b7a-bdc5b00663df</UserSecretsId>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/src/AspNetCoreOidcAuthCodeAllUpPartiesSample/Models/IdentitySettings.cs b/src/AspNetCoreOidcAuthCodeAllUpPartiesSample/Models/IdentitySettings.cs
@@ -9,6 +9,8 @@ public class IdentitySettings : LibrarySettings
         public string DownParty { get; set; }
         public string ClientSecret { get; set; }
 
+        public bool IncludeApiScope { get; set; }
+
         public string RequestApi1Scope { get; set; }
         public string RequestApi2Scope { get; set; }
     }
diff --git a/src/AspNetCoreOidcAuthCodeAllUpPartiesSample/Program.cs b/src/AspNetCoreOidcAuthCodeAllUpPartiesSample/Program.cs
@@ -112,7 +112,10 @@
 
         // Scope to the application it self, used to do token exchange.
         options.Scope.Add(identitySettings.DownParty);
-        options.Scope.Add(identitySettings.RequestApi1Scope);
+        if (identitySettings.IncludeApiScope)
+        {
+            options.Scope.Add(identitySettings.RequestApi1Scope);
+        }
         options.Scope.Add("offline_access");
         options.Scope.Add("profile");
         options.Scope.Add("email");
diff --git a/src/AspNetCoreOidcAuthCodeAllUpPartiesSample/appsettings.json b/src/AspNetCoreOidcAuthCodeAllUpPartiesSample/appsettings.json
@@ -20,6 +20,7 @@
        "FoxIDsAuthority": "https://localhost:44330/xxx/xxx/aspnet_oidc_allup_sample(*)/",
     */
 
+    "IncludeApiScope": true,
     "RequestApi1Scope": "aspnetcore_api1_sample:some_access",
     "RequestApi2Scope": "aspnetcore_api2_sample:some_2_access"
   },
diff --git a/src/AspNetCoreSamlIdPSample/Controllers/SamlController.cs b/src/AspNetCoreSamlIdPSample/Controllers/SamlController.cs
@@ -139,6 +139,8 @@ private IEnumerable<Claim> GetClaims(IdPSession idPSession)
             yield return new Claim("http://schemas.test.org/claims/CustomID", idPSession.CustomId);
             yield return new Claim("http://schemas.test.org/claims/customname", idPSession.CustomName);
 
+            yield return new Claim("space claim test", "Test value");
+
             yield return new Claim(Saml2ClaimTypes.NameId, idPSession.NameIdentifier);
             yield return new Claim(Saml2ClaimTypes.SessionIndex, idPSession.SessionIndex);
         }
diff --git a/src/AspNetCoreSamlIdPSample/Startup.cs b/src/AspNetCoreSamlIdPSample/Startup.cs
@@ -16,7 +16,6 @@
 using ITfoxtec.Identity.Saml2.Util;
 using Microsoft.IdentityModel.Logging;
 using FoxIDs.SampleHelperLibrary.Infrastructure.Hosting;
-using FoxIDs.SampleHelperLibrary.Models;
 
 namespace AspNetCoreSamlIdPSample
 {
diff --git a/src/BlazorBFFAspNetOidcSample.Client/BlazorBFFAspNetOidcSample.Client.csproj b/src/BlazorBFFAspNetOidcSample.Client/BlazorBFFAspNetOidcSample.Client.csproj
@@ -9,7 +9,7 @@
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.0" />
-		<PackageReference Include="ITfoxtec.Identity" Version="2.13.6" />
+		<PackageReference Include="ITfoxtec.Identity" Version="2.13.9" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/ExternalClaimsApiSample/Controllers/HomeController.cs b/src/ExternalClaimsApiSample/Controllers/HomeController.cs
@@ -14,7 +14,7 @@ public ActionResult Index()
             var hrml =
 @$"ExternalClaimsApiSample</br>
 The API endpoint is: {endpoint}<br>
-- with authentication action: {endpoint}/Authentication ";
+- with 'claims' action: {endpoint}/Claims ";
 
             return Content(hrml, "text/html");
         }
diff --git a/src/ExternalLoginApiSample/Controllers/HomeController.cs b/src/ExternalLoginApiSample/Controllers/HomeController.cs
@@ -14,7 +14,7 @@ public ActionResult Index()
             var hrml =
 @$"ExternalLoginApiSample</br>
 The API endpoint is: {endpoint}<br>
-- with authentication action: {endpoint}/Authentication ";
+- with 'authentication' action: {endpoint}/Authentication ";
 
             return Content(hrml, "text/html");
         }
diff --git a/src/FoxIDs.ControlApiSample/FoxIDs.ControlApiSample.csproj b/src/FoxIDs.ControlApiSample/FoxIDs.ControlApiSample.csproj
@@ -11,7 +11,7 @@
 
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="ITfoxtec.Identity" Version="2.13.6" />
+		<PackageReference Include="ITfoxtec.Identity" Version="2.13.9" />
 		<PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="11.1.0" />
 		<PackageReference Include="NSwag.MSBuild" Version="14.2.0">
 			<PrivateAssets>all</PrivateAssets>
diff --git a/src/FoxIDs.SampleHelperLibrary/FoxIDs.SampleHelperLibrary.csproj b/src/FoxIDs.SampleHelperLibrary/FoxIDs.SampleHelperLibrary.csproj
@@ -5,7 +5,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ITfoxtec.Identity" Version="2.13.6" />
+		<PackageReference Include="ITfoxtec.Identity" Version="2.13.9" />
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 
diff --git a/src/IdentityServerOidcOpSample/UI/SecurityHeadersAttribute.cs b/src/IdentityServerOidcOpSample/UI/SecurityHeadersAttribute.cs
@@ -31,7 +31,9 @@ public override void OnResultExecuting(ResultExecutingContext context)
                 // also consider adding upgrade-insecure-requests once you have HTTPS in place for production
                 //csp += "upgrade-insecure-requests;";
                 // also an example if you need client images to be displayed from twitter
-                // csp += "img-src 'self' https://pbs.twimg.com;";
+
+                // Allow all frame-src domains to support front channel logout
+                csp += " frame-src *;";
 
                 // once for standards compliant browsers
                 if (!context.HttpContext.Response.Headers.ContainsKey("Content-Security-Policy"))
diff --git a/tools/FoxIDs.SampleSeedTool/FoxIDs.SampleSeedTool.csproj b/tools/FoxIDs.SampleSeedTool/FoxIDs.SampleSeedTool.csproj
@@ -11,7 +11,7 @@
 
 	<ItemGroup>
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
-		<PackageReference Include="ITfoxtec.Identity" Version="2.13.6" />
+		<PackageReference Include="ITfoxtec.Identity" Version="2.13.9" />
 		<PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="11.1.0" />
 		<PackageReference Include="NSwag.MSBuild" Version="14.2.0">
 			<PrivateAssets>all</PrivateAssets>

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ public class IdentitySettings : LibrarySettings`
`9`	`9`	`public string DownParty { get; set; }`
`10`	`10`	`public string ClientSecret { get; set; }`
`11`	`11`
	`12`	`+ public bool IncludeApiScope { get; set; }`
	`13`	`+`
`12`	`14`	`public string RequestApi1Scope { get; set; }`
`13`	`15`	`public string RequestApi2Scope { get; set; }`
`14`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,8 @@ private IEnumerable<Claim> GetClaims(IdPSession idPSession)`
`139`	`139`	`yield return new Claim("http://schemas.test.org/claims/CustomID", idPSession.CustomId);`
`140`	`140`	`yield return new Claim("http://schemas.test.org/claims/customname", idPSession.CustomName);`
`141`	`141`
	`142`	`+ yield return new Claim("space claim test", "Test value");`
	`143`	`+`
`142`	`144`	`yield return new Claim(Saml2ClaimTypes.NameId, idPSession.NameIdentifier);`
`143`	`145`	`yield return new Claim(Saml2ClaimTypes.SessionIndex, idPSession.SessionIndex);`
`144`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`using ITfoxtec.Identity.Saml2.Util;`
`17`	`17`	`using Microsoft.IdentityModel.Logging;`
`18`	`18`	`using FoxIDs.SampleHelperLibrary.Infrastructure.Hosting;`
`19`		`-using FoxIDs.SampleHelperLibrary.Models;`
`20`	`19`
`21`	`20`	`namespace AspNetCoreSamlIdPSample`
`22`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public ActionResult Index()`
`14`	`14`	`var hrml =`
`15`	`15`	`@$"ExternalClaimsApiSample</br>`
`16`	`16`	`The API endpoint is: {endpoint}<br>`
`17`		`-- with authentication action: {endpoint}/Authentication ";`
	`17`	`+- with 'claims' action: {endpoint}/Claims ";`
`18`	`18`
`19`	`19`	`return Content(hrml, "text/html");`
`20`	`20`	`}`