Index: WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml
===================================================================
diff -u -r41590 -r41608
--- WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 41590)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 41608)
@@ -13,26 +13,20 @@
 <Private>1</Private>
 </Property>
 
-<Property name="PartijAPI">
-<Type>DOM.PARTIJ.PartijAPI</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="VerkoopAPI">
 <Type>DOM.VKP.VerkoopAPI</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>LoginParameterBepaler:WSimpl.Unishop.Login.ParameterBepaler,Logger:vhLib.Logger,PartijAPI:DOM.PARTIJ.PartijAPI</FormalSpec>
+<FormalSpec>LoginParameterBepaler:WSimpl.Unishop.Login.ParameterBepaler,Logger:vhLib.Logger</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..LoginParameterBepaler = $$$Inject(LoginParameterBepaler, ##class(WSimpl.Unishop.Login.ParameterBepaler).%New())
 	Set ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New("WS.VHISIE4"))
-	Set ..PartijAPI = $$$Inject(PartijAPI,##class(DOM.DomeinContext).Instance().GeefPartijAPI())
 	Set ..VerkoopAPI = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()
 	Quit $$$OK
 ]]></Implementation>
@@ -42,50 +36,40 @@
 <FormalSpec>DecrypteerRequest:WS.Vhisie4.Auth.DecrypteerRequest</FormalSpec>
 <ReturnType>WS.Vhisie4.Auth.DecrypteerResponse</ReturnType>
 <Implementation><![CDATA[
-			Do ##class(Tools.Wlip).%New(127).String("decrypteer")
 	#Dim Response As WS.Vhisie4.Auth.DecrypteerResponse = ##class(WS.Vhisie4.Auth.DecrypteerResponse).%New()
 	
 	If (DecrypteerRequest.Hostname = "") {
 		Set Response.IsGeldig = 0
 	} ElseIf (DecrypteerRequest.Ref = "") {
 		Set Response.IsGeldig = 0
-	} ElseIf DecrypteerRequest.DataOpt = "" {
-		Set Response.IsGeldig = 0
 	} Else {
 		Try {
 			#dim LoginParameters As WSimpl.Unishop.Login.Parameters = ..LoginParameterBepaler.GeefLoginParameters(DecrypteerRequest.Ref, DecrypteerRequest.DataOpt, DecrypteerRequest.Header.Taal, DecrypteerRequest.Header.GebruikerIp)
-			
-			Do ##class(Tools.Wlip).%New(127).String("personalityid = "_LoginParameters.PersonalityID)
-			
-			
 			#dim HandelPersonality As DOM.common.impl.HandelPersonality = ##class(DOM.common.impl.HandelPersonality).%OpenId(LoginParameters.PersonalityID)
-			Do ##class(Tools.Wlip).%New(127).ObjToXML(LoginParameters)
-			Do ##class(Tools.Wlip).%New(127).ObjToXML(HandelPersonality)
 			
-			Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(LoginParameters.PersonalityID)
-			
-			Set Response.PersonalityId = LoginParameters.PersonalityID
-			
 			Set KlantDataBepaler = ##class(DOM.VKP.impl.KlantDataBepaler).%New()
 			#dim KlantData As DOM.common.dto.KlantData = KlantDataBepaler.GeefKlantData(HandelPersonality, LoginParameters.KlantID)
 			
 			Set Response.IsContactGegevensFormulierNodig = (DecrypteerRequest.DataOpt = "")
-			
+			Set Response.PersonalityId = LoginParameters.PersonalityID
 			Set Response.KlantId = $Piece(KlantData.ID,"_",2)
 			Set Response.KlantNaam = KlantData.Naam
-			Set Response.GebruikerId = 1
+			If $$$HasLength(DecrypteerRequest.DataOpt) {
+				Set Response.GebruikerId = 1
+			}
 			Set Response.GebruikerNaam = ""
 			Set Response.Taal = LoginParameters.Taal
-			Do Response.ToegelatenLadetypes.Insert("TBX")
 			Do Response.ToegelatenLadetypes.Insert("LBX")
-			If $$$Not(LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Kisch()) && $$$Not(LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Destil()) {
+			If $$$Not(##class(TECH.StringUtils).Equals(LoginParameters.PersonalityID,##class(DOM.common.enu.Personality).Kisch(), ##class(DOM.common.enu.Personality).Destil())) {
 				Do Response.ToegelatenLadetypes.Insert("TAX")
 			}
+			If $$$Not(LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Daro()) {
+				Do Response.ToegelatenLadetypes.Insert("TBX")
+			}
 			
 			Set Response.IsGeldig = 1
 		} Catch {
 			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-			Do ##class(Tools.Wlip).%New(127).String(Exception.ToString())
 			Do ..Logger.Error(..%ClassName()_" Decrypteer","Failed : "_$C(13,10)_Exception.ToString())
 			Set Response.IsGeldig = 0
 		}
@@ -99,7 +83,8 @@
 <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"))
@@ -133,7 +118,8 @@
 
 	}
 	
-	Quit Response*/
+	Quit Response
+	*/
 ]]></Implementation>
 </Method>
 
Index: vhTest/Utils/WS/Vhisie4/Auth/DecrypteerRequest.cls.xml
===================================================================
diff -u -r41279 -r41608
--- vhTest/Utils/WS/Vhisie4/Auth/DecrypteerRequest.cls.xml	(.../DecrypteerRequest.cls.xml)	(revision 41279)
+++ vhTest/Utils/WS/Vhisie4/Auth/DecrypteerRequest.cls.xml	(.../DecrypteerRequest.cls.xml)	(revision 41608)
@@ -9,8 +9,8 @@
 <Implementation><![CDATA[
 	Set DecrypteerRequest = ##class(WS.Vhisie4.Auth.DecrypteerRequest).%New()
 	Set DecrypteerRequest.Header = ##class(vhTest.Utils.WS.Vhisie4.RequestHeader).StandaardHeader()
-	Set DecrypteerRequest.Ref = "6_MV7/rEU_8JFfA_3aao3cwGmFHPAxMRn4BOpt0uYxU-"
-	Set DecrypteerRequest.DataOpt = "g5o7JQMM9KPtVSegz_GKdw3FkeGVyWzT/EaHnqEp73kGs9PfqCsB4WEYfsbMYtPY"
+	Set DecrypteerRequest.Ref = "epNpdoeUpMXHUM16/vkNpg--"
+	Set DecrypteerRequest.DataOpt = "mKxgnJz2gQ29YpJ8wQevv_OuWxHSa7S7UM/jSvIE1nAn6MlM0/Ed0sCe6fUVmNnjVUyjJgDXIP5T5rliGj5kAQ--"
 	Set DecrypteerRequest.Hostname = "example.com"
 	
 	Quit DecrypteerRequest
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml
===================================================================
diff -u -r41585 -r41608
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 41585)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 41608)
@@ -24,11 +24,12 @@
 	Do $$$AssertEquals(Response.GebruikerId,"1")
 	Do $$$AssertEquals(Response.GebruikerNaam,"")
 	Do $$$AssertEquals(Response.IsGeldig,"1")
+	Do $$$AssertEquals(Response.IsContactGegevensFormulierNodig,"0")
 	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)
