diff options
| -rw-r--r-- | eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java | 25 | 
1 files changed, 13 insertions, 12 deletions
| diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java index 63e84dcb..8300c31f 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java @@ -113,7 +113,8 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer    @Autowired(required = true)    protected ITransactionStorage transactionStorage; -  @Autowired IPendingRequestIdGenerationStrategy requestIdValidationStragegy; +  @Autowired +  IPendingRequestIdGenerationStrategy requestIdValidationStragegy;    private IGuiFormBuilder guiBuilder; @@ -241,8 +242,9 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer          // Put pending request          ExceptionContainer exceptionContainer = new ExceptionContainer(protocolRequest, throwable);          byte[] serialized = SerializationUtils.serialize(exceptionContainer); -//        transactionStorage.put(req.getParameter(EaafConstants.PARAM_HTTP_ERROR_CODE), serialized, -1); -        String errorId = requestIdValidationStragegy.validateAndGetPendingRequestId(req.getParameter(EaafConstants.PARAM_HTTP_ERROR_CODE)); +        //        transactionStorage.put(req.getParameter(EaafConstants.PARAM_HTTP_ERROR_CODE), serialized, -1); +        String errorId = requestIdValidationStragegy +            .validateAndGetPendingRequestId(req.getParameter(EaafConstants.PARAM_HTTP_ERROR_CODE));          transactionStorage.put(errorId, serialized, -1); @@ -432,11 +434,11 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer    } -//  private void writeHtmlErrorResponse(@NonNull final HttpServletRequest httpReq, -//      @NonNull final HttpServletResponse httpResp, @NonNull final String msg, @NonNull final String errorCode, -//      @Nullable final Object[] params, String externalErrorCode) throws EaafException { -//    this.writeHtmlErrorResponse(httpReq, httpResp, msg, errorCode, params, externalErrorCode, null, null); -//  } +  //  private void writeHtmlErrorResponse(@NonNull final HttpServletRequest httpReq, +  //      @NonNull final HttpServletResponse httpResp, @NonNull final String msg, @NonNull final String errorCode, +  //      @Nullable final Object[] params, String externalErrorCode) throws EaafException { +  //    this.writeHtmlErrorResponse(httpReq, httpResp, msg, errorCode, params, externalErrorCode, null, null); +  //  }    public void writeHtmlErrorResponse(@NonNull final HttpServletRequest httpReq,        @NonNull final HttpServletResponse httpResp, @NonNull final String msg, @NonNull final String errorCode, @@ -467,9 +469,9 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer          c.putCustomParameter(AbstractGuiFormBuilderConfiguration.PARAM_GROUP_MSG, PARAM_GUI_ERROMSG, msg);          c.putCustomParameter(AbstractGuiFormBuilderConfiguration.PARAM_GROUP_MSG, PARAM_GUI_ERRORCODE, errorCode);          c.putCustomParameter(AbstractGuiFormBuilderConfiguration.PARAM_GROUP_MSG, PARAM_GUI_EXTERNAL_ERRORCODE, -                externalErrorCode); +            externalErrorCode);          c.putCustomParameterWithOutEscaption(AbstractGuiFormBuilderConfiguration.PARAM_GROUP_MSG, -                PARAM_GUI_ERRORCODEPARAMS, ArrayUtils.toString(errorCodeParams)); +            PARAM_GUI_ERRORCODEPARAMS, ArrayUtils.toString(errorCodeParams));          c.putCustomParameter(AbstractGuiFormBuilderConfiguration.PARAM_GROUP_MSG, PARAM_GUI_TICKET, ticket);          c.putCustomParameter(AbstractGuiFormBuilderConfiguration.PARAM_GROUP_MSG, PARAM_GUI_REDIRECT, url); @@ -488,8 +490,7 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer    }    private void displayException(final HttpServletRequest req, final HttpServletResponse resp, -      final ErrorTicketService.HandleData errorData) -      throws IOException, EaafException { +      final ErrorTicketService.HandleData errorData) throws IOException, EaafException {      final Throwable e = errorData.getThrowable();      final String internalErrorCode = errorData.getErrorCode(); | 
