Index: WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml
===================================================================
diff -u
--- WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(revision 0)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator.cls.xml	(revision 41184)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.Vhisie4.Auth.HandelAuthenticator">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="Decrypteer">
+<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()
+	
+	If ("" = DecrypteerRequest.Hostname) {
+		Set Response.IsGeldig = 0
+	} ElseIf ("" = DecrypteerRequest.Ref) {
+		Set Response.IsGeldig = 0
+	} ElseIf (")àç!HEIN)àç!" = DecrypteerRequest.Ref) {
+		If ("" = DecrypteerRequest.DataOpt) {
+			Set Response.IsGeldig = 0
+		} ElseIf ("ongeldigeDataOpt" = DecrypteerRequest.DataOpt) {
+			Set Response.IsGeldig = 0
+		} Else {
+			Set Response.IsGeldig = 1
+			Set Response.GebruikerId = "1"
+			Set Response.GebruikerNaam = ""
+			Set Response.IsContactGegevensFormulierNodig = 0
+			Set Response.KlantId = "hein_" _ DecrypteerRequest.DataOpt
+			Set Response.KlantNaam =  "hein_" _ DecrypteerRequest.DataOpt
+			Set Response.PersonalityId = 11
+			Set Response.Taal = "D"
+			Do Response.ToegelatenLadetypes.Insert("LBX")
+			Do Response.ToegelatenLadetypes.Insert("TAX")
+			Do Response.ToegelatenLadetypes.Insert("TBX")
+		}
+	} ElseIf (")àç!DU-PONT)àç!" = DecrypteerRequest.Ref) {
+		If ("" = DecrypteerRequest.DataOpt) {
+			Set Response.IsGeldig = 1
+			Set Response.IsContactGegevensFormulierNodig = 1
+		} ElseIf ("ongeldigeDataOpt" = DecrypteerRequest.DataOpt) {
+			Set Response.IsGeldig = 0
+		} Else {
+			Set Response.IsGeldig = 1
+			Set Response.GebruikerId = "1"
+			Set Response.GebruikerNaam = ""
+			Set Response.IsContactGegevensFormulierNodig = 0
+			Set Response.KlantId = "1234"
+			Set Response.KlantNaam =  "dupont_" _ DecrypteerRequest.DataOpt
+			Set Response.PersonalityId = 4
+			Set Response.Taal = "N"
+			Do Response.ToegelatenLadetypes.Insert("LBX")
+		}
+	} Else {
+		Set Response.IsGeldig = 0
+	}
+
+	Quit Response
+]]></Implementation>
+</Method>
+
+<Method name="RegistreerContactGegevens">
+<FormalSpec>RegistreerContactGegevensRequest:WS.Vhisie4.Auth.RegistreerContactGegevensRequest</FormalSpec>
+<ReturnType>WS.Vhisie4.Auth.RegistreerContactGegevensResponse</ReturnType>
+<Implementation><![CDATA[
+	#Dim Response As WS.Vhisie4.Auth.RegistreerContactGegevensResponse = ##class(WS.Vhisie4.Auth.RegistreerContactGegevensResponse).%New()
+	
+	If ("" = RegistreerContactGegevensRequest.Ref) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ref is verplicht"))
+	} ElseIf ("" = RegistreerContactGegevensRequest.Naam) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Naam is verplicht"))
+	} ElseIf ("" = RegistreerContactGegevensRequest.EmailAdres) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("EmailAdres is verplicht"))
+	} Else {
+
+		Set Response.GebruikerId = "1"
+		Set Response.GebruikerNaam = ""
+		Set Response.KlantId = "1234"
+		Set Response.KlantNaam = "dupont_" _ RegistreerContactGegevensRequest.Naam
+		Set Response.DataOpt = ##class(vhPowerTools.APPS.EC.KlantSessieDataGeneratorUnishop).%New().GenereerDataOpt("DUPO",Response.KlantId,Response.KlantNaam,Response.GebruikerId)
+
+	}
+	
+	Quit Response
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WS/Vhisie4/Auth/HandelAuthenticatieService.cls.xml
===================================================================
diff -u -r41139 -r41184
--- WS/Vhisie4/Auth/HandelAuthenticatieService.cls.xml	(.../HandelAuthenticatieService.cls.xml)	(revision 41139)
+++ WS/Vhisie4/Auth/HandelAuthenticatieService.cls.xml	(.../HandelAuthenticatieService.cls.xml)	(revision 41184)
@@ -5,6 +5,11 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>WS.OngeauthenticeerdeWebService</Super>
 
+<Property name="HandelAuthenticator">
+<Type>WSimpl.Vhisie4.Auth.HandelAuthenticator</Type>
+<Private>1</Private>
+</Property>
+
 <Parameter name="SERVICENAME">
 <Default>HandelAuthenticatieService</Default>
 </Parameter>