+	Do $$$AssertEquals(Response.ToegelatenLadetypes.Count(),2)
 	
 	Do LoginParameterBepalerMock.Verifieer()
 ]]></Implementation>
@@ -46,15 +47,20 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: ongeldig indien geen DataOpt">
+<Method name="Test: indien geen DataOpt klant en gebruiker leeg en IsContactGegevensFormulierNodig true">
 <Implementation><![CDATA[
-	Set DecrypteerRequest = ##class(WS.Vhisie4.Auth.DecrypteerRequest).%New()
+	#dim DecrypteerRequest As WS.Vhisie4.Auth.DecrypteerRequest = ##class(vhTest.Utils.WS.Vhisie4.Auth.DecrypteerRequest).StandaardDecrypteerRequest()
 	Set DecrypteerRequest.DataOpt = ""
 	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New()
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(DecrypteerRequest)
 	
-	Do $$$AssertEquals(Response.IsGeldig,"0")
+	Do $$$AssertEquals(Response.IsGeldig,"1")
+	Do $$$AssertEquals(Response.KlantId,"")
+	Do $$$AssertEquals(Response.KlantNaam,"")
+	Do $$$AssertEquals(Response.GebruikerId,"")
+	Do $$$AssertEquals(Response.GebruikerNaam,"")
+	Do $$$AssertEquals(Response.IsContactGegevensFormulierNodig,"1")
 ]]></Implementation>
 </Method>
 
