Moves extension methods to the Sustainsys.Saml2.AspNetCore namespace …

…to align with project structure and Removed all unused using statements.
Sustainsys · Jun 12, 2024 · ebcd213 · ebcd213
1 parent 50654a7
commit ebcd213
Show file tree

Hide file tree

Showing 51 changed files with 27 additions and 230 deletions.
diff --git a/src/Sustainsys.Saml2/AspNetCore/Events/AuthnRequestGeneratedContext.cs b/src/Sustainsys.Saml2/AspNetCore/Events/AuthnRequestGeneratedContext.cs
@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Http;
-using Sustainsys.Saml2.AspNetCore;
 using Sustainsys.Saml2.Samlp;
 
 namespace Sustainsys.Saml2.AspNetCore.Events;

diff --git a/src/Sustainsys.Saml2/AspNetCore/Saml2Events.cs b/src/Sustainsys.Saml2/AspNetCore/Saml2Events.cs
@@ -1,7 +1,5 @@
 using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Http;
 using Sustainsys.Saml2.AspNetCore.Events;
-using Sustainsys.Saml2.Samlp;
 
 namespace Sustainsys.Saml2.AspNetCore;
 

diff --git a/src/Sustainsys.Saml2/AspNetCore/Saml2Extensions.cs b/src/Sustainsys.Saml2/AspNetCore/Saml2Extensions.cs
@@ -1,14 +1,14 @@
 using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
-using Sustainsys.Saml2.AspNetCore;
 using Sustainsys.Saml2.Bindings;
 using Sustainsys.Saml2.Serialization;
 
 
 // By convention, the extension methods are placed in the Microsoft shared 
 // namespace to allow convenient access from intellisense.
-namespace Microsoft.Extensions.DependencyInjection;
+namespace Sustainsys.Saml2.AspNetCore;
 
 /// <summary>
 /// Extension methods to configure Saml2 authentication.

diff --git a/src/Sustainsys.Saml2/AspNetCore/Saml2Handler.cs b/src/Sustainsys.Saml2/AspNetCore/Saml2Handler.cs
@@ -7,8 +7,6 @@
 using Sustainsys.Saml2.Samlp;
 using Sustainsys.Saml2.Serialization;
 using Sustainsys.Saml2.Xml;
-using System;
-using System.Runtime.Serialization;
 using System.Text.Encodings.Web;
 
 namespace Sustainsys.Saml2.AspNetCore;

diff --git a/src/Sustainsys.Saml2/AspNetCore/Saml2PostConfigureOptions.cs b/src/Sustainsys.Saml2/AspNetCore/Saml2PostConfigureOptions.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Options;
-using Sustainsys.Saml2.AspNetCore;
 
-namespace Microsoft.Extensions.DependencyInjection;
+namespace Sustainsys.Saml2.AspNetCore;
 
 /// <summary>
 /// Post configure options for Saml2. Validates config and sets the default 

diff --git a/src/Sustainsys.Saml2/Bindings/HttpPostBinding.cs b/src/Sustainsys.Saml2/Bindings/HttpPostBinding.cs
@@ -1,9 +1,5 @@
 using Microsoft.AspNetCore.Http;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using System.Xml;
 
 namespace Sustainsys.Saml2.Bindings;

diff --git a/src/Sustainsys.Saml2/Bindings/HttpRedirectBinding.cs b/src/Sustainsys.Saml2/Bindings/HttpRedirectBinding.cs
@@ -1,11 +1,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.WebUtilities;
 using System.IO.Compression;
-using System.Linq;
-using System.Text;
-using System.Text.Unicode;
 using System.Xml;
-using static Microsoft.AspNetCore.WebUtilities.QueryStringEnumerable;
 
 namespace Sustainsys.Saml2.Bindings;
 

diff --git a/src/Sustainsys.Saml2/Constants.cs b/src/Sustainsys.Saml2/Constants.cs
@@ -1,12 +1,4 @@
-using Sustainsys.Saml2.Samlp;
-using Sustainsys.Saml2.Xml;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Sustainsys.Saml2;
+namespace Sustainsys.Saml2;
 
 /// <summary>
 /// Constants

diff --git a/src/Sustainsys.Saml2/Metadata/SSODescriptor.cs b/src/Sustainsys.Saml2/Metadata/SSODescriptor.cs
@@ -1,6 +1,4 @@
-using Sustainsys.Saml2.Xml;
-
-namespace Sustainsys.Saml2.Metadata;
+namespace Sustainsys.Saml2.Metadata;
 
 
 /// <summary>

