diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-06-21 15:34:36 +0200 | 
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-06-21 15:34:36 +0200 | 
| commit | e96e4e6cc59ce5ae538b44c45ca9a6a83419a911 (patch) | |
| tree | 86939a0e98cf5f83ef73a9d31176ed3b03331bae /id/ConfigWebTool | |
| parent | 811ba264eccb93c901db971423022d8e12ca7c69 (diff) | |
| download | moa-id-spss-e96e4e6cc59ce5ae538b44c45ca9a6a83419a911.tar.gz moa-id-spss-e96e4e6cc59ce5ae538b44c45ca9a6a83419a911.tar.bz2 moa-id-spss-e96e4e6cc59ce5ae538b44c45ca9a6a83419a911.zip | |
add eIDAS bPK prefix: urn:publicid:gv.at:eidasid+
Diffstat (limited to 'id/ConfigWebTool')
2 files changed, 17 insertions, 4 deletions
| diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java index f549db9f3..3062a61e3 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java @@ -22,11 +22,10 @@   *******************************************************************************/  package at.gv.egovernment.moa.id.configuration; +import java.util.Collections;  import java.util.Hashtable;  import java.util.Map; -import java.util.Collections; -  public class Constants {  	public static final String DEFAULT_VERSION = "1.x"; @@ -96,6 +95,7 @@ public class Constants {  	public static final String IDENIFICATIONTYPE_ERSB = "ERSB";  	public static final String IDENIFICATIONTYPE_ZVR = "ZVR";      public static final String IDENIFICATIONTYPE_STORK = "STORK"; +    public static final String IDENIFICATIONTYPE_EIDAS = "eIDAS";      public static final String IDENIFICATIONTYPE_BASEID = "urn:publicid:gv.at:baseid+";  	public static final String IDENIFICATIONTYPE_BASEID_FN = IDENIFICATIONTYPE_BASEID + "X" + IDENIFICATIONTYPE_FN; @@ -103,6 +103,7 @@ public class Constants {  	public static final String PREFIX_WPBK = "urn:publicid:gv.at:wbpk+";      public static final String PREFIX_STORK = "urn:publicid:gv.at:storkid+"; +    public static final String PREFIX_EIDAS = "urn:publicid:gv.at:eidasid+";      public static final Map<String, String> BUSINESSSERVICENAMES; @@ -113,6 +114,7 @@ public class Constants {  		tmp.put(IDENIFICATIONTYPE_ZVR, "Vereinsnummer");  		tmp.put(IDENIFICATIONTYPE_ERSB, "ERsB Kennzahl");          tmp.put(IDENIFICATIONTYPE_STORK, "STORK"); +        tmp.put(IDENIFICATIONTYPE_EIDAS, "eIDAS");          BUSINESSSERVICENAMES = Collections.unmodifiableMap(tmp);  	} diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java index 19671e502..f660b5feb 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java @@ -65,7 +65,8 @@ public class OATargetConfiguration implements IOnlineApplicationData {  				 Constants.IDENIFICATIONTYPE_FN,  				 Constants.IDENIFICATIONTYPE_ZVR,  				 Constants.IDENIFICATIONTYPE_ERSB, -                Constants.IDENIFICATIONTYPE_STORK); +                Constants.IDENIFICATIONTYPE_STORK, +                Constants.IDENIFICATIONTYPE_EIDAS);  	} @@ -120,6 +121,12 @@ public class OATargetConfiguration implements IOnlineApplicationData {  					if (Constants.PREFIX_WPBK.startsWith(split[0]) && split.length >= 2) {  						identificationType = split[1];  						identificationNumber = split[2]; +					 +					} else if (Constants.PREFIX_EIDAS.startsWith(split[0]) && split.length >= 2) { +                        //identificationType = split[1]; // setting at as iden category ? +                        identificationType = Constants.IDENIFICATIONTYPE_EIDAS; +                        identificationNumber = split[1] + "+" + split[2]; // setting sp country as ident type -> sp ident						 +						  					} else if (Constants.PREFIX_STORK.startsWith(split[0]) && split.length >= 2) {                          //identificationType = split[1]; // setting at as iden category ?                          identificationType = Constants.IDENIFICATIONTYPE_STORK; @@ -185,7 +192,11 @@ public class OATargetConfiguration implements IOnlineApplicationData {  			if (idnumber == null)  				idnumber = new IdentificationNumber(); -            if (getIdentificationType().equals(Constants.IDENIFICATIONTYPE_STORK)) { +            if (getIdentificationType().equals(Constants.IDENIFICATIONTYPE_EIDAS)) { +                idnumber.setValue(Constants.PREFIX_EIDAS + num); +                idnumber.setType(Constants.BUSINESSSERVICENAMES.get(getIdentificationType())); +			 +            } else if (getIdentificationType().equals(Constants.IDENIFICATIONTYPE_STORK)) {                  idnumber.setValue(Constants.PREFIX_STORK + "AT" + "+" + num);                  idnumber.setType(Constants.BUSINESSSERVICENAMES.get(getIdentificationType()));              } else { | 
