Skip to content

Commit e97b3fc

Browse files
andrewclymerandrewclymer
authored
Merge pull request #45 from RockSolidKnowledge/feature/sf/11106-remove-license-information
Remove license information from all projects
2 parents 9accb13 + d941ae6 commit e97b3fc

File tree

98 files changed

+41448
-59
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+41448
-59
lines changed

‎DuendeIdentityServer/DuendeDynamicProviders/DuendeDynamicProviders.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<ImplicitUsings>enable</ImplicitUsings>
66
</PropertyGroup>
77

8+
<ItemGroup>
9+
<Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
10+
</ItemGroup>
11+
812
<ItemGroup>
913
<PackageReference Include="Duende.IdentityServer" Version="6.0.0" />
1014
<PackageReference Include="Rsk.Saml" Version="5.0.0" />

‎DuendeIdentityServer/DuendeDynamicProviders/HostingExtensions.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Duende.IdentityServer;
33
using Rsk.AspNetCore.Authentication.Saml2p;
44
using Rsk.Saml.DuendeIdentityServer.DynamicProviders;
5+
using Rsk.Saml.Samples;
56
using Serilog;
67

78
namespace DuendeDynamicProviders;
@@ -33,8 +34,8 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
3334
isBuilder.AddSamlDynamicProvider(options =>
3435
{
3536
// unstorable/reusable data, such as license information and events. This will override the data stored
36-
options.Licensee = "/* your DEMO Licensee */";
37-
options.LicenseKey = "/* your DEMO LicenseKey */";
37+
options.Licensee = LicenseKey.Licensee;
38+
options.LicenseKey = LicenseKey.Key;
3839
})
3940

4041
// Use EntityFramework store for storing identity providers

‎DuendeIdentityServer/DuendeIdP/DuendeIdP.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
<ImplicitUsings>enable</ImplicitUsings>
66
</PropertyGroup>
77

8+
<ItemGroup>
9+
<Compile Include="..\..\LicenseKey.cs" Link="LicenseKey.cs" />
10+
</ItemGroup>
11+
812
<ItemGroup>
913
<PackageReference Include="Duende.IdentityServer" Version="6.0.0" />
1014
<PackageReference Include="Rsk.Saml" Version="5.0.0" />

‎DuendeIdentityServer/DuendeIdP/HostingExtensions.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Duende.IdentityServer.Configuration;
33
using Microsoft.AspNetCore.Authentication.Cookies;
44
using Rsk.Saml.Configuration;
5+
using Rsk.Saml.Samples;
56
using Serilog;
67

78
namespace DuendeIdP;
@@ -36,8 +37,8 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
3637

3738
isBuilder.AddSamlPlugin(options =>
3839
{
39-
options.Licensee = "DEMO";
40-
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=";
40+
options.Licensee = LicenseKey.Licensee;
41+
options.LicenseKey = LicenseKey.Key;
4142

4243
options.WantAuthenticationRequestsSigned = false;
4344
})

‎DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/HostingExtensions.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
using Common;
2-
using Duende.IdentityServer;
31
using Duende.IdentityServer.Configuration;
42
using IdentityServerHost;
5-
using Microsoft.EntityFrameworkCore;
6-
using Microsoft.IdentityModel.Tokens;
73
using Rsk.Saml.Configuration;
4+
using Rsk.Saml.Samples;
85
using Serilog;
96

