move serializer codes to metadata project and some cosmetics

machunmei · Apr 11, 2020 · d08922c · d08922c
1 parent 851a263
commit d08922c
Show file tree

Hide file tree

Showing 92 changed files with 3,300 additions and 2,260 deletions.
diff --git a/Sustainsys.Saml2.Metadata/AdditionalMetadataLocation.cs b/Sustainsys.Saml2.Metadata/AdditionalMetadataLocation.cs
@@ -5,6 +5,7 @@ namespace Sustainsys.Saml2.Metadata
     public class AdditionalMetadataLocation
     {
         public Uri Uri { get; set; }
+
         public string Namespace { get; set; }
     }
 }
diff --git a/Sustainsys.Saml2.Metadata/AttributeProfile.cs b/Sustainsys.Saml2.Metadata/AttributeProfile.cs
@@ -4,6 +4,6 @@ namespace Sustainsys.Saml2.Metadata
 {
     public class AttributeProfile
     {
-		public Uri Uri { get; set;  }
+        public Uri Uri { get; set; }
     }
-}
+}
diff --git a/Sustainsys.Saml2.Metadata/CipherData.cs b/Sustainsys.Saml2.Metadata/CipherData.cs
@@ -1,8 +1,9 @@
 namespace Sustainsys.Saml2.Metadata
 {
-	public class CipherData
-	{
-		public string CipherValue { get; set; }
-		public CipherReference CipherReference { get; set; }
-	}
-}
+    public class CipherData
+    {
+        public string CipherValue { get; set; }
+
+        public CipherReference CipherReference { get; set; }
+    }
+}
diff --git a/Sustainsys.Saml2.Metadata/CipherReference.cs b/Sustainsys.Saml2.Metadata/CipherReference.cs
@@ -5,10 +5,11 @@
 
 namespace Sustainsys.Saml2.Metadata
 {
-	public class CipherReference
-	{
-		public Uri Uri { get; set; }
-		public ICollection<XmlElement> Transforms { get; private set; } =
-			new Collection<XmlElement>();
-	}
-}
+    public class CipherReference
+    {
+        public Uri Uri { get; set; }
+
+        public ICollection<XmlElement> Transforms { get; private set; } =
+            new Collection<XmlElement>();
+    }
+}
diff --git a/...iguration/ICustomIdentityConfiguration.cs → ...iguration/ICustomIdentityConfiguration.cs b/...iguration/ICustomIdentityConfiguration.cs → ...iguration/ICustomIdentityConfiguration.cs
@@ -1,6 +1,6 @@
 using System.Xml;
 
