Remove any existing license information from the samples.

SeanFarrow-RSK · SeanFarrow-RSK · commit b4d692e194c6 · 2023-10-24T13:50:49.000+01:00
diff --git a/Constants.cs b/Constants.cs
@@ -0,0 +1,7 @@
+﻿namespace Rsk.Saml.Samples;
+
+public static class Constants
+{
+    public const string Licensee = "Your licensee";
+    public const string LicenseKey = "your license key";
+}
diff --git a/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj b/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj
@@ -5,6 +5,10 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\Constants.cs" Link="Constants.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Duende.IdentityServer" Version="6.0.0" />
     <PackageReference Include="Rsk.Saml" Version="5.0.0" />
diff --git a/DuendeIdentityServer/DuendeDynamicProviders/HostingExtensions.cs b/DuendeIdentityServer/DuendeDynamicProviders/HostingExtensions.cs
@@ -2,6 +2,7 @@
 using Duende.IdentityServer;
 using Rsk.AspNetCore.Authentication.Saml2p;
 using Rsk.Saml.DuendeIdentityServer.DynamicProviders;
+using Rsk.Saml.Samples;
 using Serilog;
 
 namespace DuendeDynamicProviders;
@@ -33,8 +34,8 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
         isBuilder.AddSamlDynamicProvider(options =>
         {
             // unstorable/reusable data, such as license information and events. This will override the data stored
-            options.Licensee = "/* your DEMO Licensee */";
-            options.LicenseKey = "/* your DEMO LicenseKey */";
+            options.Licensee = Constants.Licensee;
+            options.LicenseKey = Constants.LicenseKey;
         })
 
             // Use EntityFramework store for storing identity providers
diff --git a/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj b/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj
@@ -5,6 +5,10 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\Constants.cs" Link="Constants.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Duende.IdentityServer" Version="6.0.0" />
     <PackageReference Include="Rsk.Saml" Version="5.0.0" />
diff --git a/DuendeIdentityServer/DuendeIdP/HostingExtensions.cs b/DuendeIdentityServer/DuendeIdP/HostingExtensions.cs
@@ -2,6 +2,7 @@
 using Duende.IdentityServer.Configuration;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Rsk.Saml.Configuration;
+using Rsk.Saml.Samples;
 using Serilog;
 
 namespace DuendeIdP;
@@ -36,8 +37,8 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
 
         isBuilder.AddSamlPlugin(options =>
             {
-                options.Licensee = "DEMO";
-                options.LicenseKey = "eyJTb2xkRm9yIjowLjAsIktleVByZXNldCI6NiwiU2F2ZUtleSI6ZmFsc2UsIkxlZ2FjeUtleSI6ZmFsc2UsIlJlbmV3YWxTZW50VGltZSI6IjAwMDEtMDEtMDFUMDA6MDA6MDAiLCJhdXRoIjoiREVNTyIsImV4cCI6IjIwMjMtMDMtMjRUMDA6MDA6MDAiLCJpYXQiOiIyMDIzLTAyLTI0VDA5OjIyOjA3Iiwib3JnIjoiREVNTyIsImF1ZCI6Mn0=.n2rMJsO+GWfSEYFnBoweBGqQjBLpUBELo4O2iHvJwFjuifXSsaTc6cyJG50SF3z3tnLylY+yueEmV2SXr86IG/IltNB/+Cip/V7g3l5tHMbla5QYr5aYbyaUPASfs+sPXW750sx++pR/4WC4sDzgckeDANhZl6A2fIPUOXM/BG+V8cvsb6xhY6+XfRCMAqPKW3XLxG8cPZBQ6teAdPrtDJuI1UNVtkFwtjBypjr/hgMHxW7oVT0GV7mBQknqqrvq6dQjLqGgxvdamxkmBWMTfFTrysqwvK2eVJsOV0IlIYUCwz2c2H//1cvW4o5K8tkSpwp/uwjXdpz1pB3jzwGPzl/kZ1PTiZOh1uFTEGhRhn2A93vFT1dcSaSsGDG0Excu2H66nuCw4OsUr4sUZm5+Y57/xHlFfTo5wbymSSMXLVpzL3brzfOvOewAawDq5HNjBmPjOaCpWaz6hygT/mOdqr+0T0W+l84XEdoxyP1GuVwN/eCL7qkroHUsksXqbmQmCUioV3wK5+sKeVmMB/vOBUQnJJR0snV6pBAvEVCLcGw/8Nu2+ZreYDdTNy6CSYlGjQi5b6GxKBMCifv15uoeVeEej/UXtKTJRVe72B6oS6tZupvw3evm8nruTM9QObUqESgF+M0hVuyB0/eVngC+gNo6DKkDdS8I++ZivAn2AsI=";
+                options.Licensee = Constants.Licensee;
+                options.LicenseKey = Constants.LicenseKey;
 
                 options.WantAuthenticationRequestsSigned = false;
             })
diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/HostingExtensions.cs b/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/HostingExtensions.cs
@@ -1,10 +1,7 @@
-using Common;
-using Duende.IdentityServer;
 using Duende.IdentityServer.Configuration;
 using IdentityServerHost;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.IdentityModel.Tokens;
 using Rsk.Saml.Configuration;
+using Rsk.Saml.Samples;
 using Serilog;
 
 namespace IdentityServer;
@@ -34,8 +31,8 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
             .AddTestUsers(TestUsers.Users)
             .AddSamlPlugin(options =>
             {
-                options.Licensee = TestConstants.Licensee;
-                options.LicenseKey = TestConstants.LicenseKey;
+                options.Licensee = Constants.Licensee;
+                options.LicenseKey = Constants.LicenseKey;
 
                 //Use Iterative SLO
                 options.UseIFramesForSlo = false;
diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj
@@ -29,9 +29,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj" />
-  </ItemGroup>
   <ItemGroup>
     <_ContentIncludedByDefault Remove="Pages\Ciba\All.cshtml" />
     <_ContentIncludedByDefault Remove="Pages\Ciba\Consent.cshtml" />
@@ -45,4 +42,7 @@
     <_ContentIncludedByDefault Remove="Pages\ExternalLogin\Callback.cshtml" />
     <_ContentIncludedByDefault Remove="Pages\ExternalLogin\Challenge.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\..\Constants.cs" Link="Constants.cs" />
+  </ItemGroup>
 </Project>
diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/Program.cs b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/Program.cs
@@ -1,8 +1,7 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Cryptography.X509Certificates;
-using Common;
-using Microsoft.AspNetCore.Authentication;
 using Rsk.AspNetCore.Authentication.Saml2p;
+using Rsk.Saml.Samples;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -23,8 +22,8 @@
     })    
     .AddSaml2p("saml", options =>
     {
-        options.Licensee = TestConstants.Licensee;
-        options.LicenseKey = TestConstants.LicenseKey;
+        options.Licensee = Constants.Licensee;
+        options.LicenseKey = Constants.LicenseKey;
 
         options.IdentityProviderMetadataAddress = "https://localhost:5001/saml/metadata";
 
diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
@@ -7,6 +7,10 @@
     <RootNamespace>WebClient</RootNamespace>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\..\..\Constants.cs" Link="Constants.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.1" />
     <PackageReference Include="Rsk.Saml" Version="6.0.1" />
@@ -18,9 +22,5 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj" />
-  </ItemGroup>
-
 
 </Project>
diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/Program.cs b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/Program.cs
@@ -1,8 +1,7 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Cryptography.X509Certificates;
-using Common;
-using Microsoft.AspNetCore.Authentication;
 using Rsk.AspNetCore.Authentication.Saml2p;
+using Rsk.Saml.Samples;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -23,8 +22,8 @@
     })    
     .AddSaml2p("saml", options =>
     {
-        options.Licensee = TestConstants.Licensee;
-        options.LicenseKey = TestConstants.LicenseKey;
+        options.Licensee = Constants.Licensee;
+        options.LicenseKey = Constants.LicenseKey;
         
         options.IdentityProviderMetadataAddress = "https://localhost:5001/saml/metadata";
 
diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
@@ -7,6 +7,10 @@
     <RootNamespace>WebClient</RootNamespace>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\..\..\Constants.cs" Link="Constants.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.1" />
     <PackageReference Include="Rsk.Saml" Version="6.0.0-preview1" />
@@ -18,8 +22,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/IdentityServer4/idp/Startup.cs b/IdentityServer4/idp/Startup.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Rsk.Saml.Configuration;
+using Rsk.Saml.Samples;
 
 namespace idp
 {
@@ -30,8 +31,8 @@ public void ConfigureServices(IServiceCollection services)
             // Configure SAML Identity Provider and authorized Service Providers
             builder.AddSamlPlugin(options =>
                 {
-                    options.Licensee = "/* your DEMO Licensee */";
-                    options.LicenseKey = "/* your DEMO LicenseKey */";
+                    options.Licensee = Constants.Licensee;
+                    options.LicenseKey = Constants.LicenseKey;
 
                     options.WantAuthenticationRequestsSigned = false;
                 })
diff --git a/IdentityServer4/idp/idp.csproj b/IdentityServer4/idp/idp.csproj
@@ -4,6 +4,10 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\Constants.cs" Link="Constants.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="IdentityServer4" Version="4.1.2" />
     <PackageReference Include="Rsk.Saml" Version="5.0.0" />
diff --git a/IdentityServer4/idpWithEf/Startup.cs b/IdentityServer4/idpWithEf/Startup.cs
@@ -11,6 +11,7 @@
 using Rsk.Saml.IdentityProvider.Storage.EntityFramework;
 using Rsk.Saml.IdentityProvider.Storage.EntityFramework.Mappers;
 using Rsk.Saml.IdentityProvider.Storage.EntityFramework.Stores;
+using Rsk.Saml.Samples;
 
 namespace idpWithEf
 {
@@ -41,8 +42,8 @@ public void ConfigureServices(IServiceCollection services)
             // Configure SAML Identity Provider and authorized Service Providers
             builder.AddSamlPlugin(options =>
                 {
-                    options.Licensee = "/* your DEMO Licensee */";
-                    options.LicenseKey = "/* your DEMO LicenseKey */";
+                    options.Licensee = Constants.Licensee;
+                    options.LicenseKey = Constants.LicenseKey;
 
                     options.WantAuthenticationRequestsSigned = false;
                 })
diff --git a/IdentityServer4/idpWithEf/idpWithEf.csproj b/IdentityServer4/idpWithEf/idpWithEf.csproj
@@ -4,6 +4,10 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\Constants.cs" Link="Constants.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="IdentityServer4" Version="4.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.21" />
diff --git a/IdentityServer4/idpWithIdpInitiated/Startup.cs b/IdentityServer4/idpWithIdpInitiated/Startup.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Rsk.Saml.Configuration;
+using Rsk.Saml.Samples;
 
 namespace idpWithIdpInitiated
 {
@@ -30,8 +31,8 @@ public void ConfigureServices(IServiceCollection services)
             // Configure SAML Identity Provider and authorized Service Providers
             builder.AddSamlPlugin(options =>
                 {
-                    options.Licensee = "/* your DEMO Licensee */";
-                    options.LicenseKey = "/* your DEMO LicenseKey */";
+                    options.Licensee = Constants.Licensee;
+                    options.LicenseKey = Constants.LicenseKey;
 
                     options.WantAuthenticationRequestsSigned = false;
                 })
diff --git a/IdentityServer4/idpWithIdpInitiated/idpWithIdpInitiated.csproj b/IdentityServer4/idpWithIdpInitiated/idpWithIdpInitiated.csproj
@@ -4,6 +4,10 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\Constants.cs" Link="Constants.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="IdentityServer4" Version="4.1.2" />
     <PackageReference Include="Rsk.Saml" Version="5.0.0" />
diff --git a/IdentityServer4/sp/Startup.cs b/IdentityServer4/sp/Startup.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Rsk.AspNetCore.Authentication.Saml2p;
 using Rsk.Saml.Configuration;
+using Rsk.Saml.Samples;
 
 namespace sp
 {
@@ -30,8 +31,8 @@ public void ConfigureServices(IServiceCollection services)
             // OPTIONAL - only required if you want to be a SAML IdP too
             builder.AddSamlPlugin(options =>
                 {
-                    options.Licensee = "/* your DEMO Licensee */";
-                    options.LicenseKey = "/* your DEMO LicenseKey */";
+                    options.Licensee = Constants.Licensee;
+                    options.LicenseKey = Constants.LicenseKey;
 
                     options.WantAuthenticationRequestsSigned = false;
                 })
diff --git a/IdentityServer4/sp/sp.csproj b/IdentityServer4/sp/sp.csproj
@@ -4,6 +4,10 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\Constants.cs" Link="Constants.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="IdentityServer4" Version="4.1.2" />
     <PackageReference Include="Rsk.Saml" Version="5.0.0" />
diff --git a/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj b/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj
@@ -5,6 +5,10 @@
     <CopyRefAssembliesToPublishDirectory>false</CopyRefAssembliesToPublishDirectory>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\Constants.cs" Link="Constants.cs" />
+  </ItemGroup>
+
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.12" />
diff --git a/OpenIddict/OpenIddictIdP/Startup.cs b/OpenIddict/OpenIddictIdP/Startup.cs
@@ -13,6 +13,7 @@
 using Rsk.Saml.OpenIddict.Configuration.DependencyInjection;
 using Rsk.Saml.OpenIddict.EntityFrameworkCore.Configuration.DependacyInjection;
 using openiddictidp.Data;
+using Rsk.Saml.Samples;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
 namespace openiddictidp;
@@ -144,8 +145,8 @@ public void ConfigureServices(IServiceCollection services)
 
                             serverOptions.IdpOptions = new SamlIdpOptions()
                             {
-                                Licensee = "/*enter your licensee here*/",
-                                LicenseKey ="/*enter your license key here.*/",
+                                Licensee = Constants.Licensee,
+                                LicenseKey =Constants.LicenseKey,
                                 UseIFramesForSlo = false
 
                             };
diff --git a/Saml.sln b/Saml.sln
@@ -26,8 +26,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SamlOidcSLO", "SamlOidcSLO"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer", "DuendeIdentityServer\SLO\SamlOidcSLO\IdentityServer\IdentityServer.csproj", "{F9786DDA-6EDE-490A-821F-4F060EFF98F0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common", "DuendeIdentityServer\SLO\SamlOidcSLO\Common\Common.csproj", "{D96DA401-97A7-46AC-A1A7-6716D4AEAE55}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebClient.OIDC", "DuendeIdentityServer\SLO\SamlOidcSLO\WebClient.OIDC\WebClient.OIDC.csproj", "{E39F9182-E9E5-4128-AE3C-B6800952B845}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebClient.SAML.1", "DuendeIdentityServer\SLO\SamlOidcSLO\WebClient.SAML.1\WebClient.SAML.1.csproj", "{35A985EE-3903-4F4B-A94C-A92B2DD2A49B}"
@@ -82,10 +80,6 @@ Global
 		{F9786DDA-6EDE-490A-821F-4F060EFF98F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F9786DDA-6EDE-490A-821F-4F060EFF98F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F9786DDA-6EDE-490A-821F-4F060EFF98F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D96DA401-97A7-46AC-A1A7-6716D4AEAE55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D96DA401-97A7-46AC-A1A7-6716D4AEAE55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D96DA401-97A7-46AC-A1A7-6716D4AEAE55}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D96DA401-97A7-46AC-A1A7-6716D4AEAE55}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E39F9182-E9E5-4128-AE3C-B6800952B845}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E39F9182-E9E5-4128-AE3C-B6800952B845}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E39F9182-E9E5-4128-AE3C-B6800952B845}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -119,7 +113,6 @@ Global
 		{99583A23-042F-4E0E-921A-D409E1BD1A0A} = {59F5F54A-3E11-46B6-A3D4-5719C091DF45}
 		{F5D0A9C6-1AE7-4BE9-A06E-2979A1453CD6} = {59F5F54A-3E11-46B6-A3D4-5719C091DF45}
 		{F9786DDA-6EDE-490A-821F-4F060EFF98F0} = {F5D0A9C6-1AE7-4BE9-A06E-2979A1453CD6}
-		{D96DA401-97A7-46AC-A1A7-6716D4AEAE55} = {F5D0A9C6-1AE7-4BE9-A06E-2979A1453CD6}
 		{E39F9182-E9E5-4128-AE3C-B6800952B845} = {F5D0A9C6-1AE7-4BE9-A06E-2979A1453CD6}
 		{35A985EE-3903-4F4B-A94C-A92B2DD2A49B} = {F5D0A9C6-1AE7-4BE9-A06E-2979A1453CD6}
 		{20851470-CF31-4F28-B2ED-E201814909E7} = {F5D0A9C6-1AE7-4BE9-A06E-2979A1453CD6}
diff --git a/spWithIdpInitiated/Startup.cs b/spWithIdpInitiated/Startup.cs
diff --git a/spWithIdpInitiated/spWithIdpInitiated.csproj b/spWithIdpInitiated/spWithIdpInitiated.csproj
diff --git a/spWithMultipleIdps/Startup.cs b/spWithMultipleIdps/Startup.cs
diff --git a/spWithMultipleIdps/spWithMultipleIdps.csproj b/spWithMultipleIdps/spWithMultipleIdps.csproj
diff --git a/spWithSingleIdp/Program.cs b/spWithSingleIdp/Program.cs
diff --git a/spWithSingleIdp/spWithSingleIdp.csproj b/spWithSingleIdp/spWithSingleIdp.csproj
