Features:

-- Add additional parameters to customize BKUSelectionForm and SendAssertionForm
-- change Target configuration
-- insert some logging

Bugfixes:
-- Nullpointerexceptions in combination of an old userdatabase entry and a actual configuration tool version

1 files changed, 11 insertions, 5 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 5a88b1324..f07022394 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
@@ -379,6 +379,11 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 								return Constants.STRUTS_ERROR;
 							}
 							
+							//TODO: maybe remove this default value in a later version 
+							boolean ismandateuser = false;
+							if (dbuser.isIsMandateUser() != null)
+								ismandateuser = dbuser.isIsMandateUser();
+							
 							authUser = new AuthenticatedUser(
 									dbuser.getHjid(), 
 									dbuser.getGivenname(), 
@@ -387,7 +392,7 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 									dbuser.getUsername(), 
 									true, 
 									dbuser.isIsAdmin(),
-									dbuser.isIsMandateUser(),
+									ismandateuser,
 									true);
 							
 							Date date = DateTimeHelper.parseDateTime(dbuser.getLastLogin());
@@ -414,23 +419,24 @@ public class IndexAction extends ActionSupport implements ServletRequestAware,
 					}
 					
 					log.info("PVP2 Assertion was maybe not well formed, because no Assertion element could be found.");
-					addActionError(LanguageHelper.getErrorString("error.login"));
+					addActionError(LanguageHelper.getErrorString("error.login.internal"));
 					return Constants.STRUTS_ERROR;
 					
 				} else {
 					log.info("Receive Error Assertion.");
+					addActionError(LanguageHelper.getErrorString("error.login"));
 					return Constants.STRUTS_ERROR;
 				}
 				
 			} catch (Exception e) {
-				log.warn("Only http POST Requests can be used", e);
-				addActionError(LanguageHelper.getErrorString("error.login"));
+				log.warn("An internal error occurs.", e);
+				addActionError(LanguageHelper.getErrorString("error.login.internal"));
 				return Constants.STRUTS_ERROR;
 			}
 			
 		} else {
 			log.info("Only http POST Requests can be used");
-			addActionError(LanguageHelper.getErrorString("error.login"));
+			addActionError(LanguageHelper.getErrorString("error.login.internal"));
 			return Constants.STRUTS_ERROR;
 		}
 	}