Index: vhTest/Utils/WS/Vhisie4/Auth/DecrypteerRequest.cls.xml
===================================================================
diff -u
--- vhTest/Utils/WS/Vhisie4/Auth/DecrypteerRequest.cls.xml	(revision 0)
+++ vhTest/Utils/WS/Vhisie4/Auth/DecrypteerRequest.cls.xml	(revision 41279)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Utils.WS.Vhisie4.Auth.DecrypteerRequest">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="StandaardDecrypteerRequest">
+<ClassMethod>1</ClassMethod>
+<ReturnType>WS.Vhisie4.Auth.DecrypteerRequest</ReturnType>
+<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.Hostname = "example.com"
+	
+	Quit DecrypteerRequest
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml	(revision 41279)
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteer.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test Standaardgedrag">
+<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 = "Vhisie||K||7833||7956"
+	Set LoginParameters.KlantID = "K||7833"
+	Set LoginParameters.PersonalityID = "1"
+	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.GebruikerId,"7956")
+	Do $$$AssertEquals(Response.GebruikerNaam,"POST C.H.")
+	Do $$$AssertEquals(Response.IsGeldig,"1")
+	Do $$$AssertEquals(Response.KlantId,"7833")
+	Do $$$AssertEquals(Response.KlantNaam,"HEIN F.")
+	Do $$$AssertEquals(Response.PersonalityId,"1")
+	Do $$$AssertEquals(Response.Taal,"N")
+	Do $$$AssertEquals(Response.ToegelatenLadetypes.Count(),3)
+	
+	Do LoginParameterBepalerMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: ongeldig indien geen Ref">
+<Implementation><![CDATA[
+	Set DecrypteerRequest = ##class(WS.Vhisie4.Auth.DecrypteerRequest).%New()
+	Set DecrypteerRequest.Ref = ""
+	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New()
+	
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(DecrypteerRequest)
+	
+	Do $$$AssertEquals(Response.IsGeldig,"0")
+]]></Implementation>
+</Method>
+
+<Method name="Test: ongeldig indien geen DataOpt">
+<Implementation><![CDATA[
+	Set DecrypteerRequest = ##class(WS.Vhisie4.Auth.DecrypteerRequest).%New()
+	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")
+]]></Implementation>
+</Method>
+
+<Method name="Test: ongeldig indien geen Hostname">
+<Implementation><![CDATA[
+	Set DecrypteerRequest = ##class(WS.Vhisie4.Auth.DecrypteerRequest).%New()
+	Set DecrypteerRequest.Hostname = ""
+	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New()
+	
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(DecrypteerRequest)
+	
+	Do $$$AssertEquals(Response.IsGeldig,"0")
+]]></Implementation>
+</Method>
+
+<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.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, , 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 TBX en LBX voor Kisch">
+<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.PersonalityID = ##class(DOM.common.enu.Personality).Kisch()
+	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, , 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: ongeldig indien incorrecte data uit ref/dataopt">
+<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 = "Incorrect_GebruikerId"
+	Set LoginParameters.KlantID = "K||7833"
+	Set LoginParameters.PersonalityID = "1"
+	Set LoginParameters.RemoteIP = "127.0.0.257"
+	Set LoginParameters.Taal = "N"
+	
+	Set LoginParameterBepalerStub = ##class(vhTest.Mock.WSimpl.Unishop.Login.ParameterBepaler).%New()
+	Do LoginParameterBepalerStub.IndienMethodCall("GeefLoginParameters",DecrypteerRequestStub.Ref, DecrypteerRequestStub.DataOpt, DecrypteerRequestStub.Header.Taal, DecrypteerRequestStub.Header.GebruikerIp).ExactAantalKeer(1).DanReturn(LoginParameters)
+	
+	Set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New("WS.VHISIE4")
+	Do LoggerMock.VerwachtMethodCall("Error",$$$ElkeWaarde,$$$ElkeWaarde,$$$ElkeWaarde).ExactAantalKeer(1)
+	
+	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerStub, LoggerMock)
+	
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(DecrypteerRequestStub)
+		
+	Do $$$AssertEquals(Response.IsGeldig,"0")
+	
+	Do LoggerMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml
===================================================================
diff -u -r41255 -r41279
--- WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 41255)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 41279)
@@ -3,71 +3,71 @@
 <Class name="WSimpl.Vhisie4.Auth.HandelAuthenticator">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="LoginParameterBepaler">