-namespace Sustainsys.Saml2.Configuration
+namespace Sustainsys.Saml2.Metadata.Configuration
 {
     interface ICustomIdentityConfiguration
     {

diff --git a/Sustainsys.Saml2.Metadata/ConstrainedValue.cs b/Sustainsys.Saml2.Metadata/ConstrainedValue.cs
@@ -4,50 +4,52 @@
 
 namespace Sustainsys.Saml2.Metadata
 {
-	public class ClaimValue
-	{
-		public string Value { get; set; }
-		public ICollection<XmlElement> StructuredValue { get; set; }
-	}
-
-	public class ConstrainedValue
-	{
-		public abstract class Constraint
-		{
-		}
-
-		public class CompareConstraint : Constraint
-		{
-			public enum CompareOperator
-			{
-				Lt,
-				Lte,
-				Gt,
-				Gte,
-			}
-			public CompareOperator CompareOp { get; private set; }
-			public ClaimValue Value { get; set; } = new ClaimValue();
-
-			public CompareConstraint(CompareOperator compareOp)
-			{
-				CompareOp = compareOp;
-			}
-		}
-
-		public class RangeConstraint : Constraint
-		{
-			public ClaimValue LowerBound { get; set; } = new ClaimValue();
-			public ClaimValue UpperBound { get; set; } = new ClaimValue();
-		}
-
-		public class ListConstraint : Constraint
-		{
-			public ICollection<ClaimValue> Values { get; private set; } =
-				new Collection<ClaimValue>();
-		}
-
-		public bool AssertConstraint { get; set; }
-		public ICollection<Constraint> Constraints { get; private set; } =
-			new Collection<Constraint>();
-	}
-}
+    public class ClaimValue
+    {
+        public string Value { get; set; }
+        public ICollection<XmlElement> StructuredValue { get; set; }
+    }
+
+    public class ConstrainedValue
+    {
+        public abstract class Constraint
+        {
+        }
+
+        public class CompareConstraint : Constraint
+        {
+            public enum CompareOperator
+            {
+                Lt,
+                Lte,
+                Gt,
+                Gte,
+            }
+
+            public CompareOperator CompareOp { get; private set; }
+            public ClaimValue Value { get; set; } = new ClaimValue();
+
+            public CompareConstraint(CompareOperator compareOp)
+            {
+                CompareOp = compareOp;
+            }
+        }
+
+        public class RangeConstraint : Constraint
+        {
+            public ClaimValue LowerBound { get; set; } = new ClaimValue();
+            public ClaimValue UpperBound { get; set; } = new ClaimValue();
+        }
+
+        public class ListConstraint : Constraint
+        {
+            public ICollection<ClaimValue> Values { get; private set; } =
+                new Collection<ClaimValue>();
+        }
+
+        public bool AssertConstraint { get; set; }
+
+        public ICollection<Constraint> Constraints { get; private set; } =
+            new Collection<Constraint>();
+    }
+}
diff --git a/Sustainsys.Saml2.Metadata/Descriptors/AffiliationDescriptor.cs b/Sustainsys.Saml2.Metadata/Descriptors/AffiliationDescriptor.cs
@@ -5,17 +5,20 @@
 
 namespace Sustainsys.Saml2.Metadata.Descriptors
 {
-	public class AffiliationDescriptor : ICachedMetadata
+    public class AffiliationDescriptor : ICachedMetadata
     {
-		public ICollection<EntityId> AffiliateMembers { get; private set; } =
-			new Collection<EntityId>();
-		public ICollection<XmlElement> Extensions { get; private set; } =
-			new Collection<XmlElement>();
-		public ICollection<KeyDescriptor> KeyDescriptors { get; private set; } =
-			new Collection<KeyDescriptor>();
-		public EntityId AffiliationOwnerId { get; set; }
-		public DateTime? ValidUntil { get; set; }
-		public XsdDuration? CacheDuration { get; set; }
-		public string Id { get; set; }
+        public ICollection<EntityId> AffiliateMembers { get; private set; } =
+            new Collection<EntityId>();
+
+        public ICollection<XmlElement> Extensions { get; private set; } =
+            new Collection<XmlElement>();
+
+        public ICollection<KeyDescriptor> KeyDescriptors { get; private set; } =
+            new Collection<KeyDescriptor>();
+
+        public EntityId AffiliationOwnerId { get; set; }
+        public DateTime? ValidUntil { get; set; }
+        public XsdDuration? CacheDuration { get; set; }
+        public string Id { get; set; }
     }
-}
+}
diff --git a/Sustainsys.Saml2.Metadata/Descriptors/ApplicationServiceDescriptor.cs b/Sustainsys.Saml2.Metadata/Descriptors/ApplicationServiceDescriptor.cs
@@ -1,28 +1,30 @@
-using System.Collections.Generic;
-using Sustainsys.Saml2.Metadata.Services;
+using Sustainsys.Saml2.Metadata.Services;
+using System.Collections.Generic;
 
 namespace Sustainsys.Saml2.Metadata.Descriptors
 {
-	public class ApplicationServiceDescriptor : WebServiceDescriptor
-	{
-		public ICollection<EndpointReference> Endpoints { get; private set; } =
-			new List<EndpointReference>();
-		public ICollection<EndpointReference> PassiveRequestorEndpoints { get; private set; } =
-			new List<EndpointReference>();
-		public ICollection<EndpointReference> SingleSignOutEndpoints { get; private set; } =
-			new List<EndpointReference>();
+    public class ApplicationServiceDescriptor : WebServiceDescriptor
+    {
+        public ICollection<EndpointReference> Endpoints { get; private set; } =
+            new List<EndpointReference>();
 
-		public ApplicationServiceDescriptor()
-		{
-		}
+        public ICollection<EndpointReference> PassiveRequestorEndpoints { get; private set; } =
+            new List<EndpointReference>();
 
-		public ApplicationServiceDescriptor(
-			IEnumerable<EndpointReference> endpoints,
-			IEnumerable<EndpointReference> passiveRequestorEndpoints,
-			IEnumerable<EndpointReference> singleSignOutEndpoints
-		)
-		{
-			((List<EndpointReference>)Endpoints).AddRange(endpoints);
-		}
-	}
-}
+        public ICollection<EndpointReference> SingleSignOutEndpoints { get; private set; } =
+            new List<EndpointReference>();
+
+        public ApplicationServiceDescriptor()
+        {
+        }
+
+        public ApplicationServiceDescriptor(
+            IEnumerable<EndpointReference> endpoints,
+            IEnumerable<EndpointReference> passiveRequestorEndpoints,
+            IEnumerable<EndpointReference> singleSignOutEndpoints
+        )
+        {
+            ((List<EndpointReference>)Endpoints).AddRange(endpoints);
+        }
+    }
+}
diff --git a/Sustainsys.Saml2.Metadata/Descriptors/AttributeAuthorityDescriptor.cs b/Sustainsys.Saml2.Metadata/Descriptors/AttributeAuthorityDescriptor.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using Microsoft.IdentityModel.Tokens.Saml2;
+using Microsoft.IdentityModel.Tokens.Saml2;
 using Sustainsys.Saml2.Metadata.Services;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 
 namespace Sustainsys.Saml2.Metadata.Descriptors
 {
@@ -15,17 +15,21 @@ public class SamlAttribute
 	}
 #endif
 
