diff options
| author | lalber <lukas.alber@iaik.tugraz.at> | 2021-03-12 15:22:56 +0100 | 
|---|---|---|
| committer | Thomas <> | 2021-03-30 20:22:06 +0200 | 
| commit | c43d3f075ebf165a55935cd985fcfaf7426dc38d (patch) | |
| tree | d783df5a176b2e935713d5bd6d726d499bac7910 /eaaf_core/src/main/java | |
| parent | c8873b5d8fbd5dd2ae7b35e6426f36bc42e107a0 (diff) | |
| download | EAAF-Components-c43d3f075ebf165a55935cd985fcfaf7426dc38d.tar.gz EAAF-Components-c43d3f075ebf165a55935cd985fcfaf7426dc38d.tar.bz2 EAAF-Components-c43d3f075ebf165a55935cd985fcfaf7426dc38d.zip | |
no ticket or link fix
Diffstat (limited to 'eaaf_core/src/main/java')
| -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 ec2c8b04..d915910b 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 @@ -116,7 +116,8 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer    @Autowired(required = true)    protected ITransactionStorage transactionStorage; -  @Autowired IPendingRequestIdGenerationStrategy requestIdValidationStragegy; +  @Autowired +  IPendingRequestIdGenerationStrategy requestIdValidationStragegy;    private IGuiFormBuilder guiBuilder; @@ -244,8 +245,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); @@ -435,11 +437,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, @@ -470,9 +472,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); @@ -491,8 +493,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(); | 
