From 3f98eb36d56d09b773a85a211b10604879e88e9d Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 16 Feb 2018 10:39:19 +0100
Subject: [PATCH] new idpdisco properties file used by 1.0.10

---
 .../eidas-proxy/se/cfg/idpdisco.properties    | 41 +++++++++++++++++++
 .../se/cfg/natsp-idpdisco.properties          | 27 ------------
 2 files changed, 41 insertions(+), 27 deletions(-)
 create mode 100644 eidas-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
 delete mode 100644 eidas-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-idpdisco.properties

diff --git a/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties b/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
new file mode 100644
index 00000000..58eb0f7d
--- /dev/null
+++ b/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
@@ -0,0 +1,41 @@
+# Available policies are: natToEidasMapping, natToEidasNotifiedMapping, justEidasLoa
+# Defined meaning:
+# - justEidasLoa = IdP is only allowed if it supports the national eIDAS LoAs
+# - natToEidasMapping = National IdP:s are allowed to respond with national LoA. These counts as non notified eID
+# - natToEidasNotifiedMapping = National IdP:s are allowed to respond with national LoA. These counts as notified eID
+
+idp.testIdp.entityid=https://idp.svelegtest.se/idp
+idp.testIdp.name.sv=Test ID-tjänst
+idp.testIdp.name.en=Test IdP
+idp.testIdp.logo.uri=https://eid.svelegtest.se/logos/elegnamnden_notext_68x67.png
+idp.testIdp.logo.height=67
+idp.testIdp.logo.width=68
+idp.testIdp.loapolicy=natToEidasNotifiedMapping
+idp.testIdp.index=0
+
+idp.mobIdp.entityid=https://midp.svelegtest.se/idp
+idp.mobIdp.name.sv=Mobil Test ID Tjänst
+idp.mobIdp.name.en=Mobile Test IdP
+idp.mobIdp.logo.uri=https://eid.svelegtest.se/logos/elegnamnden_notext_68x67.png
+idp.mobIdp.logo.height=67
+idp.mobIdp.logo.width=68
+idp.mobIdp.loapolicy=natToEidasNotifiedMapping
+idp.mobIdp.index=1
+
+idp.ccBankid.entityid=https://eid.identityhub.se/demo/bankid/
+idp.ccBankid.name.sv=BankID
+idp.ccBankid.name.en=BankID
+idp.ccBankid.logo.uri=img/disco/bankid_logo.png
+idp.ccBankid.logo.height=94
+idp.ccBankid.logo.width=100
+idp.ccBankid.loapolicy=natToEidasNotifiedMapping
+idp.ccBankid.index=2
+
+idp.ccTelia.entityid=https://eid.identityhub.se/demo/teliabrowserplugin/
+idp.ccTelia.name.sv=Telia
+idp.ccTelia.name.en=Telia
+idp.ccTelia.logo.uri=img/disco/telia_min_logo.png
+idp.ccTelia.logo.height=89
+idp.ccTelia.logo.width=86
+idp.ccTelia.loapolicy=natToEidasNotifiedMapping
+idp.ccTelia.index=3
diff --git a/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-idpdisco.properties b/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-idpdisco.properties
deleted file mode 100644
index 24052db8..00000000
--- a/eidas-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-idpdisco.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-proxy-service.idpdisco.idplist=\
-  testIdp,\
-  mobIdp,\
-  ccBankid,\
-  ccTelia
-proxy-service.idpdisco.langs=\
-  se,\
-  en,\
-  fr
-proxy-service.idpdisco.entityid={\
-  testIdp :'https://idp.svelegtest.se/idp',\
-  mobIdp :'https://midp.svelegtest.se/idp',\
-  ccBankid : 'https://eid.identityhub.se/demo/bankid/',\
-  ccTelia : 'https://eid.identityhub.se/demo/teliabrowserplugin/'\
-  }
-proxy-service.idpdisco.name={\
-  testIdp :'Test ID-tjänst, Test IdP, Test IdP',\
-  mobIdp :'Mobil Test IdP, Mobile Test IdP, Mobile Test IdP',\
-  ccBankid : 'BankID, BankID, BankID',\
-  ccTelia : 'Telia,Telia,Telia'\
-  }
-proxy-service.idpdisco.logo={\
-  testIdp :'https://eid.svelegtest.se/logos/elegnamnden_notext_68x67.png, 67, 68',\
-  mobIdp :'https://eid.svelegtest.se/logos/elegnamnden_notext_68x67.png, 67, 68',\
-  ccBankid : 'img/disco/bankid_logo.png, 94, 100',\
-  ccTelia : 'img/disco/telia_min_logo.png,89,86'\
-  }