@@ -70,28 +76,22 @@
 ]]></Implementation>
 </Method>
 
-<Method name="aTest: enkel TBX en LBX voor Destil">
+<Method name="Test: enkel TBX en LBX voor Destil">
 <Implementation><![CDATA[
 	#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.KlantID = "destil_1"
 	Set LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Destil()
 	Set LoginParameters.RemoteIP = $$$DummyString
 	Set LoginParameters.Taal = $$$DummyString
 	
 	Set LoginParameterBepalerMock = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
 	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",DecrypteerRequestStub.Ref, DecrypteerRequestStub.DataOpt, DecrypteerRequestStub.Header.Taal, DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(LoginParameters)
 	
-	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
-	Do PartijStub.IndienMethodCall("GeefNaam").DanReturn($$$DummyString)
-	Do PartijStub.IndienMethodCall("GeefID").DanReturn($$$DummyInteger)
-	Set PartijAPIStub = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
-	Do PartijAPIStub.IndienMethodCall("GeefPartij",$$$ElkeWaarde).DanReturn(PartijStub)
+	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock,)
 	
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock, , PartijAPIStub)
-	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(DecrypteerRequestStub)
 	
 	Do $$$AssertEquals(Response.IsGeldig,"1")
@@ -115,14 +115,33 @@
 	Set LoginParameterBepalerMock = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
 	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",DecrypteerRequestStub.Ref, DecrypteerRequestStub.DataOpt, DecrypteerRequestStub.Header.Taal, DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(LoginParameters)
 	
-	Set PartijStub = ##class(vhTest.Mock.DOM.PARTIJ.Partij).%New()
-	Do PartijStub.IndienMethodCall("GeefNaam").DanReturn($$$DummyString)
-	Do PartijStub.IndienMethodCall("GeefID").DanReturn($$$DummyInteger)
-	Set PartijAPIStub = ##class(vhTest.Mock.DOM.PARTIJ.PartijAPI).%New()
-	Do PartijAPIStub.IndienMethodCall("GeefPartij",$$$ElkeWaarde).DanReturn(PartijStub)
+	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock)
 	
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock, , PartijAPIStub)
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(DecrypteerRequestStub)
 	
+	Do $$$AssertEquals(Response.IsGeldig,"1")
+	Do $$$AssertEquals(Response.ToegelatenLadetypes.Count(),2)
+	
+	Do LoginParameterBepalerMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: enkel LBX en TAX voor Daro">
+<Implementation><![CDATA[
+	#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 = "daro_5_1"
+	Set LoginParameters.KlantID = "daro_5"
+	Set LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Daro()
+	Set LoginParameters.RemoteIP = "127.0.0.257"
+	Set LoginParameters.Taal = "N"
+	
+	Set LoginParameterBepalerMock = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
+	Do LoginParameterBepalerMock.VerwachtMethodCall("GeefLoginParameters",DecrypteerRequestStub.Ref, DecrypteerRequestStub.DataOpt, DecrypteerRequestStub.Header.Taal, DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(LoginParameters)
+	
+	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock)
+	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(DecrypteerRequestStub)
 	
 	Do $$$AssertEquals(Response.IsGeldig,"1")