Resolves SWAMIDOPS-1550

2 files changed, 56 insertions, 0 deletions

diff --git a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-btj.xml b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-btj.xml
new file mode 100644
index 00000000..94b77f0d
--- /dev/null
+++ b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-btj.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://swamid-2.grandid.com/module.php/saml/sp/metadata.php/ProxySP-Swamid-btj">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol" AuthnRequestsSigned="true">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">BTJ Sverige AB</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">BTJ Sverige AB</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Tjänst för hantering av böcker köpta av organisationer digitalt</mdui:Description>
+        <mdui:Description xml:lang="en">Service for managing books purchased by organizations digitally</mdui:Description>
+        <mdui:Logo width="568" height="530">http://www.btj.se/wp-content/uploads/2016/06/logo-1.png</mdui:Logo>
+      </mdui:UIInfo>
+      <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/ProxySP-Swamid-btj"/>
+    <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/ProxySP-Swamid-btj" 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/ProxySP-Swamid-btj" 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/ProxySP-Swamid-btj" 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/ProxySP-Swamid-btj/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="sv">BTJ Sverige AB</md:ServiceName>
+      <md:ServiceName xml:lang="en">BTJ Sverige AB</md:ServiceName>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute 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" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+    </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="administrative">
+    <md:EmailAddress>mailto:btjbc@btj.se.</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Svensk E-identitet / GrandID Support</md:GivenName>
+    <md:EmailAddress>mailto:support@grandid.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ac77f302..1b0d76b3 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -601,4 +601,5 @@
   <xi:include href="swamid-2.0/filesender.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/www.integrationstest.ladok.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/student.integrationstest.ladok.se-student-sp.xml"/>
+  <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-btj.xml"/>
 </md:EntitiesDescriptor>