inizio modifica x recuperare dati OPR

MP-TAB-SERV/Components/CmpTop.razor.cs

@@ -1,6 +1,9 @@
+using EgwCoreLib.Utils;
 using Microsoft.AspNetCore.Components;
 using MP.Data.DatabaseModels;
+using MP.Data.DTO;
 using MP.Data.Services;
+using Newtonsoft.Json;
 using NLog;
 using System.Diagnostics;
 
@@ -71,20 +74,59 @@ namespace MP_TAB_SERV.Components
             NavMan.NavigateTo("/", true);
         }
 
-        private string UserName
+        protected async Task logIn(string decodValue)
         {
-            get => MsgServ.CognomeNome;
-        }
-        private int MatrOpr
-        {
-            get => MsgServ.MatrOpr;
+            // decifro i valori..
+            var decrVal = MsgServ.DecryptData(decodValue);
+            var opData = JsonConvert.DeserializeObject<userTknDTO>(decrVal);
+            if (opData != null)
+            {
+                var rigaOpr = await TDService.OperatoreSearch(opData.currOpr.MatrOpr, opData.currOpr.authKey);
+#if false
+                if (rigaOpr == null)
+                {
+                    var deHash = TDService.DecryptData(authKey);
+                    rigaOpr = await TDService.OperatoreSearch(matrOpr, deHash);
+                }
+                if (rigaOpr != null)
+                {
+                    userTknDTO newUserTkn = new userTknDTO()
+                    {
+                        currOpr = rigaOpr,
+                        expTime = expDT
+                    };
+
+                    var jsonTkn = JsonConvert.SerializeObject(newUserTkn);
+                    string hash = TDService.EncryptData(jsonTkn);
+                    MsgServ.RigaOper = rigaOpr;
+                    await MsgServ.setCurrOperDtoAsync(hash);
+                    await TDService.OperatoreSetRedis(matrOpr, hash);
+                    NavMan.NavigateTo("status-map");
+                } 
+#endif
+            }
         }
+        protected DateTime expDT { get; set; } = DateTime.Now;
+        [Inject]
+        protected SharedMemService SMServ { get; set; } = null!;
 
         protected override async Task OnInitializedAsync()
         {
             await Task.Delay(1);
+          int expDays= SMServ.GetConfInt("cookieDayExpire");
+            expDT = DateTime.Now.AddDays(expDays);
+
             CurrOprTknLS = await MsgServ.getCurrOperDtoAsync();
             var decodedUrl = Uri.UnescapeDataString(CurrOprTknLS);
+
+            // verifico se non avessi dati operatore
+            if(MsgServ.RigaOper==null)
+            {
+                await logIn(decodedUrl);
+            }
+
+
+
             CurrOprTknRedis = await TDService.OperatoreGetRedis(MatrOpr);
             if (CurrOprTknRedis == "")
             {
@@ -146,5 +188,19 @@ namespace MP_TAB_SERV.Components
         private static Logger Log = LogManager.GetCurrentClassLogger();
 
         #endregion Private Fields
+
+        #region Private Properties
+
+        private int MatrOpr
+        {
+            get => MsgServ.MatrOpr;
+        }
+
+        private string UserName
+        {
+            get => MsgServ.CognomeNome;
+        }
+
+        #endregion Private Properties
     }
 }

MP-TAB-SERV/MP-TAB-SERV.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2311.1412</Version>
+      <Version>6.16.2311.1414</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>

MP-TAB-SERV/Pages/RegNewDevice.razor.cs

@@ -61,8 +61,12 @@ namespace MP_TAB_SERV.Pages
         protected DateTime expDT { get; set; } = DateTime.Now;
         protected async Task logIn()
         {
-            await Task.Delay(1);
             rigaOpr = await TDService.OperatoreSearch(matrOpr, authKey);
+            if (rigaOpr == null)
+            {
+                var deHash = TDService.DecryptData(authKey);
+                rigaOpr = await TDService.OperatoreSearch(matrOpr, deHash);
+            }
             if (rigaOpr != null)
             {
                 userTknDTO newUserTkn = new userTknDTO()
@@ -115,29 +119,7 @@ namespace MP_TAB_SERV.Pages
                             authKey = _authKey;
                         }
                     }
-
-
-                    rigaOpr = await TDService.OperatoreSearch(matrOpr, authKey);
-                    if (rigaOpr == null)
-                    {
-                        var deHash = TDService.DecryptData(authKey);
-                        rigaOpr = await TDService.OperatoreSearch(matrOpr, deHash);
-                    }
-                    if (rigaOpr != null)
-                    {
-                        userTknDTO newUserTkn = new userTknDTO()
-                        {
-                            currOpr = rigaOpr,
-                            expTime = expDT
-                        };
-
-                        var jsonTkn = JsonConvert.SerializeObject(newUserTkn);
-                        string hash = TDService.EncryptData(jsonTkn);
-                        MsgServ.RigaOper = rigaOpr;
-                        await MsgServ.setCurrOperDtoAsync(hash);
-                        await TDService.OperatoreSetRedis(matrOpr, hash);
-                        NavMan.NavigateTo("status-map");
-                    }
+                    await logIn();
                 }
             }
         }

MP-TAB-SERV/Resources/ChangeLog.html

@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2311.1412</h4>
+    <h4>Versione: 6.16.2311.1414</h4>
     <br /> Note di rilascio:
     <ul>
         <li>

MP-TAB-SERV/Resources/VersNum.txt

@@ -1 +1 @@
-6.16.2311.1412
+6.16.2311.1414

MP-TAB-SERV/Resources/manifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2311.1412</version>
+  <version>6.16.2311.1414</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>