Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml
===================================================================
diff -u -r41279 -r41585
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 41279)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 41585)
@@ -8,9 +8,9 @@
 	#dim DecrypteerRequestStub As WS.Vhisie4.Auth.DecrypteerRequest = ##class(vhTest.Utils.WS.Vhisie4.Auth.DecrypteerRequest).StandaardDecrypteerRequest()
 	
 	Set LoginParameters = ##class(WSimpl.Unishop.Login.ParametersHandel).%New()
-	Set LoginParameters.GebruikerID = "Vhisie||K||7833||7956"
-	Set LoginParameters.KlantID = "K||7833"
-	Set LoginParameters.PersonalityID = "1"
+	Set LoginParameters.GebruikerID = "daro_5_1"
+	Set LoginParameters.KlantID = "daro_5"
+	Set LoginParameters.PersonalityID = "10"
 	Set LoginParameters.RemoteIP = "127.0.0.257"
 	Set LoginParameters.Taal = "N"
 	
@@ -21,12 +21,12 @@
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(DecrypteerRequestStub)
 	
-	Do $$$AssertEquals(Response.GebruikerId,"7956")
-	Do $$$AssertEquals(Response.GebruikerNaam,"POST C.H.")
+	Do $$$AssertEquals(Response.GebruikerId,"1")
+	Do $$$AssertEquals(Response.GebruikerNaam,"")
 	Do $$$AssertEquals(Response.IsGeldig,"1")
-	Do $$$AssertEquals(Response.KlantId,"7833")
-	Do $$$AssertEquals(Response.KlantNaam,"HEIN F.")
-	Do $$$AssertEquals(Response.PersonalityId,"1")
+	Do $$$AssertEquals(Response.KlantId,"5")
+	Do $$$AssertEquals(Response.KlantNaam,"Tom Gillespy")
+	Do $$$AssertEquals(Response.PersonalityId,"10")
 	Do $$$AssertEquals(Response.Taal,"N")
 	Do $$$AssertEquals(Response.ToegelatenLadetypes.Count(),3)
 	
