refactoring of AuthData builder

1 files changed, 56 insertions, 42 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java
index 7dcd643d..e9d86efa 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java
@@ -115,56 +115,19 @@ public interface IAuthData {
 	String getFormatedDateOfBirth();
 
 	/**
-	 * Get bPK of the user
-	 * 
-	 * @return
-	 */
-	@Deprecated
-	String getBPK();
-	
-	/**
-	 * Get sector for user's bPK
-	 * 
-	 * 
-	 * @return Sector identifier with prefix
-	 */
-	@Deprecated
-	String getBPKType();
-
-	
-	/**
-	 * Get List of bPK/bPKType tuples for this service provider  
-	 * @return List of Pairs<bPK, bPKType>
-	 */
-	@Deprecated
-	List<Pair<String, String>> getAdditionalbPKs();
-	
-	/**
-	 * Get baseId of this user
+	 * Get the encrypted SourceId (vSZ) from new E-ID scheme
 	 * 
 	 * @return
 	 */
-	@Deprecated
-	String getIdentificationValue();
+	String getEncryptedSourceId();
 	
 	/**
-	 * Get type identifier of the baseId
-	 * By default, this type is urn:publicid:gv.at:baseid
+	 * Get the type identifier of encrypted SourceId
 	 * 
 	 * @return
 	 */
-	@Deprecated
-	String getIdentificationType();
-	 
-
-	/**
-	 * Get the identityLink for the authenticated user
-	 * 
-	 * @return IDL, or NULL if no IDL is available
-	 */
-	@Deprecated
-	IIdentityLink getIdentityLink();
-	
+	String getEncryptedSourceIdType();
+		
 	 /**
 	  * Return LoA for this user authentication
 	  *  
@@ -234,4 +197,55 @@ public interface IAuthData {
 	  */
 	 public <T> T getGenericData(String key, final Class<T> clazz);
 
+	 
+ 	/**
+	 * Get bPK of the user
+	 * 
+	 * @return
+	 */
+	@Deprecated
+	String getBPK();
+	
+	/**
+	 * Get sector for user's bPK
+	 * 
+	 * 
+	 * @return Sector identifier with prefix
+	 */
+	@Deprecated
+	String getBPKType();
+
+	
+	/**
+	 * Get List of bPK/bPKType tuples for this service provider  
+	 * @return List of Pairs<bPK, bPKType>
+	 */
+	@Deprecated
+	List<Pair<String, String>> getAdditionalbPKs();
+	
+	/**
+	 * Get baseId of this user
+	 * 
+	 * @return
+	 */
+	@Deprecated
+	String getIdentificationValue();
+	
+	/**
+	 * Get type identifier of the baseId
+	 * By default, this type is urn:publicid:gv.at:baseid
+	 * 
+	 * @return
+	 */
+	@Deprecated
+	String getIdentificationType();
+	 
+
+	/**
+	 * Get the identityLink for the authenticated user
+	 * 
+	 * @return IDL, or NULL if no IDL is available
+	 */
+	@Deprecated
+	IIdentityLink getIdentityLink();
 }