From 729500a159c61a697c528e0c86abd132f4380b0d Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Thu, 12 Jul 2018 16:10:53 +0200
Subject: some more updates

---
 .../controller/ProtocolFinalizationController.java | 52 ++++++++++++++--------
 1 file changed, 34 insertions(+), 18 deletions(-)

(limited to 'eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java')

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
index 3659ff4f..2dc97486 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java
@@ -1,3 +1,27 @@
+/*******************************************************************************
+ * Copyright 2017 Graz University of Technology
+ * EAAF-Core Components has been developed in a cooperation between EGIZ,  
+ * A-SIT+, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
+/*******************************************************************************
+ *******************************************************************************/
 /*******************************************************************************
  *******************************************************************************/
 package at.gv.egiz.eaaf.core.impl.idp.controller;
@@ -16,7 +40,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 
 import at.gv.egiz.components.eventlog.api.EventConstants;
 import at.gv.egiz.eaaf.core.api.IRequest;
-import at.gv.egiz.eaaf.core.api.IStatusMessager;
+import at.gv.egiz.eaaf.core.api.IStatusMessenger;
 import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
 import at.gv.egiz.eaaf.core.api.data.ExceptionContainer;
 import at.gv.egiz.eaaf.core.exceptions.EAAFAuthenticationException;
@@ -62,10 +86,8 @@ public class ProtocolFinalizationController extends AbstractAuthProtocolModulCon
 				} else {
 					handleErrorNoRedirect(
 							new EAAFException(
-									IStatusMessager.CODES_INTERNAL_ERROR_AUTH_NOPENDIGREQID, 
-									null, 
-									"NO Error with this Id found" 
-								), req, resp, false);
+									IStatusMessenger.CODES_INTERNAL_ERROR_AUTH_NOPENDIGREQID, 
+									null), req, resp, false);
 					
 				}
 				
@@ -87,10 +109,8 @@ public class ProtocolFinalizationController extends AbstractAuthProtocolModulCon
 			log.debug("Request contains NO ErrorId");
 			handleErrorNoRedirect(
 					new EAAFException(
-							IStatusMessager.CODES_INTERNAL_ERROR_AUTH_NOPENDIGREQID, 
-							null, 
-							"Request containts NO error id." 
-						), req, resp, false);
+							IStatusMessenger.CODES_INTERNAL_ERROR_AUTH_NOPENDIGREQID, 
+							null), req, resp, false);
 			
 		}
 		
@@ -114,10 +134,9 @@ public class ProtocolFinalizationController extends AbstractAuthProtocolModulCon
 			log.error("No PendingRequest with ID " + pendingRequestID + " found.!");		
 			handleErrorNoRedirect(
 					new EAAFException(
-							IStatusMessager.CODES_INTERNAL_ERROR_AUTH_TIMEOUT, 
+							IStatusMessenger.CODES_INTERNAL_ERROR_AUTH_TIMEOUT, 
 							new Object[]{pendingRequestID,
-							},
-								"No pendigReq with Id: " + pendingRequestID), req, resp, false);							
+							}), req, resp, false);							
 			
 		} else {
 			try {
@@ -128,9 +147,8 @@ public class ProtocolFinalizationController extends AbstractAuthProtocolModulCon
 					//send authentication aborted error to Service Provider
 					buildProtocolSpecificErrorResponse(
 							new EAAFAuthenticationException(
-									IStatusMessager.CODES_INTERNAL_ERROR_AUTH_USERSTOP, 
-									new Object[] {},
-									"User stops authentication process"), 
+									IStatusMessenger.CODES_INTERNAL_ERROR_AUTH_USERSTOP, 
+									new Object[] {}), 
 							req, resp, pendingReq);
 					
 					//do not remove the full active SSO-Session 
@@ -150,9 +168,7 @@ public class ProtocolFinalizationController extends AbstractAuthProtocolModulCon
 					handleErrorNoRedirect(
 							new EAAFException(
 									"auth.20",
-									null,
-									"PendingRequest is NOT authenticated --> Abort authentication process!"
-								), req, resp, true);							
+									null), req, resp, true);							
 									
 				}
 							
-- 
cgit v1.2.3