diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2021-03-01 19:56:20 +0100 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2021-03-01 19:56:20 +0100 |
| commit | fa4c8c787d5efb494e7d6c0ad80713e82095820e (patch) | |
| tree | 730bf7ff459854137a971ab8be71a73a4316f6db /eaaf_core | |
| parent | 54736c76e0ce7187915ccf9dec7573c0ab12d0a8 (diff) | |
| parent | 4bb06aa415b2c46bcf46c0b8d951145f208a9cb0 (diff) | |
| download | EAAF-Components-fa4c8c787d5efb494e7d6c0ad80713e82095820e.tar.gz EAAF-Components-fa4c8c787d5efb494e7d6c0ad80713e82095820e.tar.bz2 EAAF-Components-fa4c8c787d5efb494e7d6c0ad80713e82095820e.zip | |
Merge branch 'feature/small_changes' into 'nightlyBuild'
Feature/small changes
See merge request egiz/eaaf_components!20
Diffstat (limited to 'eaaf_core')
3 files changed, 7 insertions, 5 deletions
diff --git a/eaaf_core/pom.xml b/eaaf_core/pom.xml index 81c98398..2e9023a6 100644 --- a/eaaf_core/pom.xml +++ b/eaaf_core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>at.gv.egiz</groupId> <artifactId>eaaf</artifactId> - <version>1.1.12-SNAPSHOT</version> + <version>1.1.13-SNAPSHOT</version> </parent> <groupId>at.gv.egiz.eaaf</groupId> 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 925d6fe2..abb3d685 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 @@ -560,7 +560,7 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer private IGuiBuilderConfiguration evaluateRequiredErrorHandlingMethod(IRequest first, String errorId) { if (first != null && first.isProcessInIframe()) { return guiConfigFactory.getDefaultIFrameParentHopGui(first, - "/" + ProtocolFinalizationController.ENDPOINT_ERRORHANDLING, + ProtocolFinalizationController.ENDPOINT_ERRORHANDLING, errorId); } @@ -571,7 +571,7 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer private String generateErrorRedirectUrl(final HttpServletRequest req, String errorKey) { String redirectUrl = null; redirectUrl = ServletUtils.getBaseUrl(req); - redirectUrl += "/" + ProtocolFinalizationController.ENDPOINT_ERRORHANDLING + "?" + redirectUrl += ProtocolFinalizationController.ENDPOINT_ERRORHANDLING + "?" + EaafConstants.PARAM_HTTP_ERROR_CODE + "=" + errorKey; return redirectUrl; 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 4ff41836..6a566f00 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 @@ -52,8 +52,10 @@ import at.gv.egiz.eaaf.core.impl.utils.TransactionIdUtils; @Controller public class ProtocolFinalizationController extends AbstractController { private static final Logger log = LoggerFactory.getLogger(ProtocolFinalizationController.class); - public static final String ENDPOINT_FINALIZEPROTOCOL = "finalizeAuthProtocol"; - public static final String ENDPOINT_ERRORHANDLING = "errorHandling"; + public static final String ENDPOINT_FINALIZEPROTOCOL = + EaafConstants.ENDPOINT_PREFIX_SECURED + "/finalizeAuthProtocol"; + public static final String ENDPOINT_ERRORHANDLING = + EaafConstants.ENDPOINT_PREFIX_SECURED + "/errorHandling"; @Autowired(required = true) IRequestStorage requestStorage; |