update AuthenticationDataBuilder to support Prof.Rep bPKs in E-ID Proxy mode

1 files changed, 36 insertions, 18 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
index 09d517f5a..d26f7b396 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
@@ -428,6 +428,24 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 							authData.setMISMandate(misMandate);
 							authData.setUseMandate(true);
 							
+							//####################################################
+							// set bPK and IdentityLink for Organwalter --> 
+							//        Organwalter has a special bPK is received from MIS 
+							if (authData.isUseMandate() && session.isOW() && misMandate != null 
+									&& MiscUtil.isNotEmpty(misMandate.getOWbPK())) {			
+								//TODO: if full-mandate is removed in OPB --> OWbPK functionality needs an update!!! 			
+								authData.setBPK(misMandate.getOWbPK());
+								authData.setBPKType(Constants.URN_PREFIX_CDID + "+" + "OW");
+								Logger.trace("Authenticated User is OW: " + misMandate.getOWbPK());
+															
+								//set bPK and IdenityLink for all other
+								Logger.debug("User is an OW. Set original IDL into authdata ... ");
+								authData.setIdentityLink(session.getIdentityLink());
+								
+								
+								
+							}	
+							
 						} catch (IOException e) {
 							Logger.error("Base64 decoding of PVP-Attr:"+ PVPConstants.MANDATE_FULL_MANDATE_FRIENDLY_NAME
 									+ " FAILED.", e);
@@ -471,24 +489,7 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 				}
 			}
 					
-			//####################################################
-			// set bPK and IdentityLink for Organwalter --> 
-			//        Organwalter has a special bPK is received from MIS 
-			if (authData.isUseMandate() && session.isOW() && misMandate != null 
-					&& MiscUtil.isNotEmpty(misMandate.getOWbPK())) {			
-				//TODO: if full-mandate is removed in OPB --> OWbPK functionality needs an update!!! 			
-				authData.setBPK(misMandate.getOWbPK());
-				authData.setBPKType(Constants.URN_PREFIX_CDID + "+" + "OW");
-				Logger.trace("Authenticated User is OW: " + misMandate.getOWbPK());
-											
-				//set bPK and IdenityLink for all other
-				Logger.debug("User is an OW. Set original IDL into authdata ... ");
-				authData.setIdentityLink(session.getIdentityLink());
-				
-				
-				
-			}			
-			
+					
 			//###################################################################
 			//set PVP role attribute (implemented for ISA 1.18 action)
 			includedToGenericAuthData.remove(PVPConstants.ROLES_NAME);
@@ -926,7 +927,24 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 			}
 		}		
 	}
+	@Override
+	protected boolean matchsReceivedbPKToOnlineApplication(ISPConfiguration oaParam, String bPKType) {
+		boolean bPKTypeMatch = oaParam.getAreaSpecificTargetIdentifier().equals(bPKType);
+		if (!bPKTypeMatch) {
+			Logger.trace("bPKType does not match to Online-Application. Checking if it is Prof.Rep. bPK ... ");
+			if (EAAFConstants.URN_PREFIX_OW_BPK.equals(bPKType)) {
+				Logger.debug("Find Prof.Rep. bPKType. This matchs on every SP-Target");
+				bPKTypeMatch = true;
+				
+			} else
+				Logger.trace("bPKType is not of type: " + EAAFConstants.URN_PREFIX_OW_BPK + " Matching failed.");
+						
+		}
+		
+		return bPKTypeMatch;
 
+	}
+	
 	@Override
 	protected IAuthData getAuthDataInstance(IRequest pendingReq) throws EAAFException {
 		throw new RuntimeException("This method is NOT supported by MOA-ID");