Merge pull request #115 from ITfoxtec/development

Revsgaard · web-flow · commit b7e743d09e2e · 2025-03-24T12:30:54.000+01:00
online sample config
diff --git a/src/AspNetCoreApi1Sample/AspNetCoreApi1Sample.csproj b/src/AspNetCoreApi1Sample/AspNetCoreApi1Sample.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.4.11</Version>
+		<Version>1.4.12</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/src/AspNetCoreApi2Sample/AspNetCoreApi2Sample.csproj b/src/AspNetCoreApi2Sample/AspNetCoreApi2Sample.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.4.11</Version>
+		<Version>1.4.12</Version>
 		<Nullable>disable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
diff --git a/src/AspNetCoreOidcAuthCodeAllUpPartiesSample/AspNetCoreOidcAuthCodeAllUpPartiesSample.csproj b/src/AspNetCoreOidcAuthCodeAllUpPartiesSample/AspNetCoreOidcAuthCodeAllUpPartiesSample.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.4.11</Version>
+		<Version>1.4.12</Version>
 		<Nullable>disable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<UserSecretsId>a28eb258-4dba-4ab8-8b7a-bdc5b00663df</UserSecretsId>
diff --git a/src/AspNetCoreSamlIdPSample/AspNetCoreSamlIdPSample.csproj b/src/AspNetCoreSamlIdPSample/AspNetCoreSamlIdPSample.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.4.11</Version>
+		<Version>1.4.12</Version>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/src/AspNetCoreSamlIdPSample/Controllers/SamlController.cs b/src/AspNetCoreSamlIdPSample/Controllers/SamlController.cs
@@ -103,7 +103,7 @@ public async Task<IActionResult> Login()
         [Route("IdPInitiated")]
         public IActionResult IdPInitiated()
         {
-            return base.View(new IdPInitiatedViewModel { RelyingPartyIssuers = GetRelyingPartyListItems() });
+            return base.View(new IdPInitiatedViewModel { RelyingPartyIssuers = GetRelyingPartyListItems(), OnlineSample = settings.OnlineSample });
         }
 
         [HttpPost("IdPInitiated")]
@@ -117,6 +117,7 @@ public async Task<IActionResult> IdPInitiated(IdPInitiatedViewModel idPInitiated
             if (!ModelState.IsValid)
             {
                 idPInitiatedViewModel.RelyingPartyIssuers = GetRelyingPartyListItems();
+                idPInitiatedViewModel.OnlineSample = settings.OnlineSample;
                 return View(idPInitiatedViewModel);
             }
 
diff --git a/src/AspNetCoreSamlIdPSample/Models/IdPInitiatedViewModel.cs b/src/AspNetCoreSamlIdPSample/Models/IdPInitiatedViewModel.cs
@@ -25,6 +25,8 @@ public class IdPInitiatedViewModel
         [Display(Name = "Application type ('oidc' or 'saml2')")]
         [Required]
         [MaxLength(10)]
-        public string ApplicationType { get; set; } 
+        public string ApplicationType { get; set; }
+
+        public bool OnlineSample { get; set; }
     }
 }
diff --git a/src/AspNetCoreSamlIdPSample/Models/Settings.cs b/src/AspNetCoreSamlIdPSample/Models/Settings.cs
@@ -5,6 +5,8 @@ namespace AspNetCoreSamlIdPSample.Models
 {
     public class Settings : LibrarySettings
     {
-        public List<RelyingParty> RelyingParties { get; set; }    
+        public List<RelyingParty> RelyingParties { get; set; }
+
+        public bool OnlineSample { get; set; }
     }
 }
diff --git a/src/AspNetCoreSamlIdPSample/Views/Saml/IdPInitiated.cshtml b/src/AspNetCoreSamlIdPSample/Views/Saml/IdPInitiated.cshtml
@@ -10,19 +10,32 @@
         <blockquote>
             <p>Select the authentication method and fill in the name of the application that the request should be redirected to after successful login.</p>
             <h3>Test data</h3>
