1 files changed, 33 insertions, 5 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java
index df13fda9..eb32d03f 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java
@@ -33,12 +33,15 @@ import javax.annotation.Nonnull;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
@@ -49,12 +52,20 @@ import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.EaafStorageException;
 import at.gv.egiz.eaaf.core.impl.http.HttpUtils;
 import at.gv.egiz.eaaf.core.impl.idp.auth.data.AuthProcessDataWrapper;
+import at.gv.egiz.eaaf.core.impl.json.EscapedJsonDeserializer;
+import at.gv.egiz.eaaf.core.impl.json.EscapedJsonSerializer;
 import at.gv.egiz.eaaf.core.impl.utils.TransactionIdUtils;
-
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Getter
+@Setter
+@NoArgsConstructor
 public abstract class RequestImpl implements IRequest, Serializable {
 
-  private static final Logger log = LoggerFactory.getLogger(RequestImpl.class);
-
   public static final String DATAID_REQUESTER_IP_ADDRESS = "reqestImpl_requesterIPAddr";
 
   private static final String ERROR_CODE_INTERNAL_00 = "eaaf.core.00";
@@ -75,6 +86,9 @@ public abstract class RequestImpl implements IRequest, Serializable {
   private String requestedServiceProviderIdentifer;
   private String idpAuthUrl = null;
 
+  @JsonTypeInfo(include = JsonTypeInfo.As.PROPERTY, use = JsonTypeInfo.Id.CLASS, property = "@class")
+  @JsonSerialize(using = EscapedJsonSerializer.class)
+  @JsonDeserialize(using = EscapedJsonDeserializer.class)
   private ISpConfiguration spConfiguration = null;
 
   private boolean passiv = false;
@@ -227,6 +241,7 @@ public abstract class RequestImpl implements IRequest, Serializable {
     this.passiv = passiv;
   }
 
+
   public final void setForce(final boolean force) {
     this.force = force;
   }
@@ -298,12 +313,14 @@ public abstract class RequestImpl implements IRequest, Serializable {
 
   }
 
+  @JsonIgnore
   @Override
   public final ISpConfiguration getServiceProviderConfiguration() {
     return this.spConfiguration;
 
   }
 
+  @JsonIgnore
   @Override
   public <T> T getServiceProviderConfiguration(final Class<T> decorator) {
     if (this.spConfiguration != null) {
@@ -322,17 +339,25 @@ public abstract class RequestImpl implements IRequest, Serializable {
 
   }
 
+  /**
+   * Inject Service-Provider configuration into that authentication process.
+   * 
+   * @param spConfig SP configuration
+   */
+  @JsonIgnore
   public void setOnlineApplicationConfiguration(final ISpConfiguration spConfig) {
     this.spConfiguration = spConfig;
 
   }
 
+  @JsonIgnore
   @Override
   public final String getUniqueTransactionIdentifier() {
     return this.uniqueTransactionIdentifer;
 
   }
 
+  @JsonIgnore
   @Override
   public final String getUniqueSessionIdentifier() {
     return this.uniqueSessionIdentifer;
@@ -390,11 +415,13 @@ public abstract class RequestImpl implements IRequest, Serializable {
 
   }
 
+  @JsonIgnore
   @Override
   public final String getAuthUrl() {
     return this.idpAuthUrl;
   }
 
+  @JsonIgnore
   @Override
   public final String getAuthUrlWithOutSlash() {
     if (this.idpAuthUrl.endsWith("/")) {
@@ -458,6 +485,7 @@ public abstract class RequestImpl implements IRequest, Serializable {
 
   }
 
+  @JsonIgnore
   @Override
   public boolean isProcessInIframe() {
     return this.currentlyInIframe;