From 29079a578fe6cfa832b19c643c8b4df244676b96 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 16 Apr 2025 12:57:21 +0200
Subject: [PATCH] LAND: - spostamento servizio AppAuth i proj generico

---
 MP.AppAuth/MP.AppAuth.csproj                            | 2 ++
 {MP.Land/Data => MP.AppAuth/Services}/AppAuthService.cs | 6 +++---
 MP.Land/Components/CmpGroupFilt.razor.cs                | 1 +
 MP.Land/Components/CompareAnagKeyVal.razor.cs           | 1 +
 MP.Land/Components/CompareConfig.razor.cs               | 1 +
 MP.Land/Components/CompareVocabolario.razor.cs          | 1 +
 MP.Land/Components/HomeLink.razor                       | 1 +
 MP.Land/Components/SingleDownload.razor.cs              | 1 +
 MP.Land/MP.Land.csproj                                  | 3 ++-
 MP.Land/Pages/Index.razor.cs                            | 1 +
 MP.Land/Pages/RefreshData.razor                         | 1 +
 MP.Land/Pages/SysInfo.razor                             | 1 +
 MP.Land/Pages/UserQr.razor.cs                           | 1 +
 MP.Land/Resources/ChangeLog.html                        | 2 +-
 MP.Land/Resources/VersNum.txt                           | 2 +-
 MP.Land/Resources/manifest.xml                          | 2 +-
 MP.Land/Shared/MainLayout.razor.cs                      | 1 +
 MP.Land/Shared/NavMenu.razor.cs                         | 4 +---
 18 files changed, 22 insertions(+), 10 deletions(-)
 rename {MP.Land/Data => MP.AppAuth/Services}/AppAuthService.cs (99%)

diff --git a/MP.AppAuth/MP.AppAuth.csproj b/MP.AppAuth/MP.AppAuth.csproj
index 4d97d8a4..4bd47859 100644
--- a/MP.AppAuth/MP.AppAuth.csproj
+++ b/MP.AppAuth/MP.AppAuth.csproj
@@ -17,10 +17,12 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NLog" Version="5.3.4" />
     <PackageReference Include="RestSharp" Version="112.0.0" />
     <PackageReference Include="SharpZipLib" Version="1.4.2" />
