From d310dea1d8bba8b82a16aa631eb77f8c99212540 Mon Sep 17 00:00:00 2001
From: Paul Scott <paul.scott@kau.se>
Date: Sun, 28 Feb 2016 19:01:06 +0100
Subject: Add prisma to eduGAIN

---
 swamid-2.0/prisma.research.se-shibboleth.xml | 18 ++++++++++++++++--
 swamid-edugain-sp-1.0.mxml                   |  1 +
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/swamid-2.0/prisma.research.se-shibboleth.xml b/swamid-2.0/prisma.research.se-shibboleth.xml
index 95c7df0d..9f12b6ec 100644
--- a/swamid-2.0/prisma.research.se-shibboleth.xml
+++ b/swamid-2.0/prisma.research.se-shibboleth.xml
@@ -34,8 +34,8 @@ and do *NOT* provide it in real time to your partners.
       <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://prisma.research.se/Shibboleth.sso/Login"/>
       <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://prisma.research.se/Shibboleth.sso/Login" index="1"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="sv">Prisma - prisma.research.se </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Prisma - prisma.research.se </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Prisma - prisma.research.se</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Prisma - prisma.research.se</mdui:DisplayName>
         <mdui:Description xml:lang="sv">I Prisma kan du ansöka om forskningsmedel och hantera dina beviljade bidrag</mdui:Description>
         <mdui:Description xml:lang="en">Prisma is a joint portal used by several research funders</mdui:Description>
         <mdui:PrivacyStatementURL xml:lang="sv">https://prisma.research.se/Localization/SelectLanguage?languageName=SV&amp;returnUrl=%2FStart%23personaldetails</mdui:PrivacyStatementURL>
@@ -87,5 +87,19 @@ Yw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://prisma.research.se/Shibboleth.sso/SAML2/ECP" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://prisma.research.se/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://prisma.research.se/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">Prisma - prisma.research.se</md:ServiceName>
+      <md:RequestedAttribute FriendlyName="eppn" 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="true"/>
+    </md:AttributeConsumingService>
   </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Prisma - prisma.research.se</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Prisma - prisma.research.se</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://prisma.research.se</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Peter</md:GivenName>
+    <md:SurName>Borg</md:SurName>
+    <md:EmailAddress>mailto:peter.borg@vr.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-edugain-sp-1.0.mxml b/swamid-edugain-sp-1.0.mxml
index 77fff113..8f5c6bcf 100644
--- a/swamid-edugain-sp-1.0.mxml
+++ b/swamid-edugain-sp-1.0.mxml
@@ -18,4 +18,5 @@
   <xi:include href="swamid-2.0/urn-urkund-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/mp.uu.se-shibboleth.sso.xml"/>
   <xi:include href="swamid-2.0/play.smdb.kb.se.xml"/>
+  <xi:include href="swamid-2.0/prisma.research.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
-- 
cgit v1.2.3