Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml
===================================================================
diff -u -r45481 -r45577
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 45481)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 45577)
@@ -57,13 +57,13 @@
 <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 ..HandelKlantDataRepository = $$$Inject(HandelKlantDataRepository,##class(DOM.VKP.impl.HandelKlantDataRepository).%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())
+	Set ..SettingsManager = $$$Inject(SettingsManager,##class(WSimpl.Vhisie4.SettingsManager).%New())
+	Set ..KortingBewaarder = $$$Inject(LoginKortingBewaarder,##class(WSimpl.Unishop.Login.KortingBewaarder).%New())
+	Set ..UrlBepaler = $$$Inject(UrlBepaler,##class(APPS.EC.Webshop.impl.UrlBepaler).%New())
+	Set ..Response = ##class(WS.Vhisie4.Auth.DecrypteerResponse).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml
===================================================================
diff -u -r45479 -r45577
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 45479)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 45577)
@@ -48,6 +48,8 @@
 	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
 	Do HandelPersonalityRepositoryStub.VerwachtMethodCall("GeefViaID",..DecrypteerRequestStub.Header.PersonalityId).DanReturn(HandelPersonalityStub)
 	
+	Set WebshopSessionServiceDummy = ##class(vhTest.Dummy.APPS.EC.WebshopSessionService).%New()
+	
 	Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
 	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro_")
 	
@@ -60,7 +62,7 @@
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,HandelPersonalityRepositoryStub,,SettingsManagerStub,KortingBewaarderMock,UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,HandelPersonalityRepositoryStub,WebshopSessionServiceDummy,SettingsManagerStub,KortingBewaarderMock,UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -158,16 +160,20 @@
 		
 	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(KlantDataDummy)
 	
+	Set WebshopSessionServiceDummy = ##class(vhTest.Dummy.APPS.EC.WebshopSessionService).%New()
+	
 	Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
 	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("destil_")
 
 	Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
 	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(KlantDataDummy)
 		
+	Set KortingBewaarderDummy = ##class(vhTest.Dummy.WSimpl.Unishop.Login.KortingBewaarder).%New()
+
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,,,,UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,WebshopSessionServiceDummy,,KortingBewaarderDummy,UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -195,6 +201,8 @@
 	Set KlantDataDummy = ##class(DOM.common.dto.KlantData).%New()
 	Set KlantDataDummy.ID = "5"
 	Set KlantDataDummy.Naam = $$$DummyString
+	
+	Set WebshopSessionServiceDummy = ##class(vhTest.Dummy.APPS.EC.WebshopSessionService).%New()
 		
 	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(KlantDataDummy)
 	
@@ -203,11 +211,13 @@
 
 	Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
 	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(KlantDataDummy)
+	
+	Set KortingBewaarderDummy = ##class(vhTest.Dummy.WSimpl.Unishop.Login.KortingBewaarder).%New()
 		
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,,,,UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,WebshopSessionServiceDummy,,KortingBewaarderDummy,UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -235,6 +245,8 @@
 	Set KlantDataDummy = ##class(DOM.common.dto.KlantData).%New()
 	Set KlantDataDummy.ID = "5"
 	Set KlantDataDummy.Naam = $$$DummyString
+	
+	Set WebshopSessionServiceDummy = ##class(vhTest.Dummy.APPS.EC.WebshopSessionService).%New()
 		
 	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(KlantDataDummy)
 	
@@ -247,7 +259,9 @@
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,,,,UrlBepalerStub)
+	Set KortingBewaarderDummy = ##class(vhTest.Dummy.WSimpl.Unishop.Login.KortingBewaarder).%New()
+
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,WebshopSessionServiceDummy,,KortingBewaarderDummy,UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -278,6 +292,8 @@
 	Set KlantDataDummy = ##class(DOM.common.dto.KlantData).%New()
 	Set KlantDataDummy.ID = "5"
 	Set KlantDataDummy.Naam = $$$DummyString
+	
+	Set WebshopSessionServiceDummy = ##class(vhTest.Dummy.APPS.EC.WebshopSessionService).%New()
 		
 	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(KlantDataDummy)
 	
@@ -290,7 +306,9 @@
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub, LoggerMock,HandelKlantDataRepository,,,,,UrlBepalerStub)
+	Set KortingBewaarderDummy = ##class(vhTest.Dummy.WSimpl.Unishop.Login.KortingBewaarder).%New()
+
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub, LoggerMock,HandelKlantDataRepository,,WebshopSessionServiceDummy,,KortingBewaarderDummy,UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 		
@@ -328,7 +346,9 @@
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl",$$$ElkeWaarde).DanReturn("example.com")
 
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,HandelPersonalityRepositoryStub,WebshopSessionService,SettingsManagerStub,,UrlBepalerStub)
+	Set KortingBewaarderDummy = ##class(vhTest.Dummy.WSimpl.Unishop.Login.KortingBewaarder).%New()
+
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,HandelPersonalityRepositoryStub,WebshopSessionService,SettingsManagerStub,KortingBewaarderDummy,UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -347,11 +367,15 @@
 	
 	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 WebshopSessionServiceDummy = ##class(vhTest.Dummy.APPS.EC.WebshopSessionService).%New()
 
 	Set UrlBepalerStub = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerStub.IndienMethodCall("GeefUrl","10").DanReturn("darotest.taorbox.com")
 	
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,,,,,UrlBepalerStub)
+	Set KortingBewaarderDummy = ##class(vhTest.Dummy.WSimpl.Unishop.Login.KortingBewaarder).%New()
+
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,,WebshopSessionServiceDummy,,KortingBewaarderDummy,UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -370,11 +394,15 @@
 	
 	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 WebshopSessionServiceDummy = ##class(vhTest.Dummy.APPS.EC.WebshopSessionService).%New()
 
 	Set UrlBepalerMock = ##class(vhTest.Mock.APPS.EC.Webshop.UrlBepaler).%New()
 	Do UrlBepalerMock.VerwachtMethodCall("GeefUrl","10").DanReturn("darotest.taorbox.com").ExactAantalKeer(0)
 	
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,,,,,UrlBepalerMock)
+	Set KortingBewaarderDummy = ##class(vhTest.Dummy.WSimpl.Unishop.Login.KortingBewaarder).%New()
+
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,,WebshopSessionServiceDummy,,KortingBewaarderDummy,UrlBepalerMock)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)