Index: WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml
===================================================================
diff -u -r45326 -r45366
--- WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 45326)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(.../HandelAuthenticator.cls.xml)	(revision 45366)
@@ -48,6 +48,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Response">
+<Type>WS.Vhisie4.Auth.DecrypteerResponse</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</FormalSpec>
 <Private>1</Private>
@@ -64,6 +69,7 @@
 	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()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -73,71 +79,97 @@
 <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()
-	#dim LoginParameters As WSimpl.Unishop.Login.ParametersHandel
-	
-	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 = "") {
-		Set Response.IsGeldig = 0
-	} ElseIf (DecrypteerRequest.DataOpt = "") {
-		Set Response.IsContactGegevensFormulierNodig = 1
-		Set Response.IsGeldig = 1
-		Set LoginParameters = ..LoginParameterBepaler.GeefLoginParameters(DecrypteerRequest.Ref, DecrypteerRequest.DataOpt, DecrypteerRequest.Header.Taal, DecrypteerRequest.Header.GebruikerIp)
-		Set Response.Taal = LoginParameters.Taal
-		Set Response.PersonalityId = LoginParameters.PersonalityID
-	} Else {
+	If ..VerwerkRefEnDataOptZonderProblemen(DecrypteerRequest) {
 		Try {
-			Set LoginParameters = ..LoginParameterBepaler.GeefLoginParameters(DecrypteerRequest.Ref, DecrypteerRequest.DataOpt, DecrypteerRequest.Header.Taal, DecrypteerRequest.Header.GebruikerIp)
-			#dim HandelPersonality As DOM.common.impl.HandelPersonality = ..HandelPersonalityRepository.GeefViaID(LoginParameters.PersonalityID)
-			#dim KlantData As DOM.common.dto.HandelKlantData
-			
-			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)
-				}
-			}
+			#dim LoginParameters As WSimpl.Unishop.Login.ParametersHandel = ..LoginParameterBepaler.GeefLoginParameters(DecrypteerRequest.Ref, DecrypteerRequest.DataOpt, DecrypteerRequest.Header.Taal, DecrypteerRequest.Header.GebruikerIp)
+			#dim KlantData As DOM.VKP.impl.HandelKlantData = ..BepaalKlantData(LoginParameters)
+
+
  			Do ..KortingBewaarder.BewaarMeegegevenKorting(DecrypteerRequest.Ref,DecrypteerRequest.DataOpt)
 			
-			Set Response.IsContactGegevensFormulierNodig = 0
-			Set Response.PersonalityId = LoginParameters.PersonalityID
+			Set ..Response.IsContactGegevensFormulierNodig = 0
+			Set ..Response.PersonalityId = LoginParameters.PersonalityID
 			
-			Set Response.KlantId = ##class(TECH.StringUtils).Replace(KlantData.ID,..SettingsManager.GeefVhisie4Prefix(HandelPersonality),"")
-			Set Response.KlantNaam = KlantData.Naam
+			#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.GebruikerId = 1
 			}
-			Set Response.GebruikerNaam = ""
-			Set Response.Taal = LoginParameters.Taal
-			Do Response.ToegelatenLadetypes.Insert("LBX")
+			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")
+				Do ..Response.ToegelatenLadetypes.Insert("TAX")
 			}
 			If $$$Not(LoginParameters.PersonalityID = ##class(DOM.common.enu.Personality).Daro()) {
-				Do Response.ToegelatenLadetypes.Insert("TBX")
+				Do ..Response.ToegelatenLadetypes.Insert("TBX")
 			}
 			
-			Set Response.IsGeldig = 1
+			Set ..Response.IsGeldig = 1
 		} 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
+			Set ..Response.IsGeldig = 0
 		}
 	}
 
-	Quit Response
+	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 = "") {
+		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>