move parts of token to metadata project

Sustainsys.Saml2/Metadata/KeyDescriptor.cs → Sustainsys.Saml2.Metadata/Descriptors/KeyDescriptor.cs

@@ -1,11 +1,7 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Text;
-using Sustainsys.Saml2.Tokens;
-using Microsoft.IdentityModel.Xml;
 
-namespace Sustainsys.Saml2.Metadata
+namespace Sustainsys.Saml2.Metadata.Descriptors
 {
 	public class KeyDescriptor
 	{

Sustainsys.Saml2/Internal/CompareHelper.cs → Sustainsys.Saml2.Metadata/Helpers/CompareHelper.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Sustainsys.Saml2.Internal
+namespace Sustainsys.Saml2.Metadata.Helpers
 {
     static class CompareHelper
     {

Sustainsys.Saml2.Metadata/KeyInfo.cs

@@ -0,0 +1,151 @@
+using Sustainsys.Saml2.Metadata.Tokens;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Security.Cryptography;
+using System.Security.Cryptography.X509Certificates;
+using System.Xml;
+
+namespace Sustainsys.Saml2.Metadata
+{
+    public abstract class KeyData
+    {
+    }
+
+    public class X509Digest
+    {
+        public Uri Algorithm { get; set; }
+        public byte[] Value { get; set; }
+    }
+
+    public class X509IssuerSerial
+    {
+        public string Name { get; private set; }
+        public string Serial { get; private set; }
+
+        public X509IssuerSerial(string name, string serial)
+        {
+            Name = name;
+            Serial = serial;
+        }
+    }
+
+    public class X509Data : KeyData
+    {
+        public X509IssuerSerial IssuerSerial { get; set; }
+        public byte[] SKI { get; set; }
+        public string SubjectName { get; set; }
+
+        public ICollection<X509Certificate2> Certificates { get; set; } =
+            new Collection<X509Certificate2>();
+
+        public byte[] CRL { get; set; }
+        public X509Digest Digest { get; set; }
+    }
+
+    public class RetrievalMethod
+    {
+        public Uri Uri { get; set; }
+        public Uri Type { get; set; }
+
+        public ICollection<XmlElement> Transforms { get; private set; } =
+            new Collection<XmlElement>();
+    }
+
+    public abstract class KeyValue
+    {
+    }
+
+    public class DsaKeyValue : KeyValue
+    {
+        public DSAParameters Parameters { get; set; }
+
+        public DsaKeyValue(DSAParameters parameters)
+        {
+            Parameters = parameters;
+        }
+    }
+
+    public class RsaKeyValue : KeyValue
+    {
+        public RSAParameters Parameters { get; set; }
+
+        public RsaKeyValue(RSAParameters parameters)
+        {
+            Parameters = parameters;
+        }
+    }
+
+#if !NET461
+
+    public class EcKeyValue : KeyValue
+    {
+        public ECParameters Parameters { get; set; }
+
+        public EcKeyValue(ECParameters parameters)
+        {
+            Parameters = parameters;
+        }
+    }
+
+#endif
+
+    public class DSigKeyInfo
+    {
+        public string Id { get; set; }
+
+        public ICollection<string> KeyNames { get; private set; } =
+            new Collection<string>();
+
+        public ICollection<KeyValue> KeyValues { get; private set; } =
+            new Collection<KeyValue>();
+
+        public ICollection<RetrievalMethod> RetrievalMethods { get; private set; } =
+            new Collection<RetrievalMethod>();
+
+        public ICollection<KeyData> Data { get; private set; } =
+            new Collection<KeyData>();
+
+        public SecurityKeyIdentifier MakeSecurityKeyIdentifier()
+        {
+            var ski = new SecurityKeyIdentifier();
+            foreach (var keyValue in KeyValues)
+            {
+                if (keyValue is RsaKeyValue rsaKeyValue)
+                {
+                    ski.Add(new RsaKeyIdentifierClause(rsaKeyValue.Parameters));
+                }
+                else if (keyValue is DsaKeyValue dsaKeyValue)
+                {
+                    ski.Add(new DsaKeyIdentifierClause(dsaKeyValue.Parameters));
+                }
+#if !NET461
+                else if (keyValue is EcKeyValue ecKeyValue)
+                {
+                    ski.Add(new EcKeyIdentifierClause(ecKeyValue.Parameters));
+                }
+#endif
+            }
+            foreach (string keyName in KeyNames)
+            {
+                ski.Add(new KeyNameIdentifierClause(keyName));
+            }
+            foreach (var keyData in Data)
+            {
+                if (keyData is X509Data x509Data)
+                {
+                    foreach (var cert in x509Data.Certificates)
+                    {
+                        ski.Add(new X509RawDataKeyIdentifierClause(cert));
+                    }
+                    if (x509Data.IssuerSerial != null)
+                    {
+                        ski.Add(new X509IssuerSerialKeyIdentifierClause(
+                            x509Data.IssuerSerial.Name, x509Data.IssuerSerial.Serial));
+                    }
+                }
+            }
+            return ski;
+        }
+    }
+}

Sustainsys.Saml2.Metadata/KeyType.cs

@@ -0,0 +1,9 @@
+namespace Sustainsys.Saml2.Metadata
+{
+	public enum KeyType
+	{
+		Unspecified = 0,
+		Signing = 1,
+		Encryption = 2
+	}
+}

Sustainsys.Saml2.Metadata/Services/ApplicationService.cs → Sustainsys.Saml2.Metadata/Services/ApplicationServiceEndpoint.cs

@@ -1,6 +1,6 @@
 namespace Sustainsys.Saml2.Metadata.Services
 {
-    public class ApplicationService : Endpoint
+    public class ApplicationServiceEndpoint : Endpoint
     {
     }
 }

Sustainsys.Saml2.Metadata/Services/PassiveRequestorEndpoint.cs

@@ -0,0 +1,6 @@
+namespace Sustainsys.Saml2.Metadata.Services
+{
+	public class PassiveRequestorEndpoint : Endpoint
+	{
+	}
+}

Sustainsys.Saml2.Metadata/Services/SingleSignOutNotificationEndpoint.cs

@@ -0,0 +1,6 @@
+namespace Sustainsys.Saml2.Metadata.Services
+{
+	public class SingleSignOutNotificationEndpoint : Endpoint
+	{
+	}
+}

Sustainsys.Saml2.Metadata/Sustainsys.Saml2.Metadata.csproj

@@ -23,8 +23,4 @@
     <PackageReference Include="System.Security.Cryptography.Xml" Version="4.5.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Descriptors\" />
-  </ItemGroup>
-
 </Project>

Sustainsys.Saml2/Tokens/AsymmetricSecurityKey.cs → Sustainsys.Saml2.Metadata/Tokens/AsymmetricSecurityKey.cs

@@ -1,6 +1,6 @@
 using System.Security.Cryptography;
 
-namespace Sustainsys.Saml2.Tokens
+namespace Sustainsys.Saml2.Metadata.Tokens
 {
 	public abstract class AsymmetricSecurityKey : SecurityKey
 	{

Sustainsys.Saml2/Tokens/BinaryKeyIdentifierClause.cs → Sustainsys.Saml2.Metadata/Tokens/BinaryKeyIdentifierClause.cs

@@ -1,7 +1,7 @@
-using Microsoft.IdentityModel.Tokens;
-using System;
+using System;
+using Microsoft.IdentityModel.Tokens;
 
-namespace Sustainsys.Saml2.Tokens
+namespace Sustainsys.Saml2.Metadata.Tokens
 {
 	public abstract class BinaryKeyIdentifierClause : SecurityKeyIdentifierClause
 	{

Sustainsys.Saml2/Tokens/DsaKeyIdentifierClause.cs → Sustainsys.Saml2.Metadata/Tokens/DsaKeyIdentifierClause.cs

@@ -1,10 +1,9 @@
-using Sustainsys.Saml2.Internal;
-using System;
-using System.Linq;
+using System;
 using System.Security.Cryptography;
 using System.Security.Cryptography.Xml;
+using Sustainsys.Saml2.Metadata.Helpers;
 
-namespace Sustainsys.Saml2.Tokens
+namespace Sustainsys.Saml2.Metadata.Tokens
 {
 	public class DsaSecurityKey : AsymmetricSecurityKey
 	{

Sustainsys.Saml2/Tokens/EcKeyIdentifierClause.cs → Sustainsys.Saml2.Metadata/Tokens/EcKeyIdentifierClause.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Security.Cryptography;
-using Sustainsys.Saml2.Internal;
+using Sustainsys.Saml2.Metadata.Helpers;
 
 #if !NET461
 
-namespace Sustainsys.Saml2.Tokens
+namespace Sustainsys.Saml2.Metadata.Tokens
 {
     static class EcUtils
 	{

Sustainsys.Saml2/Tokens/KeyNameIdentifierClause.cs → Sustainsys.Saml2.Metadata/Tokens/KeyNameIdentifierClause.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Sustainsys.Saml2.Tokens
+namespace Sustainsys.Saml2.Metadata.Tokens
 {
     public class KeyNameIdentifierClause : SecurityKeyIdentifierClause
     {

Sustainsys.Saml2/Tokens/RsaKeyIdentifierClause.cs → Sustainsys.Saml2.Metadata/Tokens/RsaKeyIdentifierClause.cs

@@ -1,11 +1,9 @@
-using Sustainsys.Saml2.Internal;
-using System;
-using System.Linq;
+using System;
 using System.Security.Cryptography;
 using System.Security.Cryptography.Xml;
-using System.Xml;
+using Sustainsys.Saml2.Metadata.Helpers;
 
-namespace Sustainsys.Saml2.Tokens
+namespace Sustainsys.Saml2.Metadata.Tokens
 {
 	public class RsaSecurityKey : AsymmetricSecurityKey
 	{

Sustainsys.Saml2/Tokens/SecurityAlgorithms.cs → Sustainsys.Saml2.Metadata/Tokens/SecurityAlgorithms.cs

@@ -1,4 +1,4 @@
-namespace Sustainsys.Saml2.Tokens
+namespace Sustainsys.Saml2.Metadata.Tokens
 {
 	public static class SecurityAlgorithms
 	{

Sustainsys.Saml2/Tokens/SecurityKey.cs → Sustainsys.Saml2.Metadata/Tokens/SecurityKey.cs

@@ -1,4 +1,4 @@
-namespace Sustainsys.Saml2.Tokens
+namespace Sustainsys.Saml2.Metadata.Tokens
 {
 	public abstract class SecurityKey
 	{