Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml
===================================================================
diff -u -r45584 -r45585
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 45584)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 45585)
@@ -91,7 +91,7 @@
 	Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
 	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy)
 		
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,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)
 	
@@ -194,7 +194,7 @@
 	Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
 	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy)
 		
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepository,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -231,7 +231,7 @@
 	Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
 	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy)
 		
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepository,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -265,7 +265,7 @@
 	Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
 	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantDataDummy)
 		
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,,HandelKlantDataRepository,,..WebshopSessionServiceDummy,,..KortingBewaarderDummy,..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)
 	
@@ -284,9 +284,6 @@
 	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 HandelPersonalityStub = ##class(vhTest.Mock.DOM.common.impl.HandelPersonality).%New(##class(DOM.common.enu.Personality).Daro(),$$$DummyInteger)
 
 	Set HandelPersonalityStub = ##class(vhTest.Mock.DOM.common.impl.HandelPersonality).%New(##class(DOM.common.enu.Personality).Daro(),$$$DummyInteger)
@@ -301,13 +298,11 @@
 	Set HandelKlantDataRepository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
 	Do HandelKlantDataRepository.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn("")
 		
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub, LoggerMock,HandelKlantDataRepository,,..WebshopSessionServiceDummy,,..KortingBewaarderDummy,..UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,HandelKlantDataRepository,,..WebshopSessionServiceDummy,,..KortingBewaarderDummy,..UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 		
 	Do $$$AssertEquals(Response.IsGeldig,"0")
-	
-	Do LoggerMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -334,7 +329,7 @@
 	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
 	Do HandelPersonalityRepositoryStub.IndienMethodCall("GeefViaID", ##class(DOM.common.enu.Personality).Daro()).DanReturn(HandelPersonalityStub)
 	
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,HandelPersonalityRepositoryStub,WebshopSessionService,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub)
+	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)
 	
@@ -354,7 +349,7 @@
 	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 Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,,..WebshopSessionServiceDummy,..SettingsManagerDummy,..KortingBewaarderDummy,..UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,..WebshopSessionServiceDummy,..SettingsManagerDummy,..KortingBewaarderDummy,..UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -377,7 +372,7 @@
 	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,,,,..WebshopSessionServiceDummy,..SettingsManagerDummy,..KortingBewaarderDummy,UrlBepalerMock)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,,,..WebshopSessionServiceDummy,..SettingsManagerDummy,..KortingBewaarderDummy,UrlBepalerMock)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml
===================================================================
diff -u -r45577 -r45585
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 45577)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 45585)
@@ -8,11 +8,6 @@
 <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>
@@ -49,14 +44,13 @@
 </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>
+<FormalSpec>LoginParameterBepaler:WSimpl.Unishop.Login.ParameterBepaler,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 ..HandelKlantDataRepository = $$$Inject(HandelKlantDataRepository,##class(DOM.VKP.impl.HandelKlantDataRepository).%New())
 	Set ..HandelPersonalityRepository = $$$Inject(HandelPersonalityRepository,##class(DOM.common.impl.HandelPersonalityRepository).%New())
 	Set ..WebshopSessionService = $$$Inject(WebshopSessionService,##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefWebshopSessionService())
@@ -84,7 +78,7 @@
 			
 		} Catch {
 			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-			Do ..Logger.Error(..%ClassName()_" Decrypteer","Failed : "_$C(13,10)_Exception.ToString())
+			Do ##class(vhLib.Logger).%New().Error(..%ClassName()_" Decrypteer","Failed : "_$C(13,10)_Exception.ToString())
 			Set ..Response.IsGeldig = 0
 		}
 	}