Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml
===================================================================
diff -u -r45704 -r45880
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 45704)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/Decrypteer/Test.cls.xml	(.../Test.cls.xml)	(revision 45880)
@@ -33,11 +33,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="SettingsManagerDummy">
-<Type>vhTest.Dummy.WSimpl.Vhisie4.SettingsManager</Type>
-<Private>1</Private>
-</Property>
-
 <Property name="HandelKlantDataRepositoryDummy">
 <Type>vhTest.Dummy.DOM.VKP.impl.HandelKlantDataRepository</Type>
 <Private>1</Private>
@@ -72,8 +67,6 @@
 	
 	Set ..KortingBewaarderDummy = ##class(vhTest.Dummy.WSimpl.Unishop.Login.KortingBewaarder).%New()
 	
-	Set ..SettingsManagerDummy = ##class(vhTest.Dummy.WSimpl.Vhisie4.SettingsManager).%New()
-	
 	Set ..HandelPersonalityRepositoryDummy = ##class(vhTest.Dummy.DOM.common.impl.HandelPersonalityRepository).%New()
 ]]></Implementation>
 </Method>
@@ -94,16 +87,13 @@
 	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
 	Do HandelPersonalityRepositoryStub.VerwachtMethodCall("GeefViaID",..DecrypteerRequestStub.Header.PersonalityId).DanReturn(HandelPersonalityStub)
 	
-	Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
-	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro_")
-	
 	Set KortingBewaarderMock = ##class(vhTest.Mock.WSimpl.Unishop.Login.KortingBewaarder).%New()
 	Do KortingBewaarderMock.VerwachtMethodCall("BewaarMeegegevenKorting",..DecrypteerRequestStub.Ref,..DecrypteerRequestStub.DataOpt).ExactAantalKeer(1)
 	
 	Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantData)
+	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",HandelPersonalityStub.GeefPrefix()_..LoginParameters.KlantID).DanReturn(..KlantData)
 		
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,KortingBewaarderMock,..UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,KortingBewaarderMock,..UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -200,13 +190,10 @@
 	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
 	Do HandelPersonalityRepositoryStub.VerwachtMethodCall("GeefViaID",##class(DOM.common.enu.Personality).Destil()).DanReturn(HandelPersonalityStub)
 	
-	Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
-	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("destil_")
-
 	Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantData)
+	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",HandelPersonalityStub.GeefPrefix()_..LoginParameters.KlantID).DanReturn(..KlantData)
 		
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,..KortingBewaarderDummy,..UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -237,13 +224,10 @@
 	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
 	Do HandelPersonalityRepositoryStub.VerwachtMethodCall("GeefViaID",##class(DOM.common.enu.Personality).Kisch()).DanReturn(HandelPersonalityStub)
 	
-	Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
-	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("kisch_")
-
 	Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantData)
+	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",HandelPersonalityStub.GeefPrefix()_..LoginParameters.KlantID).DanReturn(..KlantData)
 		
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,..KortingBewaarderDummy,..UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -274,13 +258,10 @@
 	Set HandelPersonalityRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()	
 	Do HandelPersonalityRepositoryStub.VerwachtMethodCall("GeefViaID",##class(DOM.common.enu.Personality).Daro()).DanReturn(HandelPersonalityStub)
 	
-	Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
-	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro_")
-
 	Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn(..KlantData)
+	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",HandelPersonalityStub.GeefPrefix()_..LoginParameters.KlantID).DanReturn(..KlantData)
 		
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerMock,HandelKlantDataRepositoryStub,HandelPersonalityRepositoryStub,..WebshopSessionServiceDummy,..KortingBewaarderDummy,..UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -306,13 +287,10 @@
 				
 	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantData)
 	
-	Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
-	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro")
-
 	Set HandelKlantDataRepositoryStub = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
-	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",SettingsManagerStub.GeefVhisie4Prefix(HandelPersonalityStub)_..LoginParameters.KlantID).DanReturn("")
+	Do HandelKlantDataRepositoryStub.IndienMethodCall("GeefViaID",HandelPersonalityStub.GeefPrefix()_..LoginParameters.KlantID).DanReturn("")
 		
