From 217fd9e7d8e6b79706af093969b37f1b9805a1b8 Mon Sep 17 00:00:00 2001
From: Björn Mattsson <Bjorn.Mattsson@bth.se>
Date: Mon, 20 Apr 2020 07:56:05 +0200
Subject: Resolves SWAMID-2877

---
 swamid-2.0/moodle.media.nordu.net.xml | 19 +++++++++++++++++++
 swamid-edugain-sp-1.0.mxml            |  1 +
 swamid-sp-2.0.mxml                    |  1 -
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/swamid-2.0/moodle.media.nordu.net.xml b/swamid-2.0/moodle.media.nordu.net.xml
index 390c7705..d46afc3e 100644
--- a/swamid-2.0/moodle.media.nordu.net.xml
+++ b/swamid-2.0/moodle.media.nordu.net.xml
@@ -45,7 +45,26 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.media.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/moodle-sp" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodle.media.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/moodle-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodle.media.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/moodle-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">NORDUnet Media eLearning</md:ServiceName>
+      <md:ServiceName xml:lang="sv">NORDUnet Media eLearning</md:ServiceName>
+      <md:ServiceName xml:lang="no">NORDUnet Media eLearning</md:ServiceName>
+      <md:ServiceName xml:lang="nb">NORDUnet Media eLearning</md:ServiceName>
+      <md:ServiceName xml:lang="nn">NORDUnet Media eLearning</md:ServiceName>
+      <md:ServiceName xml:lang="fi">NORDUnet Media eLearning</md:ServiceName>
+      <md:ServiceName xml:lang="is">NORDUnet Media eLearning</md:ServiceName>
+      <md:ServiceName xml:lang="da">NORDUnet Media eLearning</md:ServiceName>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" FriendlyName="mail" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" FriendlyName="sn" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" FriendlyName="sivenName" isRequired="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">NORDUnet A/S</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">NORDUnet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://www.nordu.net/</md:OrganizationURL>
+  </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>NORDUnet</md:GivenName>
     <md:SurName>Media</md:SurName>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 75eaba55..f2100775 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -42,4 +42,5 @@
   <xi:include href="swamid-2.0/sp.sprakochfolkminnen.se.xml"/>
   <xi:include href="swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
   <xi:include href="swamid-2.0/indico.nordu.net-mellon.xml"/>
+  <xi:include href="swamid-2.0/moodle.media.nordu.net.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index a2954171..3ca154bf 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -626,5 +626,4 @@
   <xi:include href="swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/sig.idsec.se-sigservice-dev.xml"/>
   <xi:include href="swamid-2.0/play.gih.se.xml"/>
-  <xi:include href="swamid-2.0/moodle.media.nordu.net.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3