1 files changed, 59 insertions, 19 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationData.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationData.java
index 79f3b4e30..4bbd221a5 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationData.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationData.java
@@ -24,8 +24,11 @@
 
 package at.gv.egovernment.moa.id.data;
 
+import java.io.Serializable;
 import java.util.Date;
 
+import at.gv.egovernment.moa.id.auth.data.IdentityLink;
+
 /**
  * Encapsulates authentication data contained in a <code>&lt;saml:Assertion&gt;</code>.
  *
@@ -33,8 +36,12 @@ import java.util.Date;
  * @version $Id$
  */
 
-public class AuthenticationData {
+public class AuthenticationData implements Serializable {
   /**
+	 * 
+	 */
+	private static final long serialVersionUID = -1042697056735596866L;
+/**
    * major version number of the SAML assertion
    */
   private int majorVersion;
@@ -62,15 +69,23 @@ public class AuthenticationData {
 	/**
 	 * user identification type
 	 */
-	private String identificationType;
+  private String identificationType;
+	
+	/**
+	 * user identityLink specialized to OAParamter
+	 */
+  private IdentityLink identityLink;
+	
   /**
-   * application specific user identifier (bPK)
+   * application specific user identifier (bPK/wbPK)
    */
   private String bPK;
+  
   /**
-   * private sector-specific personal identifier (wbPK)
+   * application specific user identifier type
    */
-  private String wbPK;
+  private String bPKType;
+  
   /**
    * given name of the user
    */
@@ -162,13 +177,13 @@ public class AuthenticationData {
     return bPK;
   }
   
-  /**
-   * Returns the wbPK.
-   * @return String the wbPK.
-   */
-  public String getWBPK() {
-    return wbPK;
-  }
+//  /**
+//   * Returns the wbPK.
+//   * @return String the wbPK.
+//   */
+//  public String getWBPK() {
+//    return wbPK;
+//  }
   
   /**
    * Returns useUTC
@@ -218,13 +233,13 @@ public class AuthenticationData {
     this.bPK = bPK;
   }
   
-  /**
-   * Sets the wbPK.
-   * @param wbPK The wbPK to set
-   */
-  public void setWBPK(String wbPK) {
-    this.wbPK = wbPK;
-  }
+//  /**
+//   * Sets the wbPK.
+//   * @param wbPK The wbPK to set
+//   */
+//  public void setWBPK(String wbPK) {
+//    this.wbPK = wbPK;
+//  }
 
   public void setUseUTC(boolean useUTC) {
 	  this.useUTC = useUTC;
@@ -430,4 +445,29 @@ public class AuthenticationData {
     return timestamp;
   }
 
+public String getBPKType() {
+	return bPKType;
+}
+
+public void setBPKType(String bPKType) {
+	this.bPKType = bPKType;
+}
+
+/**
+ * @return the identityLink
+ */
+public IdentityLink getIdentityLink() {
+	return identityLink;
+}
+
+/**
+ * @param identityLink the identityLink to set
+ */
+public void setIdentityLink(IdentityLink identityLink) {
+	this.identityLink = identityLink;
+}
+
+
+
+  
 }