@@ -70,7 +70,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: enkel TBX en LBX voor Destil">
+<Method name="aTest: enkel TBX en LBX voor Destil">
 <Implementation><![CDATA[
 	#dim DecrypteerRequestStub As WS.Vhisie4.Auth.DecrypteerRequest = ##class(vhTest.Utils.WS.Vhisie4.Auth.DecrypteerRequest).StandaardDecrypteerRequest()
 	
@@ -106,8 +106,8 @@
 	#dim DecrypteerRequestStub As WS.Vhisie4.Auth.DecrypteerRequest = ##class(vhTest.Utils.WS.Vhisie4.Auth.DecrypteerRequest).StandaardDecrypteerRequest()
 	
 	Set LoginParameters = ##class(WSimpl.Unishop.Login.ParametersHandel).%New()
-	Set LoginParameters.GebruikerID = $$$DummyString
-	Set LoginParameters.KlantID = $$$DummyString
+	Set LoginParameters.GebruikerID = "kisch_64_1"
+	Set LoginParameters.KlantID = "kisch_64"
 	Set LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Kisch()
 	Set LoginParameters.RemoteIP = $$$DummyString
 	Set LoginParameters.Taal = $$$DummyString
@@ -132,7 +132,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ongeldig indien incorrecte data uit ref/dataopt">
+<Method name="aTest: ongeldig indien incorrecte data uit ref/dataopt">
 <Implementation><![CDATA[
 	#dim DecrypteerRequestStub As WS.Vhisie4.Auth.DecrypteerRequest = ##class(vhTest.Utils.WS.Vhisie4.Auth.DecrypteerRequest).StandaardDecrypteerRequest()
 	
Index: WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml
===================================================================
diff -u -r41279 -r41585
--- WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 41279)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 41585)
@@ -47,14 +47,18 @@
 	} Else {
 		Try {
 			#dim LoginParameters As WSimpl.Unishop.Login.Parameters = ..LoginParameterBepaler.GeefLoginParameters(DecrypteerRequest.Ref, DecrypteerRequest.DataOpt, DecrypteerRequest.Header.Taal, DecrypteerRequest.Header.GebruikerIp)
+			#dim HandelPersonality As DOM.common.impl.HandelPersonality = ##class(DOM.common.impl.HandelPersonality).%OpenId(LoginParameters.PersonalityID)
 			
 			Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(LoginParameters.PersonalityID)
 			Set Response.PersonalityId = LoginParameters.PersonalityID
-			#dim Partij As DOM.PARTIJ.Partij = ..PartijAPI.GeefPartij(LoginParameters.KlantID)
-			Set Response.KlantId = $Extract(Partij.GeefID(),4,*)
-			Set Response.KlantNaam = Partij.GeefNaam()
-			Set Response.GebruikerId = $piece(LoginParameters.GebruikerID,"||",4)
-			Set Response.GebruikerNaam = ..PartijAPI.GeefPartij("K||"_Response.GebruikerId).GeefNaam()
+			
+			Set KlantDataBepaler = ##class(DOM.VKP.impl.KlantDataBepaler).%New()
+			#dim KlantData As DOM.common.dto.KlantData = KlantDataBepaler.GeefKlantData(HandelPersonality, LoginParameters.KlantID)
+			
+			Set Response.KlantId = $Piece(KlantData.ID,"_",2)
+			Set Response.KlantNaam = KlantData.Naam
+			Set Response.GebruikerId = 1
+			Set Response.GebruikerNaam = ""
 			Set Response.Taal = LoginParameters.Taal
 			Do Response.ToegelatenLadetypes.Insert("TBX")
 			Do Response.ToegelatenLadetypes.Insert("LBX")
@@ -78,7 +82,7 @@
 <FormalSpec>RegistreerContactGegevensRequest:WS.Vhisie4.Auth.RegistreerContactGegevensRequest</FormalSpec>
 <ReturnType>WS.Vhisie4.Auth.RegistreerContactGegevensResponse</ReturnType>
 <Implementation><![CDATA[
-	#Dim Response As WS.Vhisie4.Auth.RegistreerContactGegevensResponse = ##class(WS.Vhisie4.Auth.RegistreerContactGegevensResponse).%New()
+	/*#Dim Response As WS.Vhisie4.Auth.RegistreerContactGegevensResponse = ##class(WS.Vhisie4.Auth.RegistreerContactGegevensResponse).%New()
 	
 	If ("" = RegistreerContactGegevensRequest.Ref) {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ref is verplicht"))
@@ -87,18 +91,64 @@
 	} ElseIf ("" = RegistreerContactGegevensRequest.EmailAdres) {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("EmailAdres is verplicht"))
 	} Else {
+		
+		#dim HandelPersonality As DOM.common.impl.HandelPersonality = ##class(DOM.common.impl.HandelPersonality).%OpenId(RegistreerContactGegevensRequest.Header.PersonalityId)
+		
+		
+		#dim KlantId As %String = ""
+		#dim KlantData As DOM.common.dto.HandelKlantData
+		If RegistreerContactGegevensRequest.Header.KlantId = "" {
+			Set KlantId = HandelPersonality.GeefPrefix()_##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWebshopSessionService().GeefVolgendeKlantID(HandelPersonality.GeefID())
+			Set KlantData = ..GeefHandelKlantData(KlantId,RegistreerContactGegevensRequest)
+			Do ..BewaarKlant(HandelPersonality,KlantData)
+		} Else {
+			Do ##class(Tools.Wlip).%New(127).String("opening "_HandelPersonality.GeefPrefix()_RegistreerContactGegevensRequest.Header.KlantId)
+			Set KlantData = ##class(DOM.VKP.impl.HandelKlantData).%OpenId(HandelPersonality.GeefPrefix()_RegistreerContactGegevensRequest.Header.KlantId)
+		}
+		Do ##class(Tools.Wlip).%New(127).String(KlantId)
+		
 
-		Set Response.GebruikerId = "1"
+		Set Response.KlantId = KlantData.GeefID()
+		Set Response.GebruikerId = Response.KlantId _ "_" _RegistreerContactGegevensRequest.Header.GebruikerId
 		Set Response.GebruikerNaam = ""
-		Set Response.KlantId = "1234"
-		Set Response.KlantNaam = "dupont_" _ RegistreerContactGegevensRequest.Naam
+		Set Response.KlantNaam = KlantData.Naam
 		Set Response.DataOpt = ##class(vhPowerTools.APPS.EC.KlantSessieDataGeneratorUnishop).%New().GenereerDataOpt("DUPO",Response.KlantId,Response.KlantNaam,Response.GebruikerId)
 
 	}
 	
-	Quit Response
+	Quit Response*/
 ]]></Implementation>
 </Method>
+
+<Method name="GeefHandelKlantData">
+<FormalSpec>KlantId:DOM.VKP.VanHoeckeKlantID,RegistreerContactGegevensRequest:WS.Vhisie4.Auth.RegistreerContactGegevensRequest</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.common.dto.HandelKlantData</ReturnType>
+<Implementation><![CDATA[
+		/*#dim HandelKlantData As DOM.VKP.impl.HandelKlantData = ##class(DOM.VKP.impl.HandelKlantData).%New()
+		
+		Set HandelKlantData.ID = KlantId
+		Set HandelKlantData.EmailAdres = RegistreerContactGegevensRequest.EmailAdres
+		Set HandelKlantData.FaxNummer = RegistreerContactGegevensRequest.FaxNummer
+		Set HandelKlantData.Gemeente = RegistreerContactGegevensRequest.Gemeente
+		Set HandelKlantData.Naam = RegistreerContactGegevensRequest.Naam
+		Set HandelKlantData.Postcode = RegistreerContactGegevensRequest.Postcode
+		Set HandelKlantData.StraatEnNr = RegistreerContactGegevensRequest.StraatEnNr
+		Set HandelKlantData.TelefoonNummer = RegistreerContactGegevensRequest.TelefoonNummer
+		Do HandelKlantData.Save()
+		
+		Quit HandelKlantData*/
+]]></Implementation>
+</Method>
+
+<Method name="BewaarKlant">
+<FormalSpec>Personality:DOM.common.Personality,KlantData:DOM.common.dto.KlantData</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	/*#dim KlantDataBewaarder As APPS.VKP.KlantDataBewaarder = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefKlantDataBewaarder()
+	Do KlantDataBewaarder.Bewaar(Personality, KlantData)*/
+]]></Implementation>
+</Method>
 </Class>