diff --git a/src/Sustainsys.Saml2/Saml/Assertion.cs b/src/Sustainsys.Saml2/Saml/Assertion.cs
@@ -1,10 +1,4 @@
 using Sustainsys.Saml2.Xml;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Sustainsys.Saml2.Saml;
 

diff --git a/src/Sustainsys.Saml2/Saml/Subject.cs b/src/Sustainsys.Saml2/Saml/Subject.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Sustainsys.Saml2.Saml;
+namespace Sustainsys.Saml2.Saml;
 
 /// <summary>
 /// A Saml2 Subject, see core 2.4.1.

diff --git a/src/Sustainsys.Saml2/Saml2Entity.cs b/src/Sustainsys.Saml2/Saml2Entity.cs
@@ -1,9 +1,4 @@
 using Sustainsys.Saml2.Xml;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Sustainsys.Saml2;
 /// <summary>

diff --git a/src/Sustainsys.Saml2/Serialization/ISamlXmlWriter.cs b/src/Sustainsys.Saml2/Serialization/ISamlXmlWriter.cs
@@ -1,5 +1,4 @@
-using Sustainsys.Saml2.Saml;
-using Sustainsys.Saml2.Samlp;
+using Sustainsys.Saml2.Samlp;
 using System.Xml;
 
 namespace Sustainsys.Saml2.Serialization;

diff --git a/src/Sustainsys.Saml2/Serialization/SamlXmlReader.Assertion.cs b/src/Sustainsys.Saml2/Serialization/SamlXmlReader.Assertion.cs
@@ -1,11 +1,5 @@
 using Sustainsys.Saml2.Saml;
 using Sustainsys.Saml2.Xml;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using static Sustainsys.Saml2.Constants;
 
 namespace Sustainsys.Saml2.Serialization;

diff --git a/src/Sustainsys.Saml2/Serialization/SamlXmlReader.AuthnContext.cs b/src/Sustainsys.Saml2/Serialization/SamlXmlReader.AuthnContext.cs
@@ -1,7 +1,5 @@
-using Sustainsys.Saml2.Metadata;
-using Sustainsys.Saml2.Saml;
+using Sustainsys.Saml2.Saml;
 using Sustainsys.Saml2.Xml;
-using System.Diagnostics;
 using static Sustainsys.Saml2.Constants;
 
 namespace Sustainsys.Saml2.Serialization;

diff --git a/src/Sustainsys.Saml2/Serialization/SamlXmlReader.AuthnRequest.cs b/src/Sustainsys.Saml2/Serialization/SamlXmlReader.AuthnRequest.cs
@@ -1,6 +1,5 @@
 using Sustainsys.Saml2.Samlp;
 using Sustainsys.Saml2.Xml;
-using System.Xml;
 using static Sustainsys.Saml2.Constants;
 
 namespace Sustainsys.Saml2.Serialization;

diff --git a/src/Sustainsys.Saml2/Serialization/SamlXmlReader.AuthnStatement.cs b/src/Sustainsys.Saml2/Serialization/SamlXmlReader.AuthnStatement.cs
@@ -1,7 +1,5 @@
-using Sustainsys.Saml2.Metadata;
-using Sustainsys.Saml2.Saml;
+using Sustainsys.Saml2.Saml;
 using Sustainsys.Saml2.Xml;
-using System.Diagnostics;
 using static Sustainsys.Saml2.Constants;
 
 namespace Sustainsys.Saml2.Serialization;

diff --git a/src/Sustainsys.Saml2/Serialization/SamlXmlReader.RequestAbstractType.cs b/src/Sustainsys.Saml2/Serialization/SamlXmlReader.RequestAbstractType.cs
@@ -1,11 +1,5 @@
-using Microsoft.AspNetCore.Antiforgery;
-using Sustainsys.Saml2.Samlp;
+using Sustainsys.Saml2.Samlp;
 using Sustainsys.Saml2.Xml;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using static Sustainsys.Saml2.Constants;
 
 namespace Sustainsys.Saml2.Serialization;