-	public class AttributeAuthorityDescriptor : RoleDescriptor
-	{
-		public ICollection<AttributeService> AttributeServices { get; private set; } =
-			new Collection<AttributeService>();
-		public ICollection<AssertionIdRequestService> AssertionIdRequestServices { get; private set; } =
-			new Collection<AssertionIdRequestService>();
-		public ICollection<NameIDFormat> NameIDFormats { get; private set; } =
-			new Collection<NameIDFormat>();
-		public ICollection<AttributeProfile> AttributeProfiles { get; private set; } =
-			new Collection<AttributeProfile>();
-		public ICollection<Saml2Attribute> Attributes { get; private set; } =
-			new Collection<Saml2Attribute>();
-	}
-}
+    public class AttributeAuthorityDescriptor : RoleDescriptor
+    {
+        public ICollection<AttributeService> AttributeServices { get; private set; } =
+            new Collection<AttributeService>();
+
+        public ICollection<AssertionIdRequestService> AssertionIdRequestServices { get; private set; } =
+            new Collection<AssertionIdRequestService>();
+
+        public ICollection<NameIDFormat> NameIDFormats { get; private set; } =
+            new Collection<NameIDFormat>();
+
+        public ICollection<AttributeProfile> AttributeProfiles { get; private set; } =
+            new Collection<AttributeProfile>();
+
+        public ICollection<Saml2Attribute> Attributes { get; private set; } =
+            new Collection<Saml2Attribute>();
+    }
+}
diff --git a/Sustainsys.Saml2.Metadata/Descriptors/AuthnAuthorityDescriptor.cs b/Sustainsys.Saml2.Metadata/Descriptors/AuthnAuthorityDescriptor.cs
@@ -1,16 +1,18 @@
-using System.Collections.Generic;
+using Sustainsys.Saml2.Metadata.Services;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using Sustainsys.Saml2.Metadata.Services;
 
 namespace Sustainsys.Saml2.Metadata.Descriptors
 {
-	public class AuthnAuthorityDescriptor : RoleDescriptor
-	{
-		public ICollection<AuthnQueryService> AuthnQueryServices { get; private set; } =
-			new Collection<AuthnQueryService>();
-		public ICollection<AssertionIdRequestService> AssertionIdRequestServices { get; private set; } =
-			new Collection<AssertionIdRequestService>();
-		public ICollection<NameIDFormat> NameIDFormats { get; private set; } =
-			new Collection<NameIDFormat>();
-	}
-}
+    public class AuthnAuthorityDescriptor : RoleDescriptor
+    {
+        public ICollection<AuthnQueryService> AuthnQueryServices { get; private set; } =
+            new Collection<AuthnQueryService>();
+
+        public ICollection<AssertionIdRequestService> AssertionIdRequestServices { get; private set; } =
+            new Collection<AssertionIdRequestService>();
+
+        public ICollection<NameIDFormat> NameIDFormats { get; private set; } =
+            new Collection<NameIDFormat>();
+    }
+}
diff --git a/Sustainsys.Saml2.Metadata/Descriptors/EntitiesDescriptor.cs b/Sustainsys.Saml2.Metadata/Descriptors/EntitiesDescriptor.cs
@@ -7,15 +7,18 @@ namespace Sustainsys.Saml2.Metadata.Descriptors
 {
     public class EntitiesDescriptor : MetadataBase, ICachedMetadata
     {
-		public ICollection<EntityDescriptor> ChildEntities { get; private set; } =
-			new Collection<EntityDescriptor>();
-		public ICollection<EntitiesDescriptor> ChildEntityGroups { get; private set; } =
-			new Collection<EntitiesDescriptor>();
-		public Collection<XmlElement> Extensions { get; private set; } =
-			new Collection<XmlElement>();
-		public string Id { get; set; }
-		public string Name { get; set; }
-		public DateTime? ValidUntil { get; set; }
-		public XsdDuration? CacheDuration { get; set; }
+        public ICollection<EntityDescriptor> ChildEntities { get; private set; } =
+            new Collection<EntityDescriptor>();
+
+        public ICollection<EntitiesDescriptor> ChildEntityGroups { get; private set; } =
+            new Collection<EntitiesDescriptor>();
+
+        public Collection<XmlElement> Extensions { get; private set; } =
+            new Collection<XmlElement>();
+
+        public string Id { get; set; }
+        public string Name { get; set; }
+        public DateTime? ValidUntil { get; set; }
+        public XsdDuration? CacheDuration { get; set; }
     }
-}
+}