FishEye: Tag 45479 refers to a dead (removed) revision in file `vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteer/Test.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml
===================================================================
diff -u -r45398 -r45479
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Decrypteer/Test.cls.xml)	(revision 45398)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Decrypteerder/Decrypteer/Test.cls.xml)	(revision 45479)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="vhUnitTest.WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteer.Test">
+<Class name="vhUnitTest.WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder.Decrypteer.Test">
 <Super>vhUnitTest.TestCase</Super>
 
 <Property name="DecrypteerRequestStub">
@@ -60,9 +60,9 @@
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,HandelPersonalityRepositoryStub,,,SettingsManagerStub,KortingBewaarderMock,UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,HandelPersonalityRepositoryStub,,SettingsManagerStub,KortingBewaarderMock,UrlBepalerStub)
 	
-	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
 	Do $$$AssertEquals(Response.GebruikerId,"1")
 	Do $$$AssertEquals(Response.GebruikerNaam,"")
@@ -84,9 +84,9 @@
 <Implementation><![CDATA[
 	Set ..DecrypteerRequestStub.Ref = ""
 	Set ..DecrypteerRequestStub.Header.PersonalityId = 42
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New()
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New()
 	
-	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
 	Do $$$AssertFalse(Response.IsGeldig)
 ]]></Implementation>
@@ -99,9 +99,9 @@
 	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)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock)
 	
-	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
 	Do $$$AssertEquals(Response.IsGeldig,"1")
 	Do $$$AssertEquals(Response.KlantId,"")
@@ -120,9 +120,9 @@
 <Implementation><![CDATA[
 	Set ..DecrypteerRequestStub = ##class(WS.Vhisie4.Auth.DecrypteerRequest).%New()
 	Set ..DecrypteerRequestStub.Hostname = "HeIn"
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New()
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New()
 	
-	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
 	Do $$$AssertEquals(Response.IsGeldig,"1")
 	Do $$$AssertEquals(Response.PersonalityId,"11")
@@ -133,9 +133,9 @@
 <Method name="Test: ongeldig indien geen Hostname">
 <Implementation><![CDATA[
 	Set ..DecrypteerRequestStub.Hostname = ""
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New()
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New()
 	
-	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
 	Do $$$AssertEquals(Response.IsGeldig,"0")
 ]]></Implementation>
@@ -167,9 +167,9 @@
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,,,,,UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,,,,UrlBepalerStub)
 	
-	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
 	Do $$$AssertEquals(Response.IsGeldig,"1")
 	If $$$AssertEquals(Response.ToegelatenLadetypes.Count(),2) {
@@ -207,9 +207,9 @@
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,,,,,UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,,,,UrlBepalerStub)
 	
-	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
 	Do $$$AssertEquals(Response.IsGeldig,"1")
 	If $$$AssertEquals(Response.ToegelatenLadetypes.Count(),2) {
@@ -247,9 +247,9 @@
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,,,,,UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,,,,UrlBepalerStub)
 	
-	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
 	Do $$$AssertEquals(Response.IsGeldig,"1")
 	If $$$AssertEquals(Response.ToegelatenLadetypes.Count(),2) {
@@ -290,9 +290,9 @@
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerStub, LoggerMock,HandelKlantDataRepository,,,,,,UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub, LoggerMock,HandelKlantDataRepository,,,,,UrlBepalerStub)
 	
-	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 		
 	Do $$$AssertEquals(Response.IsGeldig,"0")
 	
@@ -328,9 +328,9 @@
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerStub,,,HandelPersonalityRepositoryStub,WebshopSessionService,,SettingsManagerStub,,UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,HandelPersonalityRepositoryStub,WebshopSessionService,SettingsManagerStub,,UrlBepalerStub)
 	
-	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
 	Do $$$AssertEquals(Response.KlantId,"42")
 	Do $$$AssertEquals(Response.IsGeldig,$$$True)
@@ -351,9 +351,9 @@
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl","10").DanReturn("darotest.taorbox.com")
 	
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerStub,,,,,,,,UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,,,,,UrlBepalerStub)
 	
-	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
 	Do $$$AssertFalse(Response.IsGeldig)
 ]]></Implementation>
@@ -374,9 +374,9 @@
 	Set UrlBepalerMock = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerMock.VerwachtMethodCall("GeefUrl","10").DanReturn("darotest.taorbox.com").ExactAantalKeer(0)
 	
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(LoginParameterBepalerStub,,,,,,,,UrlBepalerMock)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,,,,,UrlBepalerMock)
 	
-	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Authenticator.Decrypteer(..DecrypteerRequestStub)
+	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
 	Do UrlBepalerMock.Verifieer()
 ]]></Implementation>
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/RegistreerContactGegevens/Test.cls.xml
===================================================================
diff -u -r45475 -r45479
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/RegistreerContactGegevens/Test.cls.xml	(.../Test.cls.xml)	(revision 45475)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/RegistreerContactGegevens/Test.cls.xml	(.../Test.cls.xml)	(revision 45479)
@@ -43,7 +43,7 @@
 	Set KortingBewaarderMock = ##class(vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder).%New()
 	Do KortingBewaarderMock.VerwachtMethodCall("BewaarMeegegevenKorting",RegistreerContactGegevensRequestStub.Ref,DataOpt).ExactAantalKeer(1)
 	
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(,,HandelKlantDataRepositoryMock,HandelPersonalityRepositoryStub,,KlantDataBewaarderStub,SettingsManagerStub,KortingBewaarderMock,,KlantSessieDataBepalerStub)
+	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(,HandelKlantDataRepositoryMock,HandelPersonalityRepositoryStub,,KlantDataBewaarderStub,SettingsManagerStub,KortingBewaarderMock,KlantSessieDataBepalerStub)
 	#dim Response As WS.Vhisie4.Auth.RegistreerContactGegevensResponse = Authenticator.RegistreerContactGegevens(RegistreerContactGegevensRequestStub)
 	
 	Do HandelKlantDataRepositoryMock.Verifieer()
@@ -122,7 +122,7 @@
 	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro_")
 	Do SettingsManagerStub.IndienMethodCall("GeefWebshopVerwerker",HandelPersonalityStub).DanReturn("DARO")
 	
-	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(,,HandelKlantDataRepositoryMock,HandelPersonalityRepositoryStub,WebshopSessionServiceStub,KlantDataBewaarderStub,SettingsManagerStub)
+	Set Authenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New(,HandelKlantDataRepositoryMock,HandelPersonalityRepositoryStub,WebshopSessionServiceStub,KlantDataBewaarderStub,SettingsManagerStub)
 	#dim Response As WS.Vhisie4.Auth.RegistreerContactGegevensResponse = Authenticator.RegistreerContactGegevens(RegistreerContactGegevensRequestStub)
 	
 	Do HandelKlantDataRepositoryMock.Verifieer()
Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml
===================================================================
diff -u
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(revision 0)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(revision 45479)
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder">
+<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="Response">
+<Type>WS.Vhisie4.Auth.DecrypteerResponse</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="KortingBewaarder">
+<Type>WSimpl.Unishop.Login.KortingBewaarder</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="UrlBepaler">
+<Type>APPS.EC.Webshop.UrlBepaler</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="HandelPersonalityRepository">
+<Type>DOM.common.impl.HandelPersonalityRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SettingsManager">
+<Type>WSimpl.Vhisie4.SettingsManager</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="WebshopSessionService">
+<Type>APPS.EC.WebshopSessionService</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="HandelKlantDataRepository">
+<Type>DOM.VKP.impl.HandelKlantDataRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>LoginParameterBepaler:WSimpl.Unishop.Login.ParameterBepaler,Logger:vhLib.Logger,HandelKlantDataRepository:DOM.VKP.impl.HandelKlantDataRepository,HandelPersonalityRepository:DOM.common.impl.HandelPersonalityRepository,WebshopSessionService:APPS.EC.WebshopSessionService,SettingsManager:WSimpl.Vhisie4.SettingsManager,LoginKortingBewaarder:WSimpl.Unishop.Login.KortingBewaarder,UrlBepaler:APPS.EC.Webshop.UrlBepaler</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())
+	Set ..Response = ##class(WS.Vhisie4.Auth.DecrypteerResponse).%New()
+	Set ..KortingBewaarder = $$$Inject(LoginKortingBewaarder,##class(WSimpl.Unishop.Login.KortingBewaarder).%New())
+	Set ..UrlBepaler = $$$Inject(UrlBepaler,##class(APPS.EC.Webshop.impl.UrlBepaler).%New())
+	Set ..HandelPersonalityRepository = $$$Inject(HandelPersonalityRepository,##class(DOM.common.impl.HandelPersonalityRepository).%New())
+	Set ..SettingsManager = $$$Inject(SettingsManager,##class(WSimpl.Vhisie4.SettingsManager).%New())
+	Set ..WebshopSessionService = $$$Inject(WebshopSessionService,##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWebshopSessionService())
+	Set ..HandelKlantDataRepository = $$$Inject(HandelKlantDataRepository,##class(DOM.VKP.impl.HandelKlantDataRepository).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Decrypteer">
+<FormalSpec>DecrypteerRequest:WS.Vhisie4.Auth.DecrypteerRequest</FormalSpec>
+<ReturnType>WS.Vhisie4.Auth.DecrypteerResponse</ReturnType>
+<Implementation><![CDATA[
+	If ..VerwerkRefEnDataOptZonderProblemen(DecrypteerRequest) {
+		Try {
+			#dim LoginParameters As WSimpl.Unishop.Login.ParametersHandel = ..LoginParameterBepaler.GeefLoginParameters(DecrypteerRequest.Ref, DecrypteerRequest.DataOpt, DecrypteerRequest.Header.Taal, DecrypteerRequest.Header.GebruikerIp)
+			
+			Do ..ValideerHostnameMetRef(DecrypteerRequest, LoginParameters)
+			
+			Do ..KortingBewaarder.BewaarMeegegevenKorting(DecrypteerRequest.Ref,DecrypteerRequest.DataOpt)
+			Do ..VulReponseIn(DecrypteerRequest, LoginParameters)
+			
+		} 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
+		}
+	}
+
+	Quit ..Response
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkRefEnDataOptZonderProblemen">
+<FormalSpec>DecrypteerRequest:WS.Vhisie4.Auth.DecrypteerRequest</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim Resultaat As %Boolean = $$$False
+	
+	If (##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname) [ "hein") && (DecrypteerRequest.Ref = "") && ((DecrypteerRequest.DataOpt = "")){
+		Set ..Response.IsGeldig = 1
+		Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Hein()
+		Set ..Response.IsLoginFormulierNodig = 1
+	} ElseIf (DecrypteerRequest.Hostname = "") {
+		Set ..Response.IsGeldig = 0
+	} ElseIf ((DecrypteerRequest.Ref = "") && $$$Not(DecrypteerRequest.Header.PersonalityId = ##class(DOM.common.enu.Personality).Hein())) {
+		Set ..Response.IsGeldig = 0
+	} ElseIf (DecrypteerRequest.DataOpt = "") {
+		Set ..Response.IsContactGegevensFormulierNodig = 1
+		Set ..Response.IsGeldig = 1
+		#dim LoginParameters As WSimpl.Unishop.Login.ParametersHandel = ..LoginParameterBepaler.GeefLoginParameters(DecrypteerRequest.Ref, DecrypteerRequest.DataOpt, DecrypteerRequest.Header.Taal, DecrypteerRequest.Header.GebruikerIp)
+		Set ..Response.Taal = LoginParameters.Taal
+		Set ..Response.PersonalityId = LoginParameters.PersonalityID
+	} Else {
+		Set Resultaat = $$$True
+	}
+	
+	Quit Resultaat
+]]></Implementation>
+</Method>
+
+<Method name="ValideerHostnameMetRef">
+<FormalSpec>DecrypteerRequest:WS.Vhisie4.Auth.DecrypteerRequest,LoginParameters:WSimpl.Unishop.Login.ParametersHandel</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If $$$HasLength(DecrypteerRequest.Ref) {
+		If $$$Not(..UrlBepaler.GeefUrl(LoginParameters.PersonalityID)=DecrypteerRequest.Hostname) {
+			Do ##class(TECH.Exceptions.InvalidInputException).Throw("Url in Ref '"_..UrlBepaler.GeefUrl(LoginParameters.PersonalityID)_"' en Hostname '"_DecrypteerRequest.Hostname_"' komen niet overeen")
+		}
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VulReponseIn">
+<FormalSpec>DecrypteerRequest:WS.Vhisie4.Auth.DecrypteerRequest,LoginParameters:WSimpl.Unishop.Login.ParametersHandel</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ..Response.IsContactGegevensFormulierNodig = 0
+	Set ..Response.PersonalityId = LoginParameters.PersonalityID
+	
+	#dim KlantData As DOM.VKP.impl.HandelKlantData = ..BepaalKlantData(LoginParameters)
+	#dim HandelPersonality As DOM.common.impl.HandelPersonality = ..HandelPersonalityRepository.GeefViaID(LoginParameters.PersonalityID)
+	Set ..Response.KlantId = ##class(TECH.StringUtils).Replace(KlantData.ID,..SettingsManager.GeefVhisie4Prefix(HandelPersonality),"")
+	Set ..Response.KlantNaam = KlantData.Naam
+	If $$$HasLength(DecrypteerRequest.DataOpt) {
+		Set ..Response.GebruikerId = 1
+	}
+	Set ..Response.GebruikerNaam = ""
+	Set ..Response.Taal = LoginParameters.Taal
+	Do ..Response.ToegelatenLadetypes.Insert("LBX")
+	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
+]]></Implementation>
+</Method>
+
+<Method name="BepaalKlantData">
+<FormalSpec>LoginParameters:WSimpl.Unishop.Login.ParametersHandel</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.VKP.impl.HandelKlantData</ReturnType>
+<Implementation><![CDATA[
+	#dim KlantData As DOM.VKP.impl.HandelKlantData
+	#dim HandelPersonality As DOM.common.impl.HandelPersonality = ..HandelPersonalityRepository.GeefViaID(LoginParameters.PersonalityID)
+	
+	If (LoginParameters.KlantID = "") {
+		Set KlantData = ..GeefHandelKlantDataVoorDecrypteer(LoginParameters)
+		Set KlantData.ID = ..SettingsManager.GeefVhisie4Prefix(HandelPersonality)_..WebshopSessionService.GeefVolgendeKlantID(HandelPersonality.GeefID())
+	} Else {
+		If ##class(TECH.StringUtils).Contains(LoginParameters.KlantID,"_") {
+			Set KlantData = ..HandelKlantDataRepository.GeefViaID(LoginParameters.KlantID)
+		} Else {
+			Set KlantData = ..HandelKlantDataRepository.GeefViaID(..SettingsManager.GeefVhisie4Prefix(HandelPersonality)_LoginParameters.KlantID)
+		}
+	}
+	
+	Quit KlantData
+]]></Implementation>
+</Method>
+
+<Method name="GeefHandelKlantDataVoorDecrypteer">
+<FormalSpec>LoginParameters:WSimpl.Unishop.Login.ParametersHandel</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.common.dto.HandelKlantData</ReturnType>
+<Implementation><![CDATA[
+	#dim HandelLoginParameters As WSimpl.Unishop.Login.ParametersHandel = LoginParameters	
+	Set KlantData = ##class(DOM.common.dto.HandelKlantData).%New()
+	Set KlantData.Naam = HandelLoginParameters.KlantNaam
+	Set KlantData.ID = LoginParameters.KlantID
+	Set KlantData.Taal = HandelLoginParameters.Taal
+	Set KlantData.EmailAdres = HandelLoginParameters.EmailAdres
+	Set KlantData.FaxNummer = HandelLoginParameters.FaxNummer
+	Set KlantData.Gemeente = HandelLoginParameters.Gemeente
+	Set KlantData.Postcode = HandelLoginParameters.Postcode
+	Set KlantData.StraatEnNr = HandelLoginParameters.StraatEnNr
+	Set KlantData.TelefoonNummer = HandelLoginParameters.TelefoonNummer
+	
+	Quit KlantData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml
===================================================================
diff -u -r45475 -r45479
--- WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 45475)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 45479)
@@ -8,16 +8,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="Logger">
-<Type>vhLib.Logger</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="VerkoopAPI">
-<Type>DOM.VKP.VerkoopAPI</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="HandelPersonalityRepository">
 <Type>DOM.common.impl.HandelPersonalityRepository</Type>
 <Private>1</Private>
@@ -48,39 +38,25 @@
 <Private>1</Private>
 </Property>
 
-<Property name="Response">
-<Type>WS.Vhisie4.Auth.DecrypteerResponse</Type>
-<Private>1</Private>
-</Property>
-
-<Property name="UrlBepaler">
-<Type>APPS.EC.Webshop.UrlBepaler</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="KlantSessieDataBepaler">
 <Type>APPS.EC.KlantSessieDataBepaler</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>LoginParameterBepaler:WSimpl.Unishop.Login.ParameterBepaler,Logger:vhLib.Logger,HandelKlantDataRepository:DOM.VKP.impl.HandelKlantDataRepository,HandelPersonalityRepository:DOM.common.impl.HandelPersonalityRepository,WebshopSessionService:APPS.EC.WebshopSessionService,KlantDataBewaarder:APPS.VKP.KlantDataBewaarder,SettingsManager:WSimpl.Vhisie4.SettingsManager,LoginKortingBewaarder:WSimpl.Unishop.Login.KortingBewaarder,UrlBepaler:APPS.EC.Webshop.UrlBepaler,KlantSessieDataBepaler:APPS.EC.KlantSessieDataBepaler</FormalSpec>
+<FormalSpec>LoginParameterBepaler:WSimpl.Unishop.Login.ParameterBepaler,HandelKlantDataRepository:DOM.VKP.impl.HandelKlantDataRepository,HandelPersonalityRepository:DOM.common.impl.HandelPersonalityRepository,WebshopSessionService:APPS.EC.WebshopSessionService,KlantDataBewaarder:APPS.VKP.KlantDataBewaarder,SettingsManager:WSimpl.Vhisie4.SettingsManager,LoginKortingBewaarder:WSimpl.Unishop.Login.KortingBewaarder,KlantSessieDataBepaler:APPS.EC.KlantSessieDataBepaler</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())
-	Set ..VerkoopAPI = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()
 	Set ..HandelPersonalityRepository = $$$Inject(HandelPersonalityRepository,##class(DOM.common.impl.HandelPersonalityRepository).%New())
 	Set ..HandelKlantDataRepository = $$$Inject(HandelKlantDataRepository,##class(DOM.VKP.impl.HandelKlantDataRepository).%New())
 	Set ..WebshopSessionService = $$$Inject(WebshopSessionService,##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWebshopSessionService())
 	Set ..KlantDataBewaarder = $$$Inject(KlantDataBewaarder,##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI().GeefKlantDataBewaarder())
 	Set ..SettingsManager = $$$Inject(SettingsManager,##class(WSimpl.Vhisie4.SettingsManager).%New())
 	Set ..KortingBewaarder = $$$Inject(LoginKortingBewaarder,##class(WSimpl.Unishop.Login.KortingBewaarder).%New())
-	Set ..Response = ##class(WS.Vhisie4.Auth.DecrypteerResponse).%New()
-	Set ..UrlBepaler = $$$Inject(UrlBepaler,##class(APPS.EC.Webshop.impl.UrlBepaler).%New())
 	Set ..KlantSessieDataBepaler = $$$Inject(KlantSessieDataBepaler,##class(APPS.EC.impl.KlantSessieDataBepaler).%New())
 	
 	Quit $$$OK
@@ -90,119 +66,10 @@
 <Method name="Decrypteer">
 <FormalSpec>DecrypteerRequest:WS.Vhisie4.Auth.DecrypteerRequest</FormalSpec>
 <ReturnType>WS.Vhisie4.Auth.DecrypteerResponse</ReturnType>
-<Implementation><![CDATA[
-	If ..VerwerkRefEnDataOptZonderProblemen(DecrypteerRequest) {
-		Try {
-			#dim LoginParameters As WSimpl.Unishop.Login.ParametersHandel = ..LoginParameterBepaler.GeefLoginParameters(DecrypteerRequest.Ref, DecrypteerRequest.DataOpt, DecrypteerRequest.Header.Taal, DecrypteerRequest.Header.GebruikerIp)
-			
-			Do ..ValideerHostnameMetRef(DecrypteerRequest, LoginParameters)
-			
-			Do ..KortingBewaarder.BewaarMeegegevenKorting(DecrypteerRequest.Ref,DecrypteerRequest.DataOpt)
-			Do ..VulReponseIn(DecrypteerRequest, LoginParameters)
-			
-		} 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
-		}
-	}
-
-	Quit ..Response
+<Implementation><![CDATA[	Quit ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).Decrypteer(DecrypteerRequest)
 ]]></Implementation>
 </Method>
 
-<Method name="ValideerHostnameMetRef">
-<FormalSpec>DecrypteerRequest:WS.Vhisie4.Auth.DecrypteerRequest,LoginParameters:WSimpl.Unishop.Login.ParametersHandel</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	If $$$HasLength(DecrypteerRequest.Ref) {
-		If $$$Not(..UrlBepaler.GeefUrl(LoginParameters.PersonalityID)=DecrypteerRequest.Hostname) {
-			Do ##class(TECH.Exceptions.InvalidInputException).Throw("Url in Ref '"_..UrlBepaler.GeefUrl(LoginParameters.PersonalityID)_"' en Hostname '"_DecrypteerRequest.Hostname_"' komen niet overeen")
-		}
-	}
-]]></Implementation>
-</Method>
-
-<Method name="VulReponseIn">
-<FormalSpec>DecrypteerRequest:WS.Vhisie4.Auth.DecrypteerRequest,LoginParameters:WSimpl.Unishop.Login.ParametersHandel</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	Set ..Response.IsContactGegevensFormulierNodig = 0
-	Set ..Response.PersonalityId = LoginParameters.PersonalityID
-	
-	#dim KlantData As DOM.VKP.impl.HandelKlantData = ..BepaalKlantData(LoginParameters)
-	#dim HandelPersonality As DOM.common.impl.HandelPersonality = ..HandelPersonalityRepository.GeefViaID(LoginParameters.PersonalityID)
-	Set ..Response.KlantId = ##class(TECH.StringUtils).Replace(KlantData.ID,..SettingsManager.GeefVhisie4Prefix(HandelPersonality),"")
-	Set ..Response.KlantNaam = KlantData.Naam
-	If $$$HasLength(DecrypteerRequest.DataOpt) {
-		Set ..Response.GebruikerId = 1
-	}
-	Set ..Response.GebruikerNaam = ""
-	Set ..Response.Taal = LoginParameters.Taal
-	Do ..Response.ToegelatenLadetypes.Insert("LBX")
-	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
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkRefEnDataOptZonderProblemen">
-<FormalSpec>DecrypteerRequest:WS.Vhisie4.Auth.DecrypteerRequest</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	#dim Resultaat As %Boolean = $$$False
-	
-	If (##class(TECH.StringUtils).ToLower(DecrypteerRequest.Hostname) [ "hein") && (DecrypteerRequest.Ref = "") && ((DecrypteerRequest.DataOpt = "")){
-		Set ..Response.IsGeldig = 1
-		Set ..Response.PersonalityId = ##class(DOM.common.enu.Personality).Hein()
-		Set ..Response.IsLoginFormulierNodig = 1
-	} ElseIf (DecrypteerRequest.Hostname = "") {
-		Set ..Response.IsGeldig = 0
-	} ElseIf ((DecrypteerRequest.Ref = "") && $$$Not(DecrypteerRequest.Header.PersonalityId = ##class(DOM.common.enu.Personality).Hein())) {
-		Set ..Response.IsGeldig = 0
-	} ElseIf (DecrypteerRequest.DataOpt = "") {
-		Set ..Response.IsContactGegevensFormulierNodig = 1
-		Set ..Response.IsGeldig = 1
-		#dim LoginParameters As WSimpl.Unishop.Login.ParametersHandel = ..LoginParameterBepaler.GeefLoginParameters(DecrypteerRequest.Ref, DecrypteerRequest.DataOpt, DecrypteerRequest.Header.Taal, DecrypteerRequest.Header.GebruikerIp)
-		Set ..Response.Taal = LoginParameters.Taal
-		Set ..Response.PersonalityId = LoginParameters.PersonalityID
-	} Else {
-		Set Resultaat = $$$True
-	}
-	
-	Quit Resultaat
-]]></Implementation>
-</Method>
-
-<Method name="BepaalKlantData">
-<FormalSpec>LoginParameters:WSimpl.Unishop.Login.ParametersHandel</FormalSpec>
-<Private>1</Private>
-<ReturnType>DOM.VKP.impl.HandelKlantData</ReturnType>
-<Implementation><![CDATA[
-	#dim KlantData As DOM.VKP.impl.HandelKlantData
-	#dim HandelPersonality As DOM.common.impl.HandelPersonality = ..HandelPersonalityRepository.GeefViaID(LoginParameters.PersonalityID)
-	
-	If (LoginParameters.KlantID = "") {
-		Set KlantData = ..GeefHandelKlantDataVoorDecrypteer(LoginParameters)
-		Set KlantData.ID = ..SettingsManager.GeefVhisie4Prefix(HandelPersonality)_..WebshopSessionService.GeefVolgendeKlantID(HandelPersonality.GeefID())
-	} Else {
-		If ##class(TECH.StringUtils).Contains(LoginParameters.KlantID,"_") {
-			Set KlantData = ..HandelKlantDataRepository.GeefViaID(LoginParameters.KlantID)
-		} Else {
-			Set KlantData = ..HandelKlantDataRepository.GeefViaID(..SettingsManager.GeefVhisie4Prefix(HandelPersonality)_LoginParameters.KlantID)
-		}
-	}
-	
-	Quit KlantData
-]]></Implementation>
-</Method>
-
 <Method name="RegistreerContactGegevens">
 <FormalSpec>RegistreerContactGegevensRequest:WS.Vhisie4.Auth.RegistreerContactGegevensRequest</FormalSpec>
 <ReturnType>WS.Vhisie4.Auth.RegistreerContactGegevensResponse</ReturnType>