Index: WS/EC/Unishop/Login/Service.cls.xml
===================================================================
diff -u -r34649 -r34656
--- WS/EC/Unishop/Login/Service.cls.xml	(.../Service.cls.xml)	(revision 34649)
+++ WS/EC/Unishop/Login/Service.cls.xml	(.../Service.cls.xml)	(revision 34656)
@@ -10,18 +10,54 @@
 <ReturnType>WS.EC.Unishop.dto.Session</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	if (Gebruiker = "INTRACTO EXPORT") && (Paswoord = "HZD;606")
+	#dim LoginParameters As BL.EC.pxLogIn = ""
+	#dim Session As BL.EC.Session = ##class(BL.EC.Session).%New()
+	#dim CanLogin As BL.EC.pxStatus = Session.LogInUser(Gebruiker, Paswoord, "", Taal,,"127.0.0.10",.LoginParameters)
+	
+	If '$IsObject(CanLogin) && $IsObject(LoginParameters)
 	{
-		#dim Session As WS.EC.Unishop.dto.Session = ##class(WS.EC.Unishop.dto.Session).%New()
-		Set Session.Url = "http://legrabox.accounts.intracto.com/login?Taal=N&REF=KifeOwBXXSTSV5JAsFJwRU/iJg7ff2yWp_eBffg9Vxs-&DATAOPT=VwEGDfsh4YEzXFbapVzobMKUhlQEEFC/716VeK2tfMlH5Yw3B9vnV3a9VPbEoPGka/WaF_8UQ68O4WH/5zeA8w--"
-		Set Session.ID = "xeARl72hefsWxRnvNcHEjQQkkKz3ROVJhrkmYnLRDwpEsCCS5oL0PESu_44G_T1YmkQ"
-		Quit Session 
+		#dim RefSessieData As APPS.EC.dto.RefSessieData = ..GeefRefSessieData(LoginParameters.KlantNr)
+		#dim Ref As %String = ##class(APPS.EC.impl.RefSessieDataBepaler).%New().GeefEncryptedRefSessieData(RefSessieData)		
+		
+		#dim Toegang As Derde.EC.Toegang = ##class(Derde.EC.Toegang).%OpenId(Session.Session.ToegangID)
+
+		#dim Klant As DOM.VKP.VanHoeckeKlant = ..GeefKlant(RefSessieData.KlantID)
+		
+		#dim WebshopSessie As APPS.EC.dto.WebshopSessie = ##class(WS.EC.SessionService).%New().LoginMetEncryptedCredentials(Gebruiker, Toegang.WachtWoord, RefSessieData.KlantID, Taal, Klant.GeefAdres().GeefLandNr(), "127.0.0.10")
+		
+		#dim ResultSession AS WS.EC.Unishop.dto.Session = ##class(WS.EC.Unishop.dto.Session).%New()
+		Set ResultSession.Url = ##class(BL.EC.WebShop).%New().GetUnishopURL(Ref, Toegang.GeefID(), Taal) 
+		Set ResultSession.ID = WebshopSessie.VhintraSessie.SessieSleutel
+		Quit ResultSession 
 	} Else {
 		set Exception = ##class(TECH.Exceptions.InvalidUserInputException).%New("Ongeldige gebruiker of paswoord.")	
 		do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="GeefRefSessieData">
+<FormalSpec>KlantNr:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>APPS.EC.dto.RefSessieData</ReturnType>
+<Implementation><![CDATA[
+	Set RefSessieData = ##class(APPS.EC.dto.RefSessieData).%New()
+	Set RefSessieData.KlantID = "K||" _KlantNr
+	Set RefSessieData.Verwerker = ##class(APPS.EC.enu.UniShopVerwerker).VHEPN()
+	Set RefSessieData.WebshopModus = ##class(APPS.EC.enu.WebshopModus).Normaal()
+	Quit RefSessieData
+]]></Implementation>
+</Method>
+
+<Method name="GeefKlant">
+<FormalSpec>KlantID:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>DOM.VKP.VanHoeckeKlant</ReturnType>
+<Implementation><![CDATA[
+	#Dim VerkoopAPI As DOM.VKP.VerkoopAPI = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI()
+	Quit VerkoopAPI.GeefKlant(KlantID)
+]]></Implementation>
+</Method>
 </Class>