1 files changed, 26 insertions, 5 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20Protocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20Protocol.java
index 00b7a83f0..9dac8d5a0 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20Protocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20Protocol.java
@@ -2,6 +2,7 @@ package at.gv.egovernment.moa.id.protocols.oauth20.protocol;
 
 import java.net.URLEncoder;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -10,17 +11,22 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang.StringUtils;
 
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.moduls.IAction;
 import at.gv.egovernment.moa.id.moduls.IModulInfo;
 import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.id.protocols.oauth20.OAuth20Constants;
 import at.gv.egovernment.moa.id.protocols.oauth20.OAuth20Util;
 import at.gv.egovernment.moa.id.protocols.oauth20.exceptions.OAuth20Exception;
+import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants;
+import at.gv.egovernment.moa.id.util.ErrorResponseUtils;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
 
 import com.google.gson.JsonObject;
 
+import edu.emory.mathcs.backport.java.util.Arrays;
+
 public class OAuth20Protocol implements IModulInfo {
 	
 	public static final String NAME = OAuth20Protocol.class.getName();
@@ -29,6 +35,13 @@ public class OAuth20Protocol implements IModulInfo {
 	public static final String AUTH_ACTION = "AUTH";
 	public static final String TOKEN_ACTION = "TOKEN";
 	
+	@SuppressWarnings("unchecked")
+	public static final List<String> DEFAULTREQUESTEDATTRFORINTERFEDERATION = Arrays.asList(
+			new String[] {
+					PVPConstants.EID_SECTOR_FOR_IDENTIFIER_NAME,
+					PVPConstants.BPK_NAME
+			});
+	
 	private static HashMap<String, IAction> actions = new HashMap<String, IAction>();
 	
 	static {
@@ -87,20 +100,27 @@ public class OAuth20Protocol implements IModulInfo {
 	 */
 	public boolean generateErrorMessage(Throwable e, HttpServletRequest request, HttpServletResponse response, IRequest protocolRequest)
 			throws Throwable {
-		
+				
 		// get error code and description
 		String errorCode;
 		String errorDescription;
-		// String errorUri = "http://tools.ietf.org/html/draft-ietf-oauth-v2-11";
+		String errorUri = AuthConfigurationProvider.getInstance().getPublicURLPrefix() 
+				+"/" + OAuth20Constants.ERRORPAGE;
+		String moaError = null;
+		
+		ErrorResponseUtils errorUtils = ErrorResponseUtils.getInstance();
 		
 		if (e instanceof OAuth20Exception) {
 			errorCode = ((OAuth20Exception) e).getErrorCode();
 			errorDescription = URLEncoder.encode(((OAuth20Exception) e).getMessageId() + ": " + e.getMessage(), "UTF-8");
+			moaError = errorUtils.mapInternalErrorToExternalError(((OAuth20Exception) e).getMessageId());
+			
 		} else {
 			errorCode = OAuth20Constants.ERROR_SERVER_ERROR;
 			errorDescription = URLEncoder.encode(e.getMessage(), "UTF-8");
+			moaError = errorUtils.getResponseErrorCode(e);
 		}
-		
+				
 		String paramRedirect = null;
 		String state = null;
 		boolean isAuthRequest = false;
@@ -144,7 +164,8 @@ public class OAuth20Protocol implements IModulInfo {
 			
 			OAuth20Util.addParameterToURL(url, OAuth20Constants.PARAM_ERROR, errorCode);
 			OAuth20Util.addParameterToURL(url, OAuth20Constants.PARAM_ERROR_DESCRIPTION, errorDescription);
-			// OAuth20Util.addParameterToURL(url, OAuth20Constants.PARAM_ERROR_URI, errorUri);
+			if (MiscUtil.isNotEmpty(moaError))
+				OAuth20Util.addParameterToURL(url, OAuth20Constants.PARAM_ERROR_URI, errorUri + "#" + moaError);
 			OAuth20Util.addParameterToURL(url, OAuth20Constants.PARAM_STATE, state);
 			
 			response.setContentType("text/html");
@@ -159,7 +180,7 @@ public class OAuth20Protocol implements IModulInfo {
 			Map<String, Object> params = new HashMap<String, Object>();
 			params.put(OAuth20Constants.PARAM_ERROR, errorCode);
 			params.put(OAuth20Constants.PARAM_ERROR_DESCRIPTION, errorDescription);
-			// params.put(OAuth20Constants.PARAM_ERROR_URI, errorUri);
+			params.put(OAuth20Constants.PARAM_ERROR_URI, errorUri + "#" + moaError);
 			
 			// create response
 			JsonObject jsonObject = new JsonObject();