Resolved SWAMID-646

2 files changed, 0 insertions, 44 deletions

diff --git a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml
deleted file mode 100644
index 5eb81b40..00000000
--- a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://swamid-2.grandid.com/module.php/saml/sp/metadata.php/gu-swamid-draftit">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol" AuthnRequestsSigned="true">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" index="1" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://swamid-2.grandid.com/module.php/saml/sp/discoresp.php"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>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</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://swamid-2.grandid.com/module.php/saml/sp/saml2-logout.php/gu-swamid-draftit"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://swamid-2.grandid.com/module.php/saml/sp/saml2-acs.php/gu-swamid-draftit" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://swamid-2.grandid.com/module.php/saml/sp/saml1-acs.php/gu-swamid-draftit" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swamid-2.grandid.com/module.php/saml/sp/saml2-acs.php/gu-swamid-draftit" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://swamid-2.grandid.com/module.php/saml/sp/saml1-acs.php/gu-swamid-draftit/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="sv">Draftit</md:ServiceName>
-      <md:ServiceName xml:lang="en">Draftit</md:ServiceName>
-      <md:RequestedAttribute Name="givenName" isRequired="true"/>
-      <md:RequestedAttribute Name="sn" isRequired="true"/>
-      <md:RequestedAttribute Name="mail" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Svensk E-identitet SP</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Svensk E-identitet AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.e-identitet.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Svensk E-identitet / GrandID Support</md:GivenName>
-    <md:EmailAddress>support@grandid.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index d2c5804a..c9f600f5 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -702,6 +702,5 @@
   <xi:include href="swamid-2.0/websrv01.testad.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/confluence.its.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml"/>
-  <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml"/>
   <xi:include href="swamid-2.0/spadfs.it.gu.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
 </md:EntitiesDescriptor>