diff --git a/src/Sustainsys.Saml2/Serialization/SamlXmlReader.StatusResponseType.cs b/src/Sustainsys.Saml2/Serialization/SamlXmlReader.StatusResponseType.cs
@@ -1,7 +1,5 @@
-using Sustainsys.Saml2.Saml;
-using Sustainsys.Saml2.Samlp;
+using Sustainsys.Saml2.Samlp;
 using Sustainsys.Saml2.Xml;
-using System.Security.Cryptography.Xml;
 using static Sustainsys.Saml2.Constants;
 
 namespace Sustainsys.Saml2.Serialization;

diff --git a/src/Sustainsys.Saml2/Serialization/SamlXmlReader.Subject.cs b/src/Sustainsys.Saml2/Serialization/SamlXmlReader.Subject.cs
@@ -1,7 +1,5 @@
-using Sustainsys.Saml2.Metadata;
-using Sustainsys.Saml2.Saml;
+using Sustainsys.Saml2.Saml;
 using Sustainsys.Saml2.Xml;
-using System.Diagnostics;
 using static Sustainsys.Saml2.Constants;
 
 namespace Sustainsys.Saml2.Serialization;

diff --git a/src/Sustainsys.Saml2/Serialization/SamlXmlReader.SubjectConfirmation.cs b/src/Sustainsys.Saml2/Serialization/SamlXmlReader.SubjectConfirmation.cs
@@ -1,7 +1,5 @@
-using Sustainsys.Saml2.Metadata;
-using Sustainsys.Saml2.Saml;
+using Sustainsys.Saml2.Saml;
 using Sustainsys.Saml2.Xml;
-using System.Diagnostics;
 using static Sustainsys.Saml2.Constants;
 
 namespace Sustainsys.Saml2.Serialization;

diff --git a/src/Sustainsys.Saml2/Serialization/SamlXmlReader.SubjectConfirmationData.cs b/src/Sustainsys.Saml2/Serialization/SamlXmlReader.SubjectConfirmationData.cs
@@ -1,9 +1,5 @@
-using Microsoft.AspNetCore.Mvc.Routing;
-using Sustainsys.Saml2.Metadata;
-using Sustainsys.Saml2.Saml;
+using Sustainsys.Saml2.Saml;
 using Sustainsys.Saml2.Xml;
-using System.Diagnostics;
-using System.Security.Cryptography.X509Certificates;
 using static Sustainsys.Saml2.Constants;
 
 namespace Sustainsys.Saml2.Serialization;

diff --git a/src/Sustainsys.Saml2/Serialization/SamlXmlReader.cs b/src/Sustainsys.Saml2/Serialization/SamlXmlReader.cs
@@ -1,15 +1,7 @@
-using Sustainsys.Saml2.Common;
-using Sustainsys.Saml2.Saml;
-using Sustainsys.Saml2.Samlp;
+using Sustainsys.Saml2.Saml;
 using Sustainsys.Saml2.Xml;
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
 using System.Security.Cryptography.Xml;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
 using static Sustainsys.Saml2.Constants;
 
 namespace Sustainsys.Saml2.Serialization;

diff --git a/src/Sustainsys.Saml2/Serialization/SamlXmlWriter.NameId.cs b/src/Sustainsys.Saml2/Serialization/SamlXmlWriter.NameId.cs
@@ -1,5 +1,4 @@
 using Sustainsys.Saml2.Saml;
-using Sustainsys.Saml2.Xml;
 using System.Xml;
 
 namespace Sustainsys.Saml2.Serialization;

diff --git a/src/Sustainsys.Saml2/Serialization/SamlXmlWriter.cs b/src/Sustainsys.Saml2/Serialization/SamlXmlWriter.cs
@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using System.Xml;
+using System.Xml;
 
 namespace Sustainsys.Saml2.Serialization;
 

diff --git a/src/Sustainsys.Saml2/TrustLevel.cs b/src/Sustainsys.Saml2/TrustLevel.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Sustainsys.Saml2;
+namespace Sustainsys.Saml2;
 
 /// <summary>
 /// What is the trust level of a piece of data? The levels reflect

diff --git a/src/Sustainsys.Saml2/Validation/ISamlAssertionValidator.cs b/src/Sustainsys.Saml2/Validation/ISamlAssertionValidator.cs
@@ -1,9 +1,4 @@
 using Sustainsys.Saml2.Saml;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Sustainsys.Saml2.Validation;
 

