From 8fbfea1f62ba9d32e4bc77a92bdbb447ee7013a9 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 4 Nov 2022 16:09:26 +0100
Subject: [PATCH] COmplreto refresh gestione licenze LAND - sistemato GC in
 generale - controllo e sistemazione calcolo data scadenza

---
 MP.Land/Data/LicenseService.cs   | 30 +++++++++++++++++++++++++++++-
 MP.Land/MP.Land.csproj           |  2 +-
 MP.Land/Pages/About.razor.cs     |  9 +++------
 MP.Land/Resources/ChangeLog.html |  2 +-
 MP.Land/Resources/VersNum.txt    |  2 +-
 MP.Land/Resources/manifest.xml   |  2 +-
 MP.SPEC/MP.SPEC.csproj           |  2 +-
 MP.SPEC/Resources/ChangeLog.html |  2 +-
 MP.SPEC/Resources/VersNum.txt    |  2 +-
 MP.SPEC/Resources/manifest.xml   |  2 +-
 10 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/MP.Land/Data/LicenseService.cs b/MP.Land/Data/LicenseService.cs
index a9919f55..baeb055c 100644
--- a/MP.Land/Data/LicenseService.cs
+++ b/MP.Land/Data/LicenseService.cs
@@ -372,7 +372,35 @@ namespace MP.Land.Data
                 }
                 else
                 {
-                    _logger.LogInformation($"Record non trovato per {authKey}");
+                    _logger.LogInformation($"checkLicenseActive | Record non trovato per {authKey}");
+                }
+            }
+            return answ;
+        }
+        /// <summary>
+        /// Verifica scadenza licenza
+        /// </summary>
+        /// <param name="authKey"></param>
+        /// <returns></returns>
+        public DateTime getLicenseExpiry(string authKey)
+        {
+            DateTime answ = DateTime.Today.AddDays(-1);
+            //cerco anche nelle info AKV
+            if (AKVList != null)
+            {
+                var recLic = AKVList.Where(x => x.ValString == authKey).FirstOrDefault();
+                int numLic = 0;
+                //cerco in record
+                if (recLic != null)
+                {
+                    numLic = (int)recLic.ValInt;
+                    // verifico scadenza licenza!
+                    DateTime scadenza = licenseManGLS.expiryDateByAuthKey(Installazione, recLic.NomeVar, numLic, authKey);
+                    answ = scadenza;
+                }
+                else
+                {
+                    _logger.LogInformation($"getLicenseExpiry | Record non trovato per {authKey}");
                 }
             }
             return answ;
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj
index f3047c6d..e5d244a5 100644
--- a/MP.Land/MP.Land.csproj
+++ b/MP.Land/MP.Land.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>MP.Land</RootNamespace>
-        <Version>6.16.2211.0415</Version>
+        <Version>6.16.2211.0416</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/MP.Land/Pages/About.razor.cs b/MP.Land/Pages/About.razor.cs
index a423fa16..2f7a0ded 100644
--- a/MP.Land/Pages/About.razor.cs
+++ b/MP.Land/Pages/About.razor.cs
@@ -4,12 +4,8 @@ using System.Threading.Tasks;
 
 namespace MP.Land.Pages
 {
-    public partial class About 
+    public partial class About
     {
-        #region Public Methods
-
-        #endregion Public Methods
-
         #region Protected Methods
 
         protected override async Task OnInitializedAsync()
@@ -43,7 +39,7 @@ namespace MP.Land.Pages
 
         private async Task reloadLicenseData()
         {
-            int cDelay = 5;
+            int cDelay = 10;
             // recupero dati
             await Task.Delay(cDelay);
             try
@@ -54,6 +50,7 @@ namespace MP.Land.Pages
                 Installazione = LicServ.Installazione;
                 Applicazione = LicServ.Applicazione;
                 MastKey = LicServ.MasterKey;
+                Scadenza = LicServ.getLicenseExpiry(LicServ.MasterKey);
                 await Task.Delay(cDelay);
                 var fatto = await LicServ.RefreshLicense();
                 await Task.Delay(cDelay);
diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html
index 36121c06..9fbcacb8 100644
--- a/MP.Land/Resources/ChangeLog.html
+++ b/MP.Land/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo gestione Programmi MAPO</i>
-    <h4>Versione: 6.16.2211.0415</h4>
+    <h4>Versione: 6.16.2211.0416</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt
index dd77557b..3af0d134 100644
--- a/MP.Land/Resources/VersNum.txt
+++ b/MP.Land/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2211.0415
+6.16.2211.0416
diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml
index e664437e..2f81485a 100644
--- a/MP.Land/Resources/manifest.xml
+++ b/MP.Land/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2211.0415</version>
+  <version>6.16.2211.0416</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>
diff --git a/MP.SPEC/MP.SPEC.csproj b/MP.SPEC/MP.SPEC.csproj
index 2f3a613f..e67b133f 100644
--- a/MP.SPEC/MP.SPEC.csproj
+++ b/MP.SPEC/MP.SPEC.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP.SPEC</RootNamespace>
-    <Version>6.16.2211.414</Version>
+    <Version>6.16.2211.415</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/MP.SPEC/Resources/ChangeLog.html b/MP.SPEC/Resources/ChangeLog.html
index f769f4ca..ca2c5ffb 100644
--- a/MP.SPEC/Resources/ChangeLog.html
+++ b/MP.SPEC/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2211.414</h4>
+    <h4>Versione: 6.16.2211.415</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP.SPEC/Resources/VersNum.txt b/MP.SPEC/Resources/VersNum.txt
index 7cceff8d..89994502 100644
--- a/MP.SPEC/Resources/VersNum.txt
+++ b/MP.SPEC/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2211.414
+6.16.2211.415
diff --git a/MP.SPEC/Resources/manifest.xml b/MP.SPEC/Resources/manifest.xml
index 673d3973..ba47b183 100644
--- a/MP.SPEC/Resources/manifest.xml
+++ b/MP.SPEC/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2211.414</version>
+  <version>6.16.2211.415</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>