refectore AuthenticatedUser

1 files changed, 6 insertions, 38 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
index d24fd114f..e019b70bb 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/IndexAction.java
@@ -77,8 +77,6 @@ import org.opensaml.xml.security.x509.X509Credential;
 import org.opensaml.xml.signature.Signature;
 import org.opensaml.xml.signature.impl.ExplicitKeySignatureTrustEngine;
 
-import com.opensymphony.xwork2.ActionSupport;
-
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
@@ -215,14 +213,8 @@ public class IndexAction extends BasicAction {
 			if (dbuser.isIsMandateUser() != null)
 				ismandateuser = dbuser.isIsMandateUser();
 			
-			AuthenticatedUser authuser = new AuthenticatedUser(
-					dbuser.getHjid(), 
-					dbuser.getGivenname(), 
-					dbuser.getFamilyname(), 
-					dbuser.getInstitut(),
-					dbuser.getUsername(), 
+			AuthenticatedUser authuser = new AuthenticatedUser(dbuser, 
 					true, 
-					dbuser.isIsAdmin(),
 					ismandateuser,
 					false);
 			
@@ -424,16 +416,7 @@ public class IndexAction extends BasicAction {
 							user.setIsusernamepasswordallowed(false);
 							user.setIsmandateuser(false);
 							user.setPVPGenerated(true);
-							
-							authUser = new AuthenticatedUser();
-							authUser.setAdmin(false);
-							authUser.setAuthenticated(false);
-							authUser.setLastLogin(null);
-							authUser.setUserID(-1);
-							authUser.setUserName(null);
-							authUser.setPVP2Login(true);
-							authUser.setMandateUser(false);
-							
+														
 							//loop through the nodes to get what we want
 							List<AttributeStatement> attributeStatements = saml2assertion.getAttributeStatements();
 							for (int i = 0; i < attributeStatements.size(); i++)
@@ -445,26 +428,24 @@ public class IndexAction extends BasicAction {
 									
 									if (strAttributeName.equals(PVPConstants.PRINCIPAL_NAME_NAME)) {
 										user.setFamilyName(attributes.get(x).getAttributeValues().get(0).getDOM().getTextContent());
-										authUser.setFamilyName(user.getFamilyName());
 									}
 									
 									if (strAttributeName.equals(PVPConstants.GIVEN_NAME_NAME)) {
 										user.setGivenName(attributes.get(x).getAttributeValues().get(0).getDOM().getTextContent());
-										authUser.setGivenName(user.getGivenName());
 									}
 									
 									if (strAttributeName.equals(PVPConstants.MANDATE_TYPE_NAME)) {
-										authUser.setMandateUser(true);
 										user.setIsmandateuser(true);
 									}
 									
 									if (strAttributeName.equals(PVPConstants.MANDATE_LEG_PER_FULL_NAME_NAME)) {
 										user.setInstitut(attributes.get(x).getAttributeValues().get(0).getDOM().getTextContent());
-										authUser.setInstitute(user.getInstitut());
 									}		
 								}
 							}
 							
+							authUser = AuthenticatedUser.generateUserRequestUser(user);
+							
 							//set Random value
 							formID = Random.nextRandom();
 							session.setAttribute(Constants.SESSION_FORMID, formID);
@@ -484,14 +465,8 @@ public class IndexAction extends BasicAction {
 									session.setAttribute(Constants.SESSION_FORMID, formID);
 									
 									user = new UserDatabaseFrom(dbuser);
-									authUser = new AuthenticatedUser(
-											dbuser.getHjid(), 
-											dbuser.getGivenname(), 
-											dbuser.getFamilyname(), 
-											dbuser.getInstitut(),
-											dbuser.getUsername(), 
+									authUser = new AuthenticatedUser(dbuser, 
 											false, 
-											false,
 											dbuser.isIsMandateUser(),
 											true);
 									session.setAttribute(Constants.SESSION_FORM, user);
@@ -511,14 +486,7 @@ public class IndexAction extends BasicAction {
 							if (dbuser.isIsMandateUser() != null)
 								ismandateuser = dbuser.isIsMandateUser();
 							
-							authUser = new AuthenticatedUser(
-									dbuser.getHjid(), 
-									dbuser.getGivenname(), 
-									dbuser.getFamilyname(), 
-									dbuser.getInstitut(),
-									dbuser.getUsername(), 
-									true, 
-									dbuser.isIsAdmin(),
+							authUser = new AuthenticatedUser(dbuser, true,
 									ismandateuser,
 									true);