summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas <>2025-01-27 16:29:43 +0100
committerThomas <>2025-01-27 16:29:43 +0100
commit47685f893454bf707cf668cffaa709897ee76172 (patch)
tree42f531a84b04e77e7418c9632e52579a9cee0eb2
parent0bead0663c9f97adf37515a87a57f1f715603487 (diff)
downloadEAAF-Components-47685f893454bf707cf668cffaa709897ee76172.tar.gz
EAAF-Components-47685f893454bf707cf668cffaa709897ee76172.tar.bz2
EAAF-Components-47685f893454bf707cf668cffaa709897ee76172.zip
chore(core): forward HTTP status-code from configuration into default GUI model
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java4
-rw-r--r--eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/gui/DummyGuiBuilderConfigurationFactory.java5
-rw-r--r--eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/gui/IGuiBuilderConfigurationFactory.java20
3 files changed, 24 insertions, 5 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 0ab1f5ff..8ca3f25c 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
@@ -539,8 +539,8 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer
throws EaafException {
try {
final IGuiBuilderConfiguration config = guiConfigFactory.getDefaultErrorGui(
- getValidatedAuthUrl(httpReq));
-
+ getValidatedAuthUrl(httpReq), errorData.getHttpStatusCode());
+
String[] errorCodeParams = null;
if (params == null) {
errorCodeParams = new String[] {};
diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/gui/DummyGuiBuilderConfigurationFactory.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/gui/DummyGuiBuilderConfigurationFactory.java
index 570c3dd2..b33dbde1 100644
--- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/gui/DummyGuiBuilderConfigurationFactory.java
+++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/module/gui/DummyGuiBuilderConfigurationFactory.java
@@ -18,6 +18,11 @@ public class DummyGuiBuilderConfigurationFactory implements IGuiBuilderConfigura
public IGuiBuilderConfiguration getDefaultErrorGui(String authUrl) {
return errorGuiConfig;
}
+
+ @Override
+ public IGuiBuilderConfiguration getDefaultErrorGui(String authUrl, int httpStatusCode) {
+ return errorGuiConfig;
+ }
@Override
public IGuiBuilderConfiguration getDefaultIFrameParentHopGui(IRequest pendingReq, String endpoint,
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/gui/IGuiBuilderConfigurationFactory.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/gui/IGuiBuilderConfigurationFactory.java
index 618b5987..fd4fbe0d 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/gui/IGuiBuilderConfigurationFactory.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/gui/IGuiBuilderConfigurationFactory.java
@@ -31,17 +31,31 @@ public interface IGuiBuilderConfigurationFactory {
/**
* Get a DefaultGuiBuilderConfiguration to render an error message.
*
+ * <p>
+ * Uses HTTP status-code 200 as default.
+ * </p>
+ *
* @param authUrl PublicURLPrefix of the IDP but never null
* @return
*/
IGuiBuilderConfiguration getDefaultErrorGui(String authUrl);
/**
- * Get a default {@link IGuiBuilderConfiguration} that implements an iFrame to parent hop.
+ * Get a DefaultGuiBuilderConfiguration to render an error message.
+ *
+ * @param authUrl PublicURLPrefix of the IDP but never null
+ * @param httpStatusCode HTTP status-code for response
+ * @return
+ */
+ IGuiBuilderConfiguration getDefaultErrorGui(String authUrl, int httpStatusCode);
+
+ /**
+ * Get a default {@link IGuiBuilderConfiguration} that implements an iFrame to
+ * parent hop.
*
* @param pendingReq Current pending-request object
- * @param endpoint Request end-point
- * @param errorKey Error identifier
+ * @param endpoint Request end-point
+ * @param errorKey Error identifier
* @return GUIBuilder configuration with parent hop.
*/
IGuiBuilderConfiguration getDefaultIFrameParentHopGui(@Nonnull IRequest pendingReq,