@@ -18,7 +23,9 @@
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
-<Implementation><![CDATA[	Quit $$$OK
+<Implementation><![CDATA[
+	Set ..HandelAuthenticator = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator).%New()
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
@@ -28,53 +35,7 @@
 <FormalSpec>DecrypteerRequest:WS.Vhisie4.Auth.DecrypteerRequest</FormalSpec>
 <ReturnType>WS.Vhisie4.Auth.DecrypteerResponse</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[
-	#Dim Response As WS.Vhisie4.Auth.DecrypteerResponse = ##class(WS.Vhisie4.Auth.DecrypteerResponse).%New()
-	
-	If ("" = DecrypteerRequest.Hostname) {
-		Set Response.IsGeldig = 0
-	} ElseIf ("" = DecrypteerRequest.Ref) {
-		Set Response.IsGeldig = 0
-	} ElseIf (")àç!HEIN)àç!" = DecrypteerRequest.Ref) {
-		If ("" = DecrypteerRequest.DataOpt) {
-			Set Response.IsGeldig = 0
-		} ElseIf ("ongeldigeDataOpt" = DecrypteerRequest.DataOpt) {
-			Set Response.IsGeldig = 0
-		} Else {
-			Set Response.IsGeldig = 1
-			Set Response.GebruikerId = "1"
-			Set Response.GebruikerNaam = ""
-			Set Response.IsContactGegevensFormulierNodig = 0
-			Set Response.KlantId = "hein_" _ DecrypteerRequest.DataOpt
-			Set Response.KlantNaam =  "hein_" _ DecrypteerRequest.DataOpt
-			Set Response.PersonalityId = 11
-			Set Response.Taal = "D"
-			Do Response.ToegelatenLadetypes.Insert("LBX")
-			Do Response.ToegelatenLadetypes.Insert("TAX")
-			Do Response.ToegelatenLadetypes.Insert("TBX")
-		}
-	} ElseIf (")àç!DU-PONT)àç!" = DecrypteerRequest.Ref) {
-		If ("" = DecrypteerRequest.DataOpt) {
-			Set Response.IsGeldig = 1
-			Set Response.IsContactGegevensFormulierNodig = 1
-		} ElseIf ("ongeldigeDataOpt" = DecrypteerRequest.DataOpt) {
-			Set Response.IsGeldig = 0
-		} Else {
-			Set Response.IsGeldig = 1
-			Set Response.GebruikerId = "1"
-			Set Response.GebruikerNaam = ""
-			Set Response.IsContactGegevensFormulierNodig = 0
-			Set Response.KlantId = "1234"
-			Set Response.KlantNaam =  "dupont_" _ DecrypteerRequest.DataOpt
-			Set Response.PersonalityId = 4
-			Set Response.Taal = "N"
-			Do Response.ToegelatenLadetypes.Insert("LBX")
-		}
-	} Else {
-		Set Response.IsGeldig = 0
-	}
-
-	Quit Response
+<Implementation><![CDATA[	Quit ..HandelAuthenticator.Decrypteer(DecrypteerRequest)
 ]]></Implementation>
 </Method>
 
@@ -84,25 +45,7 @@
 <FormalSpec>RegistreerContactGegevensRequest:WS.Vhisie4.Auth.RegistreerContactGegevensRequest</FormalSpec>
 <ReturnType>WS.Vhisie4.Auth.RegistreerContactGegevensResponse</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[
-	#Dim Response As WS.Vhisie4.Auth.RegistreerContactGegevensResponse = ##class(WS.Vhisie4.Auth.RegistreerContactGegevensResponse).%New()
-	
-	If ("" = RegistreerContactGegevensRequest.Ref) {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Ref is verplicht"))
-	} ElseIf ("" = RegistreerContactGegevensRequest.Naam) {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Naam is verplicht"))
-	} ElseIf ("" = RegistreerContactGegevensRequest.EmailAdres) {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("EmailAdres is verplicht"))
-	} Else {
-		Set Response.GebruikerId = "1"
-		Set Response.GebruikerNaam = ""
-		Set Response.KlantId = "1234"
-		Set Response.KlantNaam = "dupont_" _ RegistreerContactGegevensRequest.Naam
-		Set Response.DataOpt = ##class(vhPowerTools.APPS.EC.KlantSessieDataGeneratorUnishop).%New().GenereerDataOpt("DUPO",Response.KlantId,Response.KlantNaam,Response.GebruikerId)
-
-	}
-	
-	Quit Response
+<Implementation><![CDATA[	Quit ..HandelAuthenticator.RegistreerContactGegevens(RegistreerContactGegevensRequest)
 ]]></Implementation>
 </Method>
 </Class>