diff --git a/src/Sustainsys.Saml2/Validation/ISamlResponseValidator.cs b/src/Sustainsys.Saml2/Validation/ISamlResponseValidator.cs
@@ -1,10 +1,5 @@
 using Sustainsys.Saml2.Saml;
 using Sustainsys.Saml2.Samlp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Sustainsys.Saml2.Validation;
 

diff --git a/src/Sustainsys.Saml2/Validation/SamlAssertionValidator.cs b/src/Sustainsys.Saml2/Validation/SamlAssertionValidator.cs
@@ -1,9 +1,4 @@
 using Sustainsys.Saml2.Saml;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Sustainsys.Saml2.Validation;
 

diff --git a/src/Sustainsys.Saml2/Validation/SamlResponseValidator.cs b/src/Sustainsys.Saml2/Validation/SamlResponseValidator.cs
@@ -1,10 +1,4 @@
-using Microsoft.Extensions.Logging;
-using Sustainsys.Saml2.Samlp;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Sustainsys.Saml2.Samlp;
 
 namespace Sustainsys.Saml2.Validation;
 

diff --git a/src/Sustainsys.Saml2/Validation/SamlValidationException.cs b/src/Sustainsys.Saml2/Validation/SamlValidationException.cs
@@ -1,11 +1,4 @@
-using Sustainsys.Saml2.Xml;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Sustainsys.Saml2.Validation;
+namespace Sustainsys.Saml2.Validation;
 
 /// <summary>
 /// Exception thrown when validation is not successful

diff --git a/src/Sustainsys.Saml2/Xml/ReadErrorInspectorContext.cs b/src/Sustainsys.Saml2/Xml/ReadErrorInspectorContext.cs
@@ -1,10 +1,4 @@
-using Microsoft.Extensions.Configuration.Xml;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
+using System.Xml;
 
 namespace Sustainsys.Saml2.Xml;
 

diff --git a/src/Sustainsys.Saml2/Xml/SignedXmlHelper.cs b/src/Sustainsys.Saml2/Xml/SignedXmlHelper.cs
@@ -1,12 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Security.Cryptography;
+using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Security.Cryptography.Xml;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml;
 
 namespace Sustainsys.Saml2.Xml;

diff --git a/src/Sustainsys.Saml2/Xml/SigningKey.cs b/src/Sustainsys.Saml2/Xml/SigningKey.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading.Tasks;
+using System.Security.Cryptography.X509Certificates;
 
 namespace Sustainsys.Saml2.Xml;
 

diff --git a/src/Sustainsys.Saml2/Xml/XmlTraverser.cs b/src/Sustainsys.Saml2/Xml/XmlTraverser.cs
@@ -1,7 +1,4 @@
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-using System.Runtime.ExceptionServices;
 using System.Security.Cryptography.Xml;
 using System.Xml;
 

diff --git a/src/Tests/Sustainsys.Saml2.Tests/AspNetCore/Saml2HandlerTests.cs b/src/Tests/Sustainsys.Saml2.Tests/AspNetCore/Saml2HandlerTests.cs
@@ -5,11 +5,8 @@
 using NSubstitute;
 using Sustainsys.Saml2.Bindings;
 using Sustainsys.Saml2.Xml;
-using Sustainsys.Saml2.Saml;
 using Sustainsys.Saml2.Samlp;
-using System.Net.Http;
 using System.Text.Encodings.Web;
-using System.Xml;
 using Sustainsys.Saml2.Tests.Helpers;
 using System.Text;
 using Sustainsys.Saml2.Serialization;

diff --git a/src/Tests/Sustainsys.Saml2.Tests/Bindings/FrontChannelBindingTests.cs b/src/Tests/Sustainsys.Saml2.Tests/Bindings/FrontChannelBindingTests.cs
@@ -1,8 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using NSubstitute;
 using Sustainsys.Saml2.Bindings;
-using System;
-using System.Threading.Tasks;
 using System.Xml;
 
 namespace Sustainsys.Saml2.Tests.Bindings;

diff --git a/src/Tests/Sustainsys.Saml2.Tests/Bindings/HttpPostBindingTests.cs b/src/Tests/Sustainsys.Saml2.Tests/Bindings/HttpPostBindingTests.cs
@@ -1,12 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using NSubstitute;
 using Sustainsys.Saml2.Bindings;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Xml;
 
 namespace Sustainsys.Saml2.Tests.Bindings;