Rename the constants.cs file to LicenseKey.cs to make things more obvious as to what the file contains.

SeanFarrow-RSK · SeanFarrow-RSK · commit d941ae609bd2 · 2023-10-26T08:53:59.000+01:00
diff --git a/Constants.cs b/Constants.cs
diff --git a/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj b/DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\Constants.cs" Link="Constants.cs" />
+    <Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/DuendeIdentityServer/DuendeDynamicProviders/HostingExtensions.cs b/DuendeIdentityServer/DuendeDynamicProviders/HostingExtensions.cs
@@ -34,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 = Constants.Licensee;
-            options.LicenseKey = Constants.LicenseKey;
+            options.Licensee = LicenseKey.Licensee;
+            options.LicenseKey = LicenseKey.Key;
         })
 
             // Use EntityFramework store for storing identity providers
diff --git a/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj b/DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\Constants.cs" Link="Constants.cs" />
+    <Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/DuendeIdentityServer/DuendeIdP/HostingExtensions.cs b/DuendeIdentityServer/DuendeIdP/HostingExtensions.cs
@@ -37,8 +37,8 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
 
         isBuilder.AddSamlPlugin(options =>
             {
-                options.Licensee = Constants.Licensee;
-                options.LicenseKey = Constants.LicenseKey;
+                options.Licensee = LicenseKey.Licensee;
+                options.LicenseKey = LicenseKey.Key;
 
                 options.WantAuthenticationRequestsSigned = false;
             })
diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/HostingExtensions.cs b/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/HostingExtensions.cs
@@ -31,8 +31,8 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
             .AddTestUsers(TestUsers.Users)
             .AddSamlPlugin(options =>
             {
-                options.Licensee = Constants.Licensee;
-                options.LicenseKey = Constants.LicenseKey;
+                options.Licensee = LicenseKey.Licensee;
+                options.LicenseKey = LicenseKey.Key;
 
                 //Use Iterative SLO
                 options.UseIFramesForSlo = false;
diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj b/DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj
@@ -43,6 +43,6 @@
     <_ContentIncludedByDefault Remove="Pages\ExternalLogin\Challenge.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\Constants.cs" Link="Constants.cs" />
+    <Compile Include="..\..\..\..\LicenseKey.cs" Link="LicenseKey.cs" />
   </ItemGroup>
 </Project>
diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/Program.cs b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/Program.cs
@@ -22,8 +22,8 @@
     })    
     .AddSaml2p("saml", options =>
     {
-        options.Licensee = Constants.Licensee;
-        options.LicenseKey = Constants.LicenseKey;
+        options.Licensee = LicenseKey.Licensee;
+        options.LicenseKey = LicenseKey.Key;
 
         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
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\..\..\Constants.cs" Link="Constants.cs" />
+    <Compile Include="..\..\..\..\LicenseKey.cs" Link="LicenseKey.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/Program.cs b/DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/Program.cs
@@ -22,8 +22,8 @@
     })    
     .AddSaml2p("saml", options =>
     {
-        options.Licensee = Constants.Licensee;
-        options.LicenseKey = Constants.LicenseKey;
+        options.Licensee = LicenseKey.Licensee;
+        options.LicenseKey = LicenseKey.Key;
         
         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
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\..\..\Constants.cs" Link="Constants.cs" />
+    <Compile Include="..\..\..\..\LicenseKey.cs" Link="LicenseKey.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/IdentityServer4/idp/Startup.cs b/IdentityServer4/idp/Startup.cs
@@ -31,8 +31,8 @@ public void ConfigureServices(IServiceCollection services)
             // Configure SAML Identity Provider and authorized Service Providers
             builder.AddSamlPlugin(options =>
                 {
-                    options.Licensee = Constants.Licensee;
-                    options.LicenseKey = Constants.LicenseKey;
+                    options.Licensee = LicenseKey.Licensee;
+                    options.LicenseKey = LicenseKey.Key;
 
                     options.WantAuthenticationRequestsSigned = false;
                 })
diff --git a/IdentityServer4/idp/idp.csproj b/IdentityServer4/idp/idp.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\Constants.cs" Link="Constants.cs" />
+    <Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/IdentityServer4/idpWithEf/Startup.cs b/IdentityServer4/idpWithEf/Startup.cs
@@ -42,8 +42,8 @@ public void ConfigureServices(IServiceCollection services)
             // Configure SAML Identity Provider and authorized Service Providers
             builder.AddSamlPlugin(options =>
                 {
-                    options.Licensee = Constants.Licensee;
-                    options.LicenseKey = Constants.LicenseKey;
+                    options.Licensee = LicenseKey.Licensee;
+                    options.LicenseKey = LicenseKey.Key;
 
                     options.WantAuthenticationRequestsSigned = false;
                 })
diff --git a/IdentityServer4/idpWithEf/idpWithEf.csproj b/IdentityServer4/idpWithEf/idpWithEf.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\Constants.cs" Link="Constants.cs" />
+    <Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/IdentityServer4/idpWithIdpInitiated/Startup.cs b/IdentityServer4/idpWithIdpInitiated/Startup.cs
@@ -31,8 +31,8 @@ public void ConfigureServices(IServiceCollection services)
             // Configure SAML Identity Provider and authorized Service Providers
             builder.AddSamlPlugin(options =>
                 {
-                    options.Licensee = Constants.Licensee;
-                    options.LicenseKey = Constants.LicenseKey;
+                    options.Licensee = LicenseKey.Licensee;
+                    options.LicenseKey = LicenseKey.Key;
 
                     options.WantAuthenticationRequestsSigned = false;
                 })
diff --git a/IdentityServer4/idpWithIdpInitiated/idpWithIdpInitiated.csproj b/IdentityServer4/idpWithIdpInitiated/idpWithIdpInitiated.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\Constants.cs" Link="Constants.cs" />
+    <Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/IdentityServer4/sp/Startup.cs b/IdentityServer4/sp/Startup.cs
@@ -31,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 = Constants.Licensee;
-                    options.LicenseKey = Constants.LicenseKey;
+                    options.Licensee = LicenseKey.Licensee;
+                    options.LicenseKey = LicenseKey.Key;
 
                     options.WantAuthenticationRequestsSigned = false;
                 })