+    <PackageReference Include="StackExchange.Redis" Version="2.8.31" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/MP.Land/Data/AppAuthService.cs b/MP.AppAuth/Services/AppAuthService.cs
similarity index 99%
rename from MP.Land/Data/AppAuthService.cs
rename to MP.AppAuth/Services/AppAuthService.cs
index 26fec59b..75767389 100644
--- a/MP.Land/Data/AppAuthService.cs
+++ b/MP.AppAuth/Services/AppAuthService.cs
@@ -11,13 +11,13 @@ using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace MP.Land.Data
+namespace MP.AppAuth.Services
 {
     public class AppAuthService : IDisposable
     {
         #region Public Fields
 
-        // diritti (cablòato)
+        // diritti (cablato)
         public const string RoleSuperAdmin = "MoonPro_SuperAdmin";
 
         public static AppAuthController dbController;
@@ -579,7 +579,7 @@ namespace MP.Land.Data
         /// <summary>
         /// Oggetto DB redis da impiegare x chiamate R/W
         /// </summary>
-        private IDatabase redisDb = null!;
+        private StackExchange.Redis.IDatabase redisDb = null!;
 
         private Random rnd = new Random();
 
diff --git a/MP.Land/Components/CmpGroupFilt.razor.cs b/MP.Land/Components/CmpGroupFilt.razor.cs
index 800f3548..5873b958 100644
--- a/MP.Land/Components/CmpGroupFilt.razor.cs
+++ b/MP.Land/Components/CmpGroupFilt.razor.cs
@@ -15,6 +15,7 @@ using MP.Land;
 using MP.Land.Shared;
 using MP.AppAuth.Models;
 using MP.Land.Data;
+using MP.AppAuth.Services;
 
 namespace MP.Land.Components
 {
diff --git a/MP.Land/Components/CompareAnagKeyVal.razor.cs b/MP.Land/Components/CompareAnagKeyVal.razor.cs
index c8fb5150..693b0ad8 100644
--- a/MP.Land/Components/CompareAnagKeyVal.razor.cs
+++ b/MP.Land/Components/CompareAnagKeyVal.razor.cs
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.JSInterop;
 using MP.AppAuth.DTO;
 using MP.AppAuth.Models;
+using MP.AppAuth.Services;
 using MP.Land.Data;
 using System;
 using System.Collections.Generic;
diff --git a/MP.Land/Components/CompareConfig.razor.cs b/MP.Land/Components/CompareConfig.razor.cs
index 6851ec30..2adcba63 100644
--- a/MP.Land/Components/CompareConfig.razor.cs
+++ b/MP.Land/Components/CompareConfig.razor.cs
@@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using MP.AppAuth.DTO;
 using MP.AppAuth.Models;
+using MP.AppAuth.Services;
 using MP.Land.Data;
 using System;
 using System.Collections.Generic;
diff --git a/MP.Land/Components/CompareVocabolario.razor.cs b/MP.Land/Components/CompareVocabolario.razor.cs
index 33fa227d..d1844ca1 100644
--- a/MP.Land/Components/CompareVocabolario.razor.cs
+++ b/MP.Land/Components/CompareVocabolario.razor.cs
@@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
 using MP.AppAuth.DTO;
 using MP.AppAuth.Models;
+using MP.AppAuth.Services;
 using MP.Land.Data;
 using System;
 using System.Collections.Generic;
diff --git a/MP.Land/Components/HomeLink.razor b/MP.Land/Components/HomeLink.razor
index dce5fb65..63020c01 100644
--- a/MP.Land/Components/HomeLink.razor
+++ b/MP.Land/Components/HomeLink.razor
@@ -1,4 +1,5 @@
 @using MP.AppAuth.Models
+@using MP.AppAuth.Services
 @using MP.Land.Data
 @using Microsoft.Extensions.Configuration
 
diff --git a/MP.Land/Components/SingleDownload.razor.cs b/MP.Land/Components/SingleDownload.razor.cs
index 4a2dc4d9..629b062f 100644
--- a/MP.Land/Components/SingleDownload.razor.cs
+++ b/MP.Land/Components/SingleDownload.razor.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
 using MP.Land.Data;
 using System.Diagnostics;
+using MP.AppAuth.Services;
 
 namespace MP.Land.Components
 {
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj
index 5998b7e6..f58a24be 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.2504.0909</Version>
+        <Version>6.16.2504.1612</Version>
         <Configurations>Debug;Release;Debug_LiManDebug</Configurations>
         <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
         <RunAnalyzersDuringBuild>True</RunAnalyzersDuringBuild>
@@ -15,6 +15,7 @@
         <Compile Remove="Components\TagSearch.razor.cs" />
         <Compile Remove="Components\TaskEdit.razor.cs" />
         <Compile Remove="Components\TaskExeList.razor.cs" />
+        <Compile Remove="Data\AppAuthService.cs" />
         <Compile Remove="Data\FileArchDataService.cs" />
         <Compile Remove="Pages\Archive.razor.cs" />
         <Compile Remove="Pages\Setup.razor.cs" />
diff --git a/MP.Land/Pages/Index.razor.cs b/MP.Land/Pages/Index.razor.cs
index 5700aa2d..b271e463 100644
--- a/MP.Land/Pages/Index.razor.cs
+++ b/MP.Land/Pages/Index.razor.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Components;
+using MP.AppAuth.Services;
 using MP.Land.Data;
 using System;
 using System.Collections.Generic;
diff --git a/MP.Land/Pages/RefreshData.razor b/MP.Land/Pages/RefreshData.razor
index 61a744a7..666e03d2 100644
--- a/MP.Land/Pages/RefreshData.razor
+++ b/MP.Land/Pages/RefreshData.razor
@@ -1,5 +1,6 @@
 @page "/RefreshData"
 
+@using MP.AppAuth.Services
 @using MP.Land.Components
 @using MP.Land.Data
 @using MP.TaskMan.Services
diff --git a/MP.Land/Pages/SysInfo.razor b/MP.Land/Pages/SysInfo.razor
index 41500667..7f9f547d 100644
--- a/MP.Land/Pages/SysInfo.razor
+++ b/MP.Land/Pages/SysInfo.razor
@@ -1,5 +1,6 @@
 @page "/SysInfo"
 @using MP.AppAuth
+@using MP.AppAuth.Services
 @using MP.Land.Data
 @using Microsoft.Extensions.Configuration
 
diff --git a/MP.Land/Pages/UserQr.razor.cs b/MP.Land/Pages/UserQr.razor.cs
index 53504af7..4a92581c 100644
--- a/MP.Land/Pages/UserQr.razor.cs
+++ b/MP.Land/Pages/UserQr.razor.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Configuration;
 using MP.AppAuth.Models;
+using MP.AppAuth.Services;
 using MP.Land.Data;
 using System;
 using System.Collections.Generic;
diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html
index 3f3780b5..7c5c054b 100644
--- a/MP.Land/Resources/ChangeLog.html
+++ b/MP.Land/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo Tablet MAPO - DotNet6</i>
-    <h4>Versione: 6.16.2504.0909</h4>
+    <h4>Versione: 6.16.2504.1612</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt
index 31dd2801..22950480 100644
--- a/MP.Land/Resources/VersNum.txt
+++ b/MP.Land/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2504.0909
+6.16.2504.1612
diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml
index 0bbf8a5b..4cd0b5dc 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.2504.0909</version>
+  <version>6.16.2504.1612</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.Land/Shared/MainLayout.razor.cs b/MP.Land/Shared/MainLayout.razor.cs
index f6f057be..9b4f8844 100644
--- a/MP.Land/Shared/MainLayout.razor.cs
+++ b/MP.Land/Shared/MainLayout.razor.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Components;
+using MP.AppAuth.Services;
 using MP.Land.Data;
 using System;
 using System.Collections.Generic;
diff --git a/MP.Land/Shared/NavMenu.razor.cs b/MP.Land/Shared/NavMenu.razor.cs
index 0789138a..c51cdeca 100644
--- a/MP.Land/Shared/NavMenu.razor.cs
+++ b/MP.Land/Shared/NavMenu.razor.cs
@@ -1,11 +1,9 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Configuration;
 using MP.AppAuth.Models;
-using MP.Land.Data;
+using MP.AppAuth.Services;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Linq;
 using System.Threading.Tasks;