107
namespace IdentityServer;
@@ -34,8 +31,8 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
3431
.AddTestUsers(TestUsers.Users)
3532
.AddSamlPlugin(options =>
3633
{
37-
options.Licensee = TestConstants.Licensee;
38-
options.LicenseKey = TestConstants.LicenseKey;
34+
options.Licensee = LicenseKey.Licensee;
35+
options.LicenseKey = LicenseKey.Key;
3936

4037
//Use Iterative SLO
4138
options.UseIFramesForSlo = false;

‎DuendeIdentityServer/SLO/SamlOidcSLO/IdentityServer/IdentityServer.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3030
</None>
3131
</ItemGroup>
32-
<ItemGroup>
33-
<ProjectReference Include="..\Common\Common.csproj" />
34-
</ItemGroup>
3532
<ItemGroup>
3633
<_ContentIncludedByDefault Remove="Pages\Ciba\All.cshtml" />
3734
<_ContentIncludedByDefault Remove="Pages\Ciba\Consent.cshtml" />
@@ -45,4 +42,7 @@
4542
<_ContentIncludedByDefault Remove="Pages\ExternalLogin\Callback.cshtml" />
4643
<_ContentIncludedByDefault Remove="Pages\ExternalLogin\Challenge.cshtml" />
4744
</ItemGroup>
45+
<ItemGroup>
46+
<Compile Include="..\..\..\..\LicenseKey.cs" Link="LicenseKey.cs" />
47+
</ItemGroup>
4848
</Project>

‎DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/Program.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using System.IdentityModel.Tokens.Jwt;
22
using System.Security.Cryptography.X509Certificates;
3-
using Common;
4-
using Microsoft.AspNetCore.Authentication;
53
using Rsk.AspNetCore.Authentication.Saml2p;
4+
using Rsk.Saml.Samples;
65

76
var builder = WebApplication.CreateBuilder(args);
87

@@ -23,8 +22,8 @@
2322
})
2423
.AddSaml2p("saml", options =>
2524
{
26-
options.Licensee = TestConstants.Licensee;
27-
options.LicenseKey = TestConstants.LicenseKey;
25+
options.Licensee = LicenseKey.Licensee;
26+
options.LicenseKey = LicenseKey.Key;
2827

2928
options.IdentityProviderMetadataAddress = "https://localhost:5001/saml/metadata";
3029

‎DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.1/WebClient.SAML.1.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<TargetFramework>net7.0</TargetFramework>
@@ -7,6 +7,10 @@
77
<RootNamespace>WebClient</RootNamespace>
88
</PropertyGroup>
99

10+
<ItemGroup>
11+
<Compile Include="..\..\..\..\LicenseKey.cs" Link="LicenseKey.cs" />
12+
</ItemGroup>
13+
1014
<ItemGroup>
1115
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.1" />
1216
<PackageReference Include="Rsk.Saml" Version="6.0.1" />
@@ -18,9 +22,5 @@
1822
</None>
1923
</ItemGroup>
2024

21-
<ItemGroup>
22-
<ProjectReference Include="..\Common\Common.csproj" />
23-
</ItemGroup>
24-
2525

2626
</Project>

‎DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/Program.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using System.IdentityModel.Tokens.Jwt;
22
using System.Security.Cryptography.X509Certificates;
3-
using Common;
4-
using Microsoft.AspNetCore.Authentication;
53
using Rsk.AspNetCore.Authentication.Saml2p;
4+
using Rsk.Saml.Samples;
65

76
var builder = WebApplication.CreateBuilder(args);
87

@@ -23,8 +22,8 @@
2322
})
2423
.AddSaml2p("saml", options =>
2524
{
26-
options.Licensee = TestConstants.Licensee;
27-
options.LicenseKey = TestConstants.LicenseKey;
25+
options.Licensee = LicenseKey.Licensee;
26+
options.LicenseKey = LicenseKey.Key;
2827

2928
options.IdentityProviderMetadataAddress = "https://localhost:5001/saml/metadata";
3029

‎DuendeIdentityServer/SLO/SamlOidcSLO/WebClient.SAML.2/WebClient.SAML.2.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<TargetFramework>net7.0</TargetFramework>
@@ -7,6 +7,10 @@
77
<RootNamespace>WebClient</RootNamespace>
88
</PropertyGroup>
99

10+
<ItemGroup>
11+
<Compile Include="..\..\..\..\LicenseKey.cs" Link="LicenseKey.cs" />
12+
</ItemGroup>
13+
1014
<ItemGroup>
1115
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.1" />
1216
<PackageReference Include="Rsk.Saml" Version="6.0.0-preview1" />
@@ -18,8 +22,4 @@
1822
</None>
1923
</ItemGroup>
2024

21-
<ItemGroup>
22-
<ProjectReference Include="..\Common\Common.csproj" />
23-
</ItemGroup>
24-
2525
</Project>

0 commit comments

Comments
 (0)