peps saml engine adjustment

3 files changed, 76 insertions, 2 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
index 49b6bba8a..d5430a358 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.util.HashMap;
+import eu.stork.peps.auth.engine.SAMLEngine;
 
 /**
  * @author bsuzic
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKAuthnReq.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKAuthnReq.java
new file mode 100644
index 000000000..c79423ffc
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKAuthnReq.java
@@ -0,0 +1,73 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import at.gv.egovernment.moa.id.moduls.IRequest;
+import eu.stork.peps.auth.commons.STORKAuthnRequest;
+
+
+
+/**
+ * @author bsuzic
+ *         Date: 1/22/14, Time: 5:30 PM
+ */
+public class STORKAuthnReq implements IRequest {
+    private String requestID;
+    private String target = null;
+    String module = null;
+    String action = null;
+    private STORKAuthnRequest storkAuthnRequest;
+
+    public void setSTORKAuthnRequest(STORKAuthnRequest request) {
+        this.storkAuthnRequest = request;
+    }
+
+    public STORKAuthnRequest getStorkAuthnRequest() {
+        return this.storkAuthnRequest;
+    }
+
+
+    public String getOAURL() {
+        return "https://sp:8889/SP";  //
+    }
+
+    public boolean isPassiv() {
+        return false;  //
+    }
+
+    public boolean forceAuth() {
+        return false;  //
+    }
+
+    public boolean isSSOSupported() {
+        return false;  //
+    }
+
+    public String requestedModule() {
+        return this.module;  //
+    }
+
+    public String requestedAction() {
+        return action;  //
+    }
+
+    public void setModule(String module) {
+        this.module = module;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    public String getTarget() {
+        return this.target;  //
+    }
+
+    public void setRequestID(String id) {
+        this.requestID = id;
+    }
+
+    public String getRequestID() {
+        return this.requestID;  //
+    }
+
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKAuthnRequestDEL.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKAuthnRequestDEL.java
index 9e3e7f53d..57dfad73f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKAuthnRequestDEL.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKAuthnRequestDEL.java
@@ -16,13 +16,13 @@ public class STORKAuthnRequestDEL implements IRequest {
     private String target = null;
     String module = null;
     String action = null;
-    private STORKAuthnRequest storkAuthnRequest;
+    private eu.stork.mw.messages.saml.STORKAuthnRequest storkAuthnRequest;
 
     public void setSTORKAuthnRequest(STORKAuthnRequestImpl request) {
         this.storkAuthnRequest = request;
     }
 
-    public STORKAuthnRequest getStorkAuthnRequest() {
+    public eu.stork.mw.messages.saml.STORKAuthnRequest getStorkAuthnRequest() {
         return this.storkAuthnRequest;
     }