+<Type>WSimpl.Unishop.Login.ParameterBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="PartijAPI">
+<Type>DOM.PARTIJ.PartijAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>LoginParameterBepaler:WSimpl.Unishop.Login.ParameterBepaler,Logger:vhLib.Logger,PartijAPI:DOM.PARTIJ.PartijAPI</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())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Decrypteer">
 <FormalSpec>DecrypteerRequest:WS.Vhisie4.Auth.DecrypteerRequest</FormalSpec>
 <ReturnType>WS.Vhisie4.Auth.DecrypteerResponse</ReturnType>
 <Implementation><![CDATA[
 	#Dim Response As WS.Vhisie4.Auth.DecrypteerResponse = ##class(WS.Vhisie4.Auth.DecrypteerResponse).%New()
 	
-	If ("" = DecrypteerRequest.Hostname) {
+	If (DecrypteerRequest.Hostname = "") {
 		Set Response.IsGeldig = 0
-	} ElseIf ("" = DecrypteerRequest.Ref) {
+	} ElseIf (DecrypteerRequest.Ref = "") {
 		Set Response.IsGeldig = 0
-	} ElseIf (")àç!HEIN)àç!" = DecrypteerRequest.Ref) {
-		If ("" = DecrypteerRequest.DataOpt) {
-			Set Response.IsGeldig = 0
-		} ElseIf ("ongeldigeDataOpt" = DecrypteerRequest.DataOpt) {
-			Set Response.IsGeldig = 0
-		} Else {
-			Set Response.IsGeldig = 1
-			Set Response.GebruikerId = "1"
-			Set Response.GebruikerNaam = ""
-			Set Response.IsContactGegevensFormulierNodig = 0
-			Set Response.KlantId = "hein_" _ DecrypteerRequest.DataOpt
-			Set Response.KlantNaam =  "hein_" _ DecrypteerRequest.DataOpt
-			Set Response.PersonalityId = 11
-			Set Response.Taal = "D"
-			Do Response.ToegelatenLadetypes.Insert("LBX")
-			Do Response.ToegelatenLadetypes.Insert("TAX")
+	} 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(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 Response.Taal = LoginParameters.Taal
 			Do Response.ToegelatenLadetypes.Insert("TBX")
-		}
-	} ElseIf (")àç!SFS)àç!" = DecrypteerRequest.Ref) {
-		If ("" = DecrypteerRequest.DataOpt) {
-			Set Response.IsGeldig = 0
-		} ElseIf ("ongeldigeDataOpt" = DecrypteerRequest.DataOpt) {
-			Set Response.IsGeldig = 0
-		} Else {
-			Set Response.IsGeldig = 1
-			Set Response.GebruikerId = "1"
-			Set Response.GebruikerNaam = ""
-			Set Response.IsContactGegevensFormulierNodig = 0
-			Set Response.KlantId = "sfs_" _ DecrypteerRequest.DataOpt
-			Set Response.KlantNaam =  "sfs_" _ DecrypteerRequest.DataOpt
-			Set Response.PersonalityId = 3
-			Set Response.Taal = "D"
 			Do Response.ToegelatenLadetypes.Insert("LBX")
-			Do Response.ToegelatenLadetypes.Insert("TAX")
-			Do Response.ToegelatenLadetypes.Insert("TBX")
-		}
-	} ElseIf (")àç!DU-PONT)àç!" = DecrypteerRequest.Ref) {
-		If ("" = DecrypteerRequest.DataOpt) {
+			If $$$Not(LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Kisch()) && $$$Not(LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Destil()) {
+				Do Response.ToegelatenLadetypes.Insert("TAX")
+			}
+			
 			Set Response.IsGeldig = 1
-			Set Response.IsContactGegevensFormulierNodig = 1
-		} ElseIf ("ongeldigeDataOpt" = DecrypteerRequest.DataOpt) {
+		} Catch {
+			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+			Do ..Logger.Error(..%ClassName()_" Decrypteer","Failed : "_$C(13,10)_Exception.ToString())
 			Set Response.IsGeldig = 0
-		} Else {
-			Set Response.IsGeldig = 1
-			Set Response.GebruikerId = "1"
-			Set Response.GebruikerNaam = ""
-			Set Response.IsContactGegevensFormulierNodig = 0
-			Set Response.KlantId = "1234"
-			Set Response.KlantNaam =  "dupont_" _ DecrypteerRequest.DataOpt
-			Set Response.PersonalityId = 4
-			Set Response.Taal = "N"
-			Do Response.ToegelatenLadetypes.Insert("LBX")
 		}
-	} Else {
-		Set Response.IsGeldig = 0
 	}
 
 	Quit Response
Index: vhTest/Utils/WS/Vhisie4/RequestHeader.cls.xml
===================================================================
diff -u -r39602 -r41279
--- vhTest/Utils/WS/Vhisie4/RequestHeader.cls.xml	(.../RequestHeader.cls.xml)	(revision 39602)
+++ vhTest/Utils/WS/Vhisie4/RequestHeader.cls.xml	(.../RequestHeader.cls.xml)	(revision 41279)
@@ -13,6 +13,7 @@
 	set Header.GebruikerIp = "127.0.0.1"
 	set Header.RequestId = "1234"
 	set Header.SessieId = "4567"
+	set Header.Taal = "N"
 	quit Header
 ]]></Implementation>
 </Method>
Index: WS/Vhisie4/Auth/DecrypteerRequest.cls.xml
===================================================================
diff -u -r40941 -r41279
--- WS/Vhisie4/Auth/DecrypteerRequest.cls.xml	(.../DecrypteerRequest.cls.xml)	(revision 40941)
+++ WS/Vhisie4/Auth/DecrypteerRequest.cls.xml	(.../DecrypteerRequest.cls.xml)	(revision 41279)
@@ -16,23 +16,24 @@
 
 <Property name="Ref">
 <Type>TECH.String</Type>
+<Required>1</Required>
 </Property>
 
 <Property name="DataOpt">
 <Type>TECH.String</Type>
+<Required>1</Required>
 </Property>
 
 <Property name="Hostname">
 <Type>TECH.String</Type>
+<Required>1</Required>
 </Property>
 
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <State>DecrypteerRequestState</State>
 <StreamLocation>^WS.Vhisie4B7AF.DecrypteerR7CBES</StreamLocation>
 <Data name="DecrypteerRequestState">
-<Structure>listnode</Structure>
-<Subscript/>
 <Value name="1">
 <Value>REF</Value>
 </Value>