diff --git a/IdentityServer4/sp/sp.csproj b/IdentityServer4/sp/sp.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\Constants.cs" Link="Constants.cs" />
+    <Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/LicenseKey.cs b/LicenseKey.cs
@@ -0,0 +1,8 @@
+﻿namespace Rsk.Saml.Samples
+{
+public static class LicenseKey
+{
+    public const string Licensee = "DEMO";
+    public const string Key = "visit https://www.identityserver.com/products/saml2p to obtain a free demo key";
+}
+}
diff --git a/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj b/OpenIddict/OpenIddictIdP/OpenIddictIdP.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\Constants.cs" Link="Constants.cs" />
+    <Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
   </ItemGroup>
 
 
diff --git a/OpenIddict/OpenIddictIdP/Startup.cs b/OpenIddict/OpenIddictIdP/Startup.cs
@@ -145,8 +145,8 @@ public void ConfigureServices(IServiceCollection services)
 
                             serverOptions.IdpOptions = new SamlIdpOptions()
                             {
-                                Licensee = Constants.Licensee,
-                                LicenseKey =Constants.LicenseKey,
+                                Licensee = LicenseKey.Licensee,
+                                LicenseKey =LicenseKey.Key,
                                 UseIFramesForSlo = false
 
                             };
diff --git a/spWithIdpInitiated/Startup.cs b/spWithIdpInitiated/Startup.cs
@@ -13,8 +13,8 @@
 builder.Services.AddAuthentication()
     .AddCookie("cookie")
     .AddSaml2p("saml2p", options => {
-        options.Licensee = Constants.Licensee;
-        options.LicenseKey = Constants.LicenseKey;
+        options.Licensee = LicenseKey.Licensee;
+        options.LicenseKey = LicenseKey.Key;
 
         options.IdentityProviderOptions = new IdpOptions
         {
diff --git a/spWithIdpInitiated/spWithIdpInitiated.csproj b/spWithIdpInitiated/spWithIdpInitiated.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Constants.cs" Link="Constants.cs" />
+    <Compile Include="..\LicenseKey.cs" Link="LicenseKey.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/spWithMultipleIdps/Startup.cs b/spWithMultipleIdps/Startup.cs
@@ -12,8 +12,8 @@
 builder.Services.AddAuthentication()
     .AddCookie("cookie")
     .AddSaml2p("idp1", options => {
-        options.Licensee = Constants.Licensee;
-        options.LicenseKey = Constants.Licensee;
+        options.Licensee = LicenseKey.Licensee;
+        options.LicenseKey = LicenseKey.Key;
 
         options.IdentityProviderOptions = new IdpOptions
         {
diff --git a/spWithMultipleIdps/spWithMultipleIdps.csproj b/spWithMultipleIdps/spWithMultipleIdps.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\Constants.cs" Link="Constants.cs" />
+    <Compile Include="..\LicenseKey.cs" Link="LicenseKey.cs" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/spWithSingleIdp/Program.cs b/spWithSingleIdp/Program.cs
@@ -11,8 +11,8 @@
     .AddCookie("cookie")
     .AddSaml2p("saml",options=>
     {
-        options.Licensee = Constants.Licensee;
-        options.LicenseKey = Constants.LicenseKey;
+        options.Licensee = LicenseKey.Licensee;
+        options.LicenseKey = LicenseKey.Key;
         
         options.IdentityProviderMetadataAddress = "https://localhost:5003/saml/metadata";
 
diff --git a/spWithSingleIdp/spWithSingleIdp.csproj b/spWithSingleIdp/spWithSingleIdp.csproj
@@ -6,9 +6,9 @@
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
-    <ItemGroup>
-      <Compile Include="..\Constants.cs" Link="Constants.cs" />
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\LicenseKey.cs" Link="LicenseKey.cs" />
+  </ItemGroup>
 
     <ItemGroup>
       <PackageReference Include="Rsk.Saml" Version="6.0.0" />

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde`
`37`	`37`
`38`	`38`	`isBuilder.AddSamlPlugin(options =>`
`39`	`39`	`{`
`40`		`- options.Licensee = Constants.Licensee;`
`41`		`- options.LicenseKey = Constants.LicenseKey;`
	`40`	`+ options.Licensee = LicenseKey.Licensee;`
	`41`	`+ options.LicenseKey = LicenseKey.Key;`
`42`	`42`
`43`	`43`	`options.WantAuthenticationRequestsSigned = false;`
`44`	`44`	`})`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@`
`22`	`22`	`})`
`23`	`23`	`.AddSaml2p("saml", options =>`
`24`	`24`	`{`
`25`		`- options.Licensee = Constants.Licensee;`
`26`		`- options.LicenseKey = Constants.LicenseKey;`
	`25`	`+ options.Licensee = LicenseKey.Licensee;`
	`26`	`+ options.LicenseKey = LicenseKey.Key;`
`27`	`27`
`28`	`28`	`options.IdentityProviderMetadataAddress = "https://localhost:5001/saml/metadata";`
`29`	`29`