From fe02922969f49700ff82d5001ffa51cff495c6a2 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Wed, 7 Dec 2022 09:26:36 -0700
Subject: SWAMID-2210: Updated portalfhs.onricoh.se

---
 swamid-2.0/portalfhs.onricoh.se-shibboleth.xml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml b/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml
index 56945373..04fe4020 100644
--- a/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml
+++ b/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml
@@ -20,12 +20,6 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
@@ -34,10 +28,12 @@
         <mdui:DisplayName xml:lang="sv">eduPrint</mdui:DisplayName>
         <mdui:Description xml:lang="en">eduPrint is a print and photocopying system for students and employees at the Swedish Defence University. Use eduPrint to print, make photocopies and scan documents and images.</mdui:Description>
         <mdui:Description xml:lang="sv">eduPrint är ett utskrifts- och kopieringssystem för studenter och anställda vid Försvarshögskolan. Med eduPrint kan du skriva ut, kopiera och skanna dokument och bilder.</mdui:Description>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://portalfhs.onricoh.se/resources/img/eduPrint.jpg</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://portalfhs.onricoh.se/resources/img/eduPrint.jpg</mdui:Logo>
+        <mdui:Logo xml:lang="en" height="50" width="50">https://login2.fhs.se/adfs/portal/logo/logo.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">https://zero.comaround.com/link/d2e636d519154413bf3af8713aac07bf/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="sv">https://zero.comaround.com/link/d2e636d519154413bf3af8713aac07bf/</mdui:InformationURL>
+        <mdui:Logo xml:lang="sv" height="50" width="50">https://login2.fhs.se/adfs/portal/logo/logo.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://www.fhs.se/om-forsvarshogskolan/kontakta-oss/om-webbplatsen/personuppgifter-pa-forsvarshogskolan.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.fhs.se/en/swedish-defence-university/about-sedu/contact-us/your-personal-data.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
       <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://portalfhs.onricoh.se/Shibboleth.sso/Login"/>
     </md:Extensions>
@@ -67,8 +63,7 @@ khpNuwVbnY3EAM3I1UpPPUWYZbCjUR4O0sioKLM0HjPtJdKXdLPqdWk7O62Wbvpw
 fxCRxAYWaStMLUeM1Mg7OlqJdMiU21hx7GNxK6smi9/ScWlvoPZLR8TvDfpjzkod
 n6uUaExnxQbwTbNQ5w71X6mzxR++IsV8C1Vwv5tcZqdy+kCZY4Ocwhfr/6GI8+42
 KH46fYXyT9sVFAcBZD8IexNaVETOv9gQNy3db3fBFRN3yafcL5S5jeffFLKTsj38
-CD7PLZk/IkwF0hNDcLbY51g4UEz40tQ=
-</ds:X509Certificate>
+CD7PLZk/IkwF0hNDcLbY51g4UEz40tQ=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
       <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
@@ -92,8 +87,11 @@ CD7PLZk/IkwF0hNDcLbY51g4UEz40tQ=
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Ricoh Sweden AB</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Ricoh Sweden AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ricoh Sweden AB</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Ricoh Sweden AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.ricoh.se/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.ricoh.se/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="support">
     <md:GivenName>Ricoh</md:GivenName>
@@ -105,4 +103,12 @@ CD7PLZk/IkwF0hNDcLbY51g4UEz40tQ=
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:kundservice@ricoh.se</md:EmailAddress>
   </md:ContactPerson>
+  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+    <md:GivenName>Christian</md:GivenName>
+    <md:SurName>Johansson</md:SurName>
+    <md:EmailAddress>mailto:christian.johansson@fhs.se</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:EmailAddress>mailto:helpdesk@fhs.se</md:EmailAddress>
+  </md:ContactPerson>
 </md:EntityDescriptor>
-- 
cgit v1.2.3