-	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,HandelKlantDataRepositoryStub,..HandelPersonalityRepositoryDummy,..WebshopSessionServiceDummy,,..KortingBewaarderDummy,..UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,HandelKlantDataRepositoryStub,..HandelPersonalityRepositoryDummy,..WebshopSessionServiceDummy,..KortingBewaarderDummy,..UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 		
@@ -334,16 +312,13 @@
 
 	Do HandelPersonalityStub.IndienMethodCall("Accept",HandelPersonalityStub).DanReturn(..KlantData)
 
-	Set SettingsManagerStub = ##class(vhTest.Mock.WSimpl.Vhisie4.SettingsManager).%New()
-	Do SettingsManagerStub.IndienMethodCall("GeefVhisie4Prefix",HandelPersonalityStub).DanReturn("daro_")
-
 	Set WebshopSessionService = ##class(vhTest.Mock.APPS.EC.WebshopSessionService).%New()
 	Do WebshopSessionService.IndienMethodCall("GeefVolgendeKlantID",##class(DOM.common.enu.Personality).Daro()).DanReturn("42")
 
 	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,..HandelKlantDataRepositoryDummy,HandelPersonalityRepositoryStub,WebshopSessionService,SettingsManagerStub,..KortingBewaarderDummy,..UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,..HandelKlantDataRepositoryDummy,HandelPersonalityRepositoryStub,WebshopSessionService,..KortingBewaarderDummy,..UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -363,7 +338,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,..HandelKlantDataRepositoryDummy,..HandelPersonalityRepositoryDummy,..WebshopSessionServiceDummy,..SettingsManagerDummy,..KortingBewaarderDummy,..UrlBepalerStub)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,..HandelKlantDataRepositoryDummy,..HandelPersonalityRepositoryDummy,..WebshopSessionServiceDummy,..KortingBewaarderDummy,..UrlBepalerStub)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
@@ -386,7 +361,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,..HandelKlantDataRepositoryDummy,..HandelPersonalityRepositoryDummy,..WebshopSessionServiceDummy,..SettingsManagerDummy,..KortingBewaarderDummy,UrlBepalerMock)
+	Set Decrypteerder = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder).%New(LoginParameterBepalerStub,..HandelKlantDataRepositoryDummy,..HandelPersonalityRepositoryDummy,..WebshopSessionServiceDummy,..KortingBewaarderDummy,UrlBepalerMock)
 	
 	#dim Response As WS.Vhisie4.Auth.DecrypteerResponse = Decrypteerder.Decrypteer(..DecrypteerRequestStub)
 	
Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml
===================================================================
diff -u -r45633 -r45880
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 45633)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder.cls.xml	(.../Decrypteerder.cls.xml)	(revision 45880)
@@ -28,11 +28,6 @@
 <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>
@@ -44,7 +39,7 @@
 </Property>
 
 <Method name="%OnNew">
-<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>
+<FormalSpec>LoginParameterBepaler:WSimpl.Unishop.Login.ParameterBepaler,HandelKlantDataRepository:DOM.VKP.impl.HandelKlantDataRepository,HandelPersonalityRepository:DOM.common.impl.HandelPersonalityRepository,WebshopSessionService:APPS.EC.WebshopSessionService,LoginKortingBewaarder:WSimpl.Unishop.Login.KortingBewaarder,UrlBepaler:APPS.EC.Webshop.UrlBepaler</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -54,7 +49,6 @@
 	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())
-	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())
 	
@@ -137,7 +131,7 @@
 	
 	#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.KlantId = ##class(TECH.StringUtils).Replace(KlantData.ID,HandelPersonality.GeefPrefix(),"")
 	Set ..Response.KlantNaam = KlantData.Naam
 	If $$$HasLength(DecrypteerRequest.DataOpt) {
 		Set ..Response.GebruikerId = 1
@@ -166,12 +160,12 @@
 	
 	If (LoginParameters.KlantID = "") {
 		Set KlantData = ..GeefHandelKlantDataVoorDecrypteer(LoginParameters)
-		Set KlantData.ID = ..SettingsManager.GeefVhisie4Prefix(HandelPersonality)_..WebshopSessionService.GeefVolgendeKlantID(HandelPersonality.GeefID())
+		Set KlantData.ID = HandelPersonality.GeefPrefix()_..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)
+			Set KlantData = ..HandelKlantDataRepository.GeefViaID(HandelPersonality.GeefPrefix()_LoginParameters.KlantID)
 		}
 	}