-            <p>
-                <strong>SAML 2.0 sample application</strong>
-                <div>Application: aspnetcore_saml_sample</div>
-                <i>The application redirect URL is optional</i>
-                <div>Application type: saml2</div>
-            </p>
-            <p>
-                <strong>OpenID Connect sample application</strong>
-                <div>Application: aspnet_oidc_allup_sample</div>
-                <div>Application redirect URL local: https://localhost:44349/home/secure and online: https://aspnetoidcsample.itfoxtec.com/home/secure</div>
-                <i>The redirect URL need to be configured as a redirect URL for the application.</i>
-                <div>Application type: oidc</div>
-            </p>
+            @if (Model.OnlineSample) 
+            {
+                <p>
+                    <strong>OpenID Connect sample application</strong>
+                    <div>Application: aspnet_oidc_allup_online_sample</div>
+                    <div>Application redirect URL: https://aspnetoidcsample.itfoxtec.com/home/secure</div>
+                    <i>The redirect URL need to be configured as a redirect URL for the application.</i>
+                    <div>Application type: oidc</div>
+                </p>
+            }
+            else
+            {
+                <p>
+                    <strong>SAML 2.0 sample application</strong>
+                    <div>Application: aspnetcore_saml_sample</div>
+                    <i>The application redirect URL is optional</i>
+                    <div>Application type: saml2</div>
+                </p>
+                <p>
+                    <strong>OpenID Connect sample application</strong>
+                    <div>Application: aspnet_oidc_allup_sample</div>
+                    <div>Application redirect URL: https://localhost:44349/home/secure</div>
+                    <i>The redirect URL need to be configured as a redirect URL for the application.</i>
+                    <div>Application type: oidc</div>
+                </p>
+            }
         </blockquote>
     </div>
 </div>
diff --git a/src/ExternalLoginApiSample/ExternalLoginApiSample.csproj b/src/ExternalLoginApiSample/ExternalLoginApiSample.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>1.4.11</Version>
+		<Version>1.4.12</Version>
 		<ImplicitUsings>enable</ImplicitUsings>
 	</PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public async Task<IActionResult> Login()`
`103`	`103`	`[Route("IdPInitiated")]`
`104`	`104`	`public IActionResult IdPInitiated()`
`105`	`105`	`{`
`106`		`- return base.View(new IdPInitiatedViewModel { RelyingPartyIssuers = GetRelyingPartyListItems() });`
	`106`	`+ return base.View(new IdPInitiatedViewModel { RelyingPartyIssuers = GetRelyingPartyListItems(), OnlineSample = settings.OnlineSample });`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`[HttpPost("IdPInitiated")]`
`@@ -117,6 +117,7 @@ public async Task<IActionResult> IdPInitiated(IdPInitiatedViewModel idPInitiated`
`117`	`117`	`if (!ModelState.IsValid)`
`118`	`118`	`{`
`119`	`119`	`idPInitiatedViewModel.RelyingPartyIssuers = GetRelyingPartyListItems();`
	`120`	`+ idPInitiatedViewModel.OnlineSample = settings.OnlineSample;`
`120`	`121`	`return View(idPInitiatedViewModel);`
`121`	`122`	`}`
`122`	`123`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ public class IdPInitiatedViewModel`
`25`	`25`	`[Display(Name = "Application type ('oidc' or 'saml2')")]`
`26`	`26`	`[Required]`
`27`	`27`	`[MaxLength(10)]`
`28`		`- public string ApplicationType { get; set; }`
	`28`	`+ public string ApplicationType { get; set; }`
	`29`	`+`
	`30`	`+ public bool OnlineSample { get; set; }`
`29`	`31`	`}`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@ namespace AspNetCoreSamlIdPSample.Models`
`5`	`5`	`{`
`6`	`6`	`public class Settings : LibrarySettings`
`7`	`7`	`{`
`8`		`- public List<RelyingParty> RelyingParties { get; set; }`
	`8`	`+ public List<RelyingParty> RelyingParties { get; set; }`
	`9`	`+`
	`10`	`+ public bool OnlineSample { get; set; }`
`9`	`11`	`}`
`10`	`12`	`}`