Merge branch 'development_preview'

1 files changed, 9 insertions, 1 deletions

diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/eid4u/utils/AttributeScopeMapper.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/eid4u/utils/AttributeScopeMapper.java
index 69cc131ff..48e64da62 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/eid4u/utils/AttributeScopeMapper.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/auth/modules/eidas/eid4u/utils/AttributeScopeMapper.java
@@ -180,7 +180,12 @@ public class AttributeScopeMapper {
 			if (StringUtils.isNotEmpty(eIDASAttr)) {
 				if (!AttributeScopeMapper.getInstance().isComplexeScope(key)) {										
 					Logger.debug("Map simple TUG scope: " + key + " to eIDAS attribute: " + eIDASAttr);
-					result.put(eIDASAttr, el.getValue().getAsString());
+					if (StringUtils.isNotEmpty(el.getValue().getAsString())) {					
+						Logger.trace("eIDAS attribute: " + eIDASAttr + " has value: " + el.getValue().getAsString());
+						result.put(eIDASAttr, el.getValue().getAsString());
+						
+					} else
+						Logger.info("Ignore empty attr: "+ eIDASAttr);
 											
 				} else {		
 					Logger.trace("Find complex TUG scope: " + key);						
@@ -205,6 +210,7 @@ public class AttributeScopeMapper {
 				address.cvAddressArea(jsonObject.get(AttributeScopeMapper.HomeInstitutionAddressStreet).getAsString());
 				address.thoroughfare(jsonObject.get(AttributeScopeMapper.HomeInstitutionAddressStreet).getAsString());					
 				result.put(attr, address.build());
+				Logger.debug("Add eIDAS attr: " + Definitions.HOMEINSTITUTIONADDRESS_NAME);
 									
 			} else if (Definitions.TEMPORARYADDRESS_NAME.equals(attr)) {
 				address.postCode(jsonObject.get(AttributeScopeMapper.StudyAddressPostalCode).getAsString());
@@ -212,6 +218,7 @@ public class AttributeScopeMapper {
 				address.cvAddressArea(jsonObject.get(AttributeScopeMapper.StudyAddressStreet).getAsString());
 				address.thoroughfare(jsonObject.get(AttributeScopeMapper.StudyAddressStreet).getAsString());					
 				result.put(attr, address.build());
+				Logger.debug("Add eIDAS attr: " + Definitions.TEMPORARYADDRESS_NAME);
 									
 			} else if (eu.eidas.auth.engine.core.eidas.spec.NaturalPersonSpec.Definitions.CURRENT_ADDRESS.getNameUri().toString().equals(attr)) {
 				address.postCode(jsonObject.get(AttributeScopeMapper.PermanentAddressPostalCode).getAsString());
@@ -219,6 +226,7 @@ public class AttributeScopeMapper {
 				address.cvAddressArea(jsonObject.get(AttributeScopeMapper.PermanentAddressStreet).getAsString());
 				address.thoroughfare(jsonObject.get(AttributeScopeMapper.PermanentAddressStreet).getAsString());					
 				result.put(attr, address.build());
+				Logger.debug("Add eIDAS attr: " + eu.eidas.auth.engine.core.eidas.spec.NaturalPersonSpec.Definitions.CURRENT_ADDRESS);
 									
 			} else {
 				Logger.warn("Complexe eID4U attribute: " + attr + " is NOT SUPPORTED yet!");