From 1b5ba617156e43748cfcb6caccaabf9b32afb7c2 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Mon, 12 Sep 2022 19:54:25 +0200
Subject: [PATCH] Fix generazione URL encoded

---
 GPW_Admin/WebUserControls/cmp_userCard.ascx.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/GPW_Admin/WebUserControls/cmp_userCard.ascx.cs b/GPW_Admin/WebUserControls/cmp_userCard.ascx.cs
index 0265136..0b4fcd7 100644
--- a/GPW_Admin/WebUserControls/cmp_userCard.ascx.cs
+++ b/GPW_Admin/WebUserControls/cmp_userCard.ascx.cs
@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using SteamWare;
 using System;
+using System.Web;
 
 namespace GPW_Admin.WebUserControls
 {
@@ -76,13 +77,18 @@ namespace GPW_Admin.WebUserControls
             string urlName = showExt ? "smartBaseUrlExt" : "smartBaseUrlInt";
             string[] valori = new string[2];
             valori[0] = $"{idxDip}";
-            valori[1] = $"{UserAuthkey}";
+            valori[1] = HttpUtility.UrlEncode($"{UserAuthkey}");
+
+            string baseUrl = $"{memLayer.ML.CRS("UrlQRCodeGen")}/HOME/QR_site/{memLayer.ML.CRS("UrlQuery")}";
+            //string baseUrl = $"{memLayer.ML.CRS("UrlQRCodeGen")}/HOME/QR_site/JSON_ENC?val=";
+            string urlEncoded = memLayer.ML.CRS(urlName) + HttpUtility.UrlEncode("jumper?idxDipendente={0}&UserAuthkey={1}");
+
+            //string rawUrl = memLayer.ML.CRS(urlName) + "jumper?idxDipendente={0}&UserAuthkey={1}";
+            //string urlEncoded = HttpUtility.UrlEncode(rawUrl);
 
-            string baseUrl = $"{memLayer.ML.CRS("UrlQRCodeGen")}/HOME/QR_site/JSON?val=";
             qrPayload currPayload = new qrPayload()
             {
-                // NB: & --> %26
-                baseUrl = memLayer.ML.CRS(urlName) + "jumper?idxDipendente={0}%26UserAuthkey={1}",
+                baseUrl = urlEncoded,
                 parameters = valori
             };
             string payload = JsonConvert.SerializeObject(currPayload);