2 files changed, 230 insertions, 166 deletions
diff --git a/swamid-2.0/inacademia.org-metadata-t01-p-test.xml b/swamid-2.0/inacademia.org-metadata-t01-p-test.xml
index ea30e3d5..cb08e154 100644
--- a/swamid-2.0/inacademia.org-metadata-t01-p-test.xml
+++ b/swamid-2.0/inacademia.org-metadata-t01-p-test.xml
@@ -1,85 +1,116 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns2="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://inacademia.org/metadata/t01-p-test.xml">
-  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://op.srv.inacademia.org/disco" index="1"/>
-      <ns2:UIInfo>
-        <ns2:DisplayName xml:lang="en">InAcademia.org - TEST</ns2:DisplayName>
-        <ns2:Description xml:lang="en">The InAcademia Simple validation Sevice allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance</ns2:Description>
-        <ns2:Keywords xml:lang="en">Affiliation Validation Eligibility</ns2:Keywords>
-        <ns2:Logo height="60" width="120" xml:lang="en">https://inacademia.org/static/logo.png</ns2:Logo>
-        <ns2:InformationURL xml:lang="en">https://inacademia.org/about</ns2:InformationURL>
-        <ns2:PrivacyStatementURL xml:lang="en">https://inacademia.org/about/privacy</ns2:PrivacyStatementURL>
-      </ns2:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>inacademia.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFaTCCA1GgAwIBAgIJAOVIW1ydZNQHMA0GCSqGSIb3DQEBCwUAMEsxCzAJBgNV
-BAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDETMBEGA1UECwwKaW5BY2FkZW1pYTEXMBUG
-A1UEAwwOaW5BY2FkZW1pYS5vcmcwHhcNMTUwNjEyMTM0MzU5WhcNMTUwNzEyMTM0
-MzU5WjBLMQswCQYDVQQGEwJTRTEOMAwGA1UECgwFU1VORVQxEzARBgNVBAsMCmlu
-QWNhZGVtaWExFzAVBgNVBAMMDmluQWNhZGVtaWEub3JnMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAwC/WmT5QKjdIy5hKwF0XctJOQrr2OZzss/BqyOva
-pWcYq4zOu4APJuVXlEpfra2n/Kkm95pv+pa2mJj5ikrVBVTU8lmd+5hIRm9qesHx
-a3daG89yPteYwszePVd1Gml1FJOdlK6Vaf9YpV10AlnjYpZEAY/EFy876ZRjFT6E
-MD65UCrfxNnbxSjf42ulptymrDsn4p2ZdvUN9VZiXHqlnEmL11A1S/b5ShMCUH+2
-vMUAV3qHc0h1eD2FB+uP3ONb6dOdrs7V17Vi07aDAPq4OSk2adw1/UEIle6TOA3J
-JNEydkbJFccEmT0uLJrVuM1TEWoSQL6tHH/WOYTgBxBDL/x1e/byY/csCQKHpYF8
-J6jnQUkLojr9IcxuGsPN0j46QGj+VlHq2joMzsdMP+qQY1DWEDP2c8dGLUfWG/wy
-zFQT8z2CcKbO7ePVoQRkEfAvekVSmX8kJxYEqlW1K4tWXdN6mfam01n2Crj0CTDr
-4BpqJEcw2SivkI0FxTi2my4BJnLl0dDQ6p4WhB2bsj5KgnOyUwq1T4BY+XSAIy6K
-FKLvjSyxqUQdNLb09pjscO28p4P2ICYl7TdKvmllFmmPxkMrYeUeL2VdrQ6A9rEg
-/hlprvwoowo6LgObCVEgxkojZ1CBnFHndnN8kkIZar/IlMTA6OrR8cjdLhC/oRRs
-mY0CAwEAAaNQME4wHQYDVR0OBBYEFK0CO9FDN5y7R7fsf+3piTjdgYQsMB8GA1Ud
-IwQYMBaAFK0CO9FDN5y7R7fsf+3piTjdgYQsMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggIBAFKsxMDRmpngSaQxraFbX9gnwnpoCjUazs3rRaptn3zPWERR
-NIDyO49xRxYIDPSG/FnHsvR5FJAzWR18j/e1NiZFYcLVGjXcqIJbEZh8tnqFKLDZ
-J04r8keCSEnxHGOyMzUrvdSiY8+P6iSXdym6+v9nHisaZR8YzM1vJjiZX+aZZPeh
-SBRvpY1ag3g5yzZN9AkDtx3BckFmw+41JwiRevc7d7ePaEBZUNtgVocu38sBR+EZ
-aXK1uOqUAc+9fVBHjF6TYLt3vi2qQREo/EFM2rqtsXq2THaGxXYZ6e0CoxTB44w8
-P/AGUmZ8NitlCHVXJsChzg4VvlKuZcXhcxJKrusxKR6fV/qAF5p87se3a7eRQPXi
-rnbGUa1rg/0BStM8Skt3r/72lnBnfMPyclWOgC6lGsnsE+RRAjhWveN3mMa1BP+J
-50CXKvfQ+J/Y1MycXCx/fuT1zDrMMgOAb5zZRUVfqseg9VjA5sflmSTo2TWHD4XY
-cW2UvyMopt49CyWT7TzVNACjY1H8DI22rZtBfBvMYIgCx7+ROCURerVct9qmAOZl
-r5xDQglUD/qMe+0guM4L7bSQsfirlfaySMulUL6uw16AzsVGNBayaFUxDck8S1Na
-OyAi2+3zJled9np2rxthyGEms4wOwEwziFgWzHdWhO+ySrtp9vtSFjJMpRfg
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://op.srv.inacademia.org/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://op.srv.inacademia.org/acs/redirect" index="2"/>
-    <ns0:AttributeConsumingService index="1">
-      <ns0:ServiceName xml:lang="en">InAcademia.org - TEST</ns0:ServiceName>
-      <ns0:ServiceDescription xml:lang="en">The InAcademia Simple validation Service allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance</ns0:ServiceDescription>
-      <ns0:RequestedAttribute FriendlyName="edupersonaffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <ns0:RequestedAttribute FriendlyName="schachomeorganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <ns0:RequestedAttribute FriendlyName="edupersontargetedid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <ns0:RequestedAttribute FriendlyName="edupersonprincipalname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </ns0:AttributeConsumingService>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization>
-    <ns0:OrganizationName xml:lang="en">InAcademia</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">InAcademia</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://inacademia.org/about</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson contactType="support">
-    <ns0:GivenName>InAcademia</ns0:GivenName>
-    <ns0:SurName>Enduser Support</ns0:SurName>
-    <ns0:EmailAddress>help@inacademia.org</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>InAcademia</ns0:GivenName>
-    <ns0:SurName>Administrative Support</ns0:SurName>
-    <ns0:EmailAddress>admin@inacademia.org</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>InAcademia</ns0:GivenName>
-    <ns0:SurName>Technical Support</ns0:SurName>
-    <ns0:EmailAddress>tech@inacademia.org</ns0:EmailAddress>
-  </ns0:ContactPerson>
+<?xml version='1.0' encoding='UTF-8'?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"
+                      xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+                      xmlns:ns2="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ns3="http://www.w3.org/2000/09/xmldsig#"
+                      entityID="https://inacademia.org/metadata/t01-p-test.xml">
+    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false"
+                         protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+        <ns0:Extensions>
+            <ns1:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+                                   Location="https://t01.t.inacademia.org/svs/disco" index="1"/>
+            <ns2:UIInfo>
+                <ns2:DisplayName xml:lang="en">InAcademia.org - TEST</ns2:DisplayName>
+                <ns2:Description xml:lang="en">The InAcademia Simple validation Sevice assists services in the easy and privacy preserving validation of
+                    academic affiliation (Student, Faculty, Staff). This is a TEST instance
+                </ns2:Description>
+                <ns2:Keywords xml:lang="en">Affiliation Validation Eligibility GÉANT</ns2:Keywords>
+                <ns2:Logo height="60" width="120" xml:lang="en">https://inacademia.org/static/logo.png</ns2:Logo>
+                <ns2:InformationURL xml:lang="en">https://inacademia.org/about</ns2:InformationURL>
+                <ns2:PrivacyStatementURL xml:lang="en">https://inacademia.org/about/privacy</ns2:PrivacyStatementURL>
+            </ns2:UIInfo>
+        </ns0:Extensions>
+        <ns0:KeyDescriptor use="encryption">
+            <ns3:KeyInfo>
+                <ns3:X509Data>
+                    <ns3:X509Certificate>MIIEHTCCAwWgAwIBAgIJAN85rXmh2X8PMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD
+                        VQQGEwJFVTETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDET
+                        MBEGA1UECgwKSW5BY2FkZW1pYTEcMBoGA1UECwwTU2lnbmluZyBDZXJ0aWZpY2F0
+                        ZTEXMBUGA1UEAwwOaW5hY2FkZW1pYS5vcmcxIjAgBgkqhkiG9w0BCQEWE3RlY2hA
+                        aW5hY2FkZW1pYS5vcmcwHhcNMTQxMDMxMTExMTIzWhcNMjQxMDI4MTExMTIzWjCB
+                        pDELMAkGA1UEBhMCRVUxEzARBgNVBAgMClNvbWUtU3RhdGUxEDAOBgNVBAcMB1V0
+                        cmVjaHQxEzARBgNVBAoMCkluQWNhZGVtaWExHDAaBgNVBAsME1NpZ25pbmcgQ2Vy
+                        dGlmaWNhdGUxFzAVBgNVBAMMDmluYWNhZGVtaWEub3JnMSIwIAYJKoZIhvcNAQkB
+                        FhN0ZWNoQGluYWNhZGVtaWEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+                        CgKCAQEAzGqetfNkkqINY4voyJoSBZ3zKzGcQzC7f9ei9EF2bcBk20YQY8ZTDLY6
+                        BG7TPb0kZQbeFsOLAcup/XZ4+RQiS6WAKmqUQrn7bISn0ayWW3SBO7IBu6mi2Sg0
+                        a+kDyEt/IUL4brUB1Ou5pL9ZYA1sNbfFc+k6PIbphlk4hnoZrdyMymlTXhv00p0S
+                        EaqEBf3kz62yW7dZQNCwmGR6zZMTAEYz5Irrj/99776iqNfOR7upmoeWqD35HkvZ
+                        GiJOzOxHdnabGvlBJrmLrjO4NcHIXcDCoBYfc8jfLprgll/D303f0dG2XhXSowzj
+                        T2vQ4J4EM3Y98Q9s1aqqvzk7A46mIQIDAQABo1AwTjAdBgNVHQ4EFgQUJAE/7/YL
+                        LSZ9qZjnQgiekxqHDwswHwYDVR0jBBgwFoAUJAE/7/YLLSZ9qZjnQgiekxqHDwsw
+                        DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAV/1tjVGo9EF7rzPwZrTA
+                        aeV/TRshMFlMNyAiElMpQmpkoL79AXP7biNqBJbG5CwpBPwai6PNFkRACKeZT8WT
+                        JsrjNUG9BtKeUxPD45RHAGjZr5UpMe6vNZb12BaUYeCfxlzpOU/7kKK5QvYwFcVY
+                        KL+9MK0bHP0UzkefyyeU+CajYMGJc9fZGWSz3w9vcPAREEVXLc+lmCXT2Y7YoMmX
+                        ZCGGK52oyl1XLxxGngqCUjnNrWfch5JAvq6vF/ci5cIC77ukgZB9FExkC8INwtKC
+                        GFBECWegI4MjC6cgpz+fU28cRQW9okJkE6/ssGfZDXc8k3z1x3NJYI50rbKfCc+y
+                        NA==
+                    </ns3:X509Certificate>
+                </ns3:X509Data>
+            </ns3:KeyInfo>
+        </ns0:KeyDescriptor>
+        <ns0:KeyDescriptor use="signing">
+            <ns3:KeyInfo>
+                <ns3:X509Data>
+                    <ns3:X509Certificate>MIIEHTCCAwWgAwIBAgIJAN85rXmh2X8PMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD
+                        VQQGEwJFVTETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDET
+                        MBEGA1UECgwKSW5BY2FkZW1pYTEcMBoGA1UECwwTU2lnbmluZyBDZXJ0aWZpY2F0
+                        ZTEXMBUGA1UEAwwOaW5hY2FkZW1pYS5vcmcxIjAgBgkqhkiG9w0BCQEWE3RlY2hA
+                        aW5hY2FkZW1pYS5vcmcwHhcNMTQxMDMxMTExMTIzWhcNMjQxMDI4MTExMTIzWjCB
+                        pDELMAkGA1UEBhMCRVUxEzARBgNVBAgMClNvbWUtU3RhdGUxEDAOBgNVBAcMB1V0
+                        cmVjaHQxEzARBgNVBAoMCkluQWNhZGVtaWExHDAaBgNVBAsME1NpZ25pbmcgQ2Vy
+                        dGlmaWNhdGUxFzAVBgNVBAMMDmluYWNhZGVtaWEub3JnMSIwIAYJKoZIhvcNAQkB
+                        FhN0ZWNoQGluYWNhZGVtaWEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+                        CgKCAQEAzGqetfNkkqINY4voyJoSBZ3zKzGcQzC7f9ei9EF2bcBk20YQY8ZTDLY6
+                        BG7TPb0kZQbeFsOLAcup/XZ4+RQiS6WAKmqUQrn7bISn0ayWW3SBO7IBu6mi2Sg0
+                        a+kDyEt/IUL4brUB1Ou5pL9ZYA1sNbfFc+k6PIbphlk4hnoZrdyMymlTXhv00p0S
+                        EaqEBf3kz62yW7dZQNCwmGR6zZMTAEYz5Irrj/99776iqNfOR7upmoeWqD35HkvZ
+                        GiJOzOxHdnabGvlBJrmLrjO4NcHIXcDCoBYfc8jfLprgll/D303f0dG2XhXSowzj
+                        T2vQ4J4EM3Y98Q9s1aqqvzk7A46mIQIDAQABo1AwTjAdBgNVHQ4EFgQUJAE/7/YL
+                        LSZ9qZjnQgiekxqHDwswHwYDVR0jBBgwFoAUJAE/7/YLLSZ9qZjnQgiekxqHDwsw
+                        DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAV/1tjVGo9EF7rzPwZrTA
+                        aeV/TRshMFlMNyAiElMpQmpkoL79AXP7biNqBJbG5CwpBPwai6PNFkRACKeZT8WT
+                        JsrjNUG9BtKeUxPD45RHAGjZr5UpMe6vNZb12BaUYeCfxlzpOU/7kKK5QvYwFcVY
+                        KL+9MK0bHP0UzkefyyeU+CajYMGJc9fZGWSz3w9vcPAREEVXLc+lmCXT2Y7YoMmX
+                        ZCGGK52oyl1XLxxGngqCUjnNrWfch5JAvq6vF/ci5cIC77ukgZB9FExkC8INwtKC
+                        GFBECWegI4MjC6cgpz+fU28cRQW9okJkE6/ssGfZDXc8k3z1x3NJYI50rbKfCc+y
+                        NA==
+                    </ns3:X509Certificate>
+                </ns3:X509Data>
+            </ns3:KeyInfo>
+        </ns0:KeyDescriptor>
+        <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</ns0:NameIDFormat>
+        <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+                                      Location="https://t01.t.inacademia.org/svs/acs/post" index="1"/>
+        <ns0:AttributeConsumingService index="1">
+            <ns0:ServiceName xml:lang="en">InAcademia.org - TEST</ns0:ServiceName>
+            <ns0:ServiceDescription xml:lang="en">The InAcademia Simple validation Sevice assists services in the easy and privacy preserving validation of
+                    academic affiliation (Student, Faculty, Staff). This is a TEST instance
+            </ns0:ServiceDescription>
+            <ns0:RequestedAttribute FriendlyName="edupersonaffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"
+                                    NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+            <ns0:RequestedAttribute FriendlyName="schachomeorganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9"
+                                    NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+        </ns0:AttributeConsumingService>
+    </ns0:SPSSODescriptor>
+    <ns0:Organization>
+        <ns0:OrganizationName xml:lang="en">InAcademia</ns0:OrganizationName>
+        <ns0:OrganizationDisplayName xml:lang="en">InAcademia</ns0:OrganizationDisplayName>
+        <ns0:OrganizationURL xml:lang="en">https://inacademia.org/about</ns0:OrganizationURL>
+    </ns0:Organization>
+    <ns0:ContactPerson contactType="support">
+        <ns0:GivenName>InAcademia</ns0:GivenName>
+        <ns0:SurName>Enduser Support</ns0:SurName>
+        <ns0:EmailAddress>mailto:support@inacademia.org</ns0:EmailAddress>
+    </ns0:ContactPerson>
+    <ns0:ContactPerson contactType="technical">
+        <ns0:GivenName>InAcademia</ns0:GivenName>
+        <ns0:SurName>Administrative Support</ns0:SurName>
+        <ns0:EmailAddress>mailto:admin@inacademia.org</ns0:EmailAddress>
+    </ns0:ContactPerson>
+    <ns0:ContactPerson contactType="technical">
+        <ns0:GivenName>InAcademia</ns0:GivenName>
+        <ns0:SurName>Technical Support</ns0:SurName>
+        <ns0:EmailAddress>mailto:tech@inacademia.org</ns0:EmailAddress>
+    </ns0:ContactPerson>
 </ns0:EntityDescriptor>
diff --git a/swamid-2.0/inacademia.org-metadata-t01-t-test.xml b/swamid-2.0/inacademia.org-metadata-t01-t-test.xml
index 2ec51e85..4d3acac5 100644
--- a/swamid-2.0/inacademia.org-metadata-t01-t-test.xml
+++ b/swamid-2.0/inacademia.org-metadata-t01-t-test.xml
@@ -1,83 +1,116 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns2="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://inacademia.org/metadata/t01-t-test.xml">
-  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <ns0:Extensions>
-      <ns1:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://op.srv.inacademia.org/disco" index="1"/>
-      <ns2:UIInfo>
-        <ns2:DisplayName xml:lang="en">InAcademia.org - TEST</ns2:DisplayName>
-        <ns2:Description xml:lang="en">The InAcademia Simple validation Sevice allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance</ns2:Description>
-        <ns2:Keywords xml:lang="en">Affiliation Validation Eligibility</ns2:Keywords>
-        <ns2:Logo height="60" width="120" xml:lang="en">https://inacademia.org/static/logo.png</ns2:Logo>
-        <ns2:InformationURL xml:lang="en">https://inacademia.org/about</ns2:InformationURL>
-        <ns2:PrivacyStatementURL xml:lang="en">https://inacademia.org/about/privacy</ns2:PrivacyStatementURL>
-      </ns2:UIInfo>
-    </ns0:Extensions>
-    <ns0:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>inacademia.org</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFaTCCA1GgAwIBAgIJAOVIW1ydZNQHMA0GCSqGSIb3DQEBCwUAMEsxCzAJBgNV
-BAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDETMBEGA1UECwwKaW5BY2FkZW1pYTEXMBUG
-A1UEAwwOaW5BY2FkZW1pYS5vcmcwHhcNMTUwNjEyMTM0MzU5WhcNMTUwNzEyMTM0
-MzU5WjBLMQswCQYDVQQGEwJTRTEOMAwGA1UECgwFU1VORVQxEzARBgNVBAsMCmlu
-QWNhZGVtaWExFzAVBgNVBAMMDmluQWNhZGVtaWEub3JnMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAwC/WmT5QKjdIy5hKwF0XctJOQrr2OZzss/BqyOva
-pWcYq4zOu4APJuVXlEpfra2n/Kkm95pv+pa2mJj5ikrVBVTU8lmd+5hIRm9qesHx
-a3daG89yPteYwszePVd1Gml1FJOdlK6Vaf9YpV10AlnjYpZEAY/EFy876ZRjFT6E
-MD65UCrfxNnbxSjf42ulptymrDsn4p2ZdvUN9VZiXHqlnEmL11A1S/b5ShMCUH+2
-vMUAV3qHc0h1eD2FB+uP3ONb6dOdrs7V17Vi07aDAPq4OSk2adw1/UEIle6TOA3J
-JNEydkbJFccEmT0uLJrVuM1TEWoSQL6tHH/WOYTgBxBDL/x1e/byY/csCQKHpYF8
-J6jnQUkLojr9IcxuGsPN0j46QGj+VlHq2joMzsdMP+qQY1DWEDP2c8dGLUfWG/wy
-zFQT8z2CcKbO7ePVoQRkEfAvekVSmX8kJxYEqlW1K4tWXdN6mfam01n2Crj0CTDr
-4BpqJEcw2SivkI0FxTi2my4BJnLl0dDQ6p4WhB2bsj5KgnOyUwq1T4BY+XSAIy6K
-FKLvjSyxqUQdNLb09pjscO28p4P2ICYl7TdKvmllFmmPxkMrYeUeL2VdrQ6A9rEg
-/hlprvwoowo6LgObCVEgxkojZ1CBnFHndnN8kkIZar/IlMTA6OrR8cjdLhC/oRRs
-mY0CAwEAAaNQME4wHQYDVR0OBBYEFK0CO9FDN5y7R7fsf+3piTjdgYQsMB8GA1Ud
-IwQYMBaAFK0CO9FDN5y7R7fsf+3piTjdgYQsMAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQELBQADggIBAFKsxMDRmpngSaQxraFbX9gnwnpoCjUazs3rRaptn3zPWERR
-NIDyO49xRxYIDPSG/FnHsvR5FJAzWR18j/e1NiZFYcLVGjXcqIJbEZh8tnqFKLDZ
-J04r8keCSEnxHGOyMzUrvdSiY8+P6iSXdym6+v9nHisaZR8YzM1vJjiZX+aZZPeh
-SBRvpY1ag3g5yzZN9AkDtx3BckFmw+41JwiRevc7d7ePaEBZUNtgVocu38sBR+EZ
-aXK1uOqUAc+9fVBHjF6TYLt3vi2qQREo/EFM2rqtsXq2THaGxXYZ6e0CoxTB44w8
-P/AGUmZ8NitlCHVXJsChzg4VvlKuZcXhcxJKrusxKR6fV/qAF5p87se3a7eRQPXi
-rnbGUa1rg/0BStM8Skt3r/72lnBnfMPyclWOgC6lGsnsE+RRAjhWveN3mMa1BP+J
-50CXKvfQ+J/Y1MycXCx/fuT1zDrMMgOAb5zZRUVfqseg9VjA5sflmSTo2TWHD4XY
-cW2UvyMopt49CyWT7TzVNACjY1H8DI22rZtBfBvMYIgCx7+ROCURerVct9qmAOZl
-r5xDQglUD/qMe+0guM4L7bSQsfirlfaySMulUL6uw16AzsVGNBayaFUxDck8S1Na
-OyAi2+3zJled9np2rxthyGEms4wOwEwziFgWzHdWhO+ySrtp9vtSFjJMpRfg
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </ns0:KeyDescriptor>
-    <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://op.srv.inacademia.org/acs/post" index="1"/>
-    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://op.srv.inacademia.org/acs/redirect" index="2"/>
-    <ns0:AttributeConsumingService index="1">
-      <ns0:ServiceName xml:lang="en">InAcademia.org - TEST</ns0:ServiceName>
-      <ns0:ServiceDescription xml:lang="en">The InAcademia Simple validation Service allows for the easy validation of affiliation (Student, Faculty, Staff) of a user in Academia. This is a TEST instance</ns0:ServiceDescription>
-      <ns0:RequestedAttribute FriendlyName="edupersonaffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <ns0:RequestedAttribute FriendlyName="schachomeorganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </ns0:AttributeConsumingService>
-  </ns0:SPSSODescriptor>
-  <ns0:Organization>
-    <ns0:OrganizationName xml:lang="en">InAcademia</ns0:OrganizationName>
-    <ns0:OrganizationDisplayName xml:lang="en">InAcademia</ns0:OrganizationDisplayName>
-    <ns0:OrganizationURL xml:lang="en">https://inacademia.org/about</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson contactType="support">
-    <ns0:GivenName>InAcademia</ns0:GivenName>
-    <ns0:SurName>Enduser Support</ns0:SurName>
-    <ns0:EmailAddress>help@inacademia.org</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>InAcademia</ns0:GivenName>
-    <ns0:SurName>Administrative Support</ns0:SurName>
-    <ns0:EmailAddress>admin@inacademia.org</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson contactType="technical">
-    <ns0:GivenName>InAcademia</ns0:GivenName>
-    <ns0:SurName>Technical Support</ns0:SurName>
-    <ns0:EmailAddress>tech@inacademia.org</ns0:EmailAddress>
-  </ns0:ContactPerson>
+<?xml version='1.0' encoding='UTF-8'?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata"
+                      xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+                      xmlns:ns2="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ns3="http://www.w3.org/2000/09/xmldsig#"
+                      entityID="https://inacademia.org/metadata/t01-t-test.xml">
+    <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false"
+                         protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+        <ns0:Extensions>
+            <ns1:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
+                                   Location="https://t01.t.inacademia.org/svs/disco" index="1"/>
+            <ns2:UIInfo>
+                <ns2:DisplayName xml:lang="en">InAcademia.org - TEST</ns2:DisplayName>
+                <ns2:Description xml:lang="en">The InAcademia Simple validation Sevice assists services in the easy and privacy preserving validation of
+                    academic affiliation (Student, Faculty, Staff). This is a TEST instance
+                </ns2:Description>
+                <ns2:Keywords xml:lang="en">Affiliation Validation Eligibility</ns2:Keywords>
+                <ns2:Logo height="60" width="120" xml:lang="en">https://inacademia.org/static/logo.png</ns2:Logo>
+                <ns2:InformationURL xml:lang="en">https://inacademia.org/about</ns2:InformationURL>
+                <ns2:PrivacyStatementURL xml:lang="en">https://inacademia.org/about/privacy</ns2:PrivacyStatementURL>
+            </ns2:UIInfo>
+        </ns0:Extensions>
+        <ns0:KeyDescriptor use="encryption">
+            <ns3:KeyInfo>
+                <ns3:X509Data>
+                    <ns3:X509Certificate>MIIEHTCCAwWgAwIBAgIJAN85rXmh2X8PMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD
+                        VQQGEwJFVTETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDET
+                        MBEGA1UECgwKSW5BY2FkZW1pYTEcMBoGA1UECwwTU2lnbmluZyBDZXJ0aWZpY2F0
+                        ZTEXMBUGA1UEAwwOaW5hY2FkZW1pYS5vcmcxIjAgBgkqhkiG9w0BCQEWE3RlY2hA
+                        aW5hY2FkZW1pYS5vcmcwHhcNMTQxMDMxMTExMTIzWhcNMjQxMDI4MTExMTIzWjCB
+                        pDELMAkGA1UEBhMCRVUxEzARBgNVBAgMClNvbWUtU3RhdGUxEDAOBgNVBAcMB1V0
+                        cmVjaHQxEzARBgNVBAoMCkluQWNhZGVtaWExHDAaBgNVBAsME1NpZ25pbmcgQ2Vy
+                        dGlmaWNhdGUxFzAVBgNVBAMMDmluYWNhZGVtaWEub3JnMSIwIAYJKoZIhvcNAQkB
+                        FhN0ZWNoQGluYWNhZGVtaWEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+                        CgKCAQEAzGqetfNkkqINY4voyJoSBZ3zKzGcQzC7f9ei9EF2bcBk20YQY8ZTDLY6
+                        BG7TPb0kZQbeFsOLAcup/XZ4+RQiS6WAKmqUQrn7bISn0ayWW3SBO7IBu6mi2Sg0
+                        a+kDyEt/IUL4brUB1Ou5pL9ZYA1sNbfFc+k6PIbphlk4hnoZrdyMymlTXhv00p0S
+                        EaqEBf3kz62yW7dZQNCwmGR6zZMTAEYz5Irrj/99776iqNfOR7upmoeWqD35HkvZ
+                        GiJOzOxHdnabGvlBJrmLrjO4NcHIXcDCoBYfc8jfLprgll/D303f0dG2XhXSowzj
+                        T2vQ4J4EM3Y98Q9s1aqqvzk7A46mIQIDAQABo1AwTjAdBgNVHQ4EFgQUJAE/7/YL
+                        LSZ9qZjnQgiekxqHDwswHwYDVR0jBBgwFoAUJAE/7/YLLSZ9qZjnQgiekxqHDwsw
+                        DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAV/1tjVGo9EF7rzPwZrTA
+                        aeV/TRshMFlMNyAiElMpQmpkoL79AXP7biNqBJbG5CwpBPwai6PNFkRACKeZT8WT
+                        JsrjNUG9BtKeUxPD45RHAGjZr5UpMe6vNZb12BaUYeCfxlzpOU/7kKK5QvYwFcVY
+                        KL+9MK0bHP0UzkefyyeU+CajYMGJc9fZGWSz3w9vcPAREEVXLc+lmCXT2Y7YoMmX
+                        ZCGGK52oyl1XLxxGngqCUjnNrWfch5JAvq6vF/ci5cIC77ukgZB9FExkC8INwtKC
+                        GFBECWegI4MjC6cgpz+fU28cRQW9okJkE6/ssGfZDXc8k3z1x3NJYI50rbKfCc+y
+                        NA==
+                    </ns3:X509Certificate>
+                </ns3:X509Data>
+            </ns3:KeyInfo>
+        </ns0:KeyDescriptor>
+        <ns0:KeyDescriptor use="signing">
+            <ns3:KeyInfo>
+                <ns3:X509Data>
+                    <ns3:X509Certificate>MIIEHTCCAwWgAwIBAgIJAN85rXmh2X8PMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD
+                        VQQGEwJFVTETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDET
+                        MBEGA1UECgwKSW5BY2FkZW1pYTEcMBoGA1UECwwTU2lnbmluZyBDZXJ0aWZpY2F0
+                        ZTEXMBUGA1UEAwwOaW5hY2FkZW1pYS5vcmcxIjAgBgkqhkiG9w0BCQEWE3RlY2hA
+                        aW5hY2FkZW1pYS5vcmcwHhcNMTQxMDMxMTExMTIzWhcNMjQxMDI4MTExMTIzWjCB
+                        pDELMAkGA1UEBhMCRVUxEzARBgNVBAgMClNvbWUtU3RhdGUxEDAOBgNVBAcMB1V0
+                        cmVjaHQxEzARBgNVBAoMCkluQWNhZGVtaWExHDAaBgNVBAsME1NpZ25pbmcgQ2Vy
+                        dGlmaWNhdGUxFzAVBgNVBAMMDmluYWNhZGVtaWEub3JnMSIwIAYJKoZIhvcNAQkB
+                        FhN0ZWNoQGluYWNhZGVtaWEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+                        CgKCAQEAzGqetfNkkqINY4voyJoSBZ3zKzGcQzC7f9ei9EF2bcBk20YQY8ZTDLY6
+                        BG7TPb0kZQbeFsOLAcup/XZ4+RQiS6WAKmqUQrn7bISn0ayWW3SBO7IBu6mi2Sg0
+                        a+kDyEt/IUL4brUB1Ou5pL9ZYA1sNbfFc+k6PIbphlk4hnoZrdyMymlTXhv00p0S
+                        EaqEBf3kz62yW7dZQNCwmGR6zZMTAEYz5Irrj/99776iqNfOR7upmoeWqD35HkvZ
+                        GiJOzOxHdnabGvlBJrmLrjO4NcHIXcDCoBYfc8jfLprgll/D303f0dG2XhXSowzj
+                        T2vQ4J4EM3Y98Q9s1aqqvzk7A46mIQIDAQABo1AwTjAdBgNVHQ4EFgQUJAE/7/YL
+                        LSZ9qZjnQgiekxqHDwswHwYDVR0jBBgwFoAUJAE/7/YLLSZ9qZjnQgiekxqHDwsw
+                        DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAV/1tjVGo9EF7rzPwZrTA
+                        aeV/TRshMFlMNyAiElMpQmpkoL79AXP7biNqBJbG5CwpBPwai6PNFkRACKeZT8WT
+                        JsrjNUG9BtKeUxPD45RHAGjZr5UpMe6vNZb12BaUYeCfxlzpOU/7kKK5QvYwFcVY
+                        KL+9MK0bHP0UzkefyyeU+CajYMGJc9fZGWSz3w9vcPAREEVXLc+lmCXT2Y7YoMmX
+                        ZCGGK52oyl1XLxxGngqCUjnNrWfch5JAvq6vF/ci5cIC77ukgZB9FExkC8INwtKC
+                        GFBECWegI4MjC6cgpz+fU28cRQW9okJkE6/ssGfZDXc8k3z1x3NJYI50rbKfCc+y
+                        NA==
+                    </ns3:X509Certificate>
+                </ns3:X509Data>
+            </ns3:KeyInfo>
+        </ns0:KeyDescriptor>
+        <ns0:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</ns0:NameIDFormat>
+        <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+                                      Location="https://t01.t.inacademia.org/svs/acs/post" index="1"/>
+        <ns0:AttributeConsumingService index="1">
+            <ns0:ServiceName xml:lang="en">InAcademia.org - TEST</ns0:ServiceName>
+            <ns0:ServiceDescription xml:lang="en">The InAcademia Simple validation Sevice assists services in the easy and privacy preserving validation of
+                    academic affiliation (Student, Faculty, Staff). This is a TEST instance
+            </ns0:ServiceDescription>
+            <ns0:RequestedAttribute FriendlyName="edupersonaffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"
+                                    NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+            <ns0:RequestedAttribute FriendlyName="schachomeorganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9"
+                                    NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+        </ns0:AttributeConsumingService>
+    </ns0:SPSSODescriptor>
+    <ns0:Organization>
+        <ns0:OrganizationName xml:lang="en">InAcademia</ns0:OrganizationName>
+        <ns0:OrganizationDisplayName xml:lang="en">InAcademia</ns0:OrganizationDisplayName>
+        <ns0:OrganizationURL xml:lang="en">https://inacademia.org/about</ns0:OrganizationURL>
+    </ns0:Organization>
+    <ns0:ContactPerson contactType="support">
+        <ns0:GivenName>InAcademia</ns0:GivenName>
+        <ns0:SurName>Enduser Support</ns0:SurName>
+        <ns0:EmailAddress>mailto:support@inacademia.org</ns0:EmailAddress>
+    </ns0:ContactPerson>
+    <ns0:ContactPerson contactType="technical">
+        <ns0:GivenName>InAcademia</ns0:GivenName>
+        <ns0:SurName>Administrative Support</ns0:SurName>
+        <ns0:EmailAddress>mailto:admin@inacademia.org</ns0:EmailAddress>
+    </ns0:ContactPerson>
+    <ns0:ContactPerson contactType="technical">
+        <ns0:GivenName>InAcademia</ns0:GivenName>
+        <ns0:SurName>Technical Support</ns0:SurName>
+        <ns0:EmailAddress>mailto:tech@inacademia.org</ns0:EmailAddress>
+    </ns0:ContactPerson>
 </ns0:EntityDescriptor>