diff --git a/MP-TAB3/Components/CmpTop.razor.cs b/MP-TAB3/Components/CmpTop.razor.cs
index 84d547ea..2341186c 100644
--- a/MP-TAB3/Components/CmpTop.razor.cs
+++ b/MP-TAB3/Components/CmpTop.razor.cs
@@ -97,11 +97,13 @@ namespace MP_TAB3.Components
await InvokeAsync(StateHasChanged);
var currToken = await MsgServ.GetCurrOperDtoLSAsync();
var lastOpr = await MsgServ.GetLastMatrOprAsync();
+ var devGuid = await MsgServ.GetCurrDevGuidLSAsync();
// reset cache varie
await MsgServ.ClearLocalStor();
await MsgServ.ClearSessionStor();
await MDataService.FlushCache();
- // salvo di nuovo opr
+ // salvo di nuovo opr + GUID
+ await MsgServ.SetCurrDevGuidLSAsync(devGuid);
await MsgServ.SetLastMatrOprAsync(lastOpr);
await MsgServ.SetCurrOperDtoLSAsync(currToken);
// reload MStor
@@ -135,7 +137,6 @@ namespace MP_TAB3.Components
expLoginType = SMServ.GetConfInt("TAB_TypeScadLogin");
var CurrDevGuid = await MsgServ.GetCurrDevGuidLSAsync();
- //if (string.IsNullOrEmpty(CurrDevGuid.ToString()))
if (CurrDevGuid == Guid.Empty)
{
CurrDevGuid = Guid.NewGuid();
diff --git a/MP-TAB3/MP-TAB3.csproj b/MP-TAB3/MP-TAB3.csproj
index d8acdf04..a6476079 100644
--- a/MP-TAB3/MP-TAB3.csproj
+++ b/MP-TAB3/MP-TAB3.csproj
@@ -3,7 +3,7 @@
net6.0
enable
- 6.16.2401.417
+ 6.16.2401.419
enable
MP_TAB3
diff --git a/MP-TAB3/Pages/Logout.razor.cs b/MP-TAB3/Pages/Logout.razor.cs
index 54c76b0f..e8b9dc0c 100644
--- a/MP-TAB3/Pages/Logout.razor.cs
+++ b/MP-TAB3/Pages/Logout.razor.cs
@@ -39,9 +39,9 @@ namespace MP_TAB3.Pages
protected override async Task OnInitializedAsync()
{
await Task.Delay(1);
- await localStorage.SetItemAsync("currTkn", "");
- await localStorage.SetItemAsync("CurrMach", "");
- await localStorage.SetItemAsync("LastPage", "");
+ await MsgServ.SetCurrOperDtoLSAsync("");
+ await MsgServ.IdxMaccSet("");
+ await MsgServ.LastOpenedPageSet("");
var CurrOprTknLS = await MsgServ.GetCurrOperDtoLSAsync();
var CurrDevGuid = await MsgServ.GetCurrDevGuidLSAsync();
if (!string.IsNullOrEmpty(CurrOprTknLS))
diff --git a/MP-TAB3/Resources/ChangeLog.html b/MP-TAB3/Resources/ChangeLog.html
index 9d800083..12c3af5d 100644
--- a/MP-TAB3/Resources/ChangeLog.html
+++ b/MP-TAB3/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
Modulo MAPOSPEC
- Versione: 6.16.2401.417
+ Versione: 6.16.2401.419
Note di rilascio:
-
diff --git a/MP-TAB3/Resources/VersNum.txt b/MP-TAB3/Resources/VersNum.txt
index 673f5369..19957b8a 100644
--- a/MP-TAB3/Resources/VersNum.txt
+++ b/MP-TAB3/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2401.417
+6.16.2401.419
diff --git a/MP-TAB3/Resources/manifest.xml b/MP-TAB3/Resources/manifest.xml
index e90bc311..224f92fe 100644
--- a/MP-TAB3/Resources/manifest.xml
+++ b/MP-TAB3/Resources/manifest.xml
@@ -1,6 +1,6 @@
-
- 6.16.2401.417
+ 6.16.2401.419
https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/MP-TAB3.zip
https://nexus.steamware.net/repository/SWS/MP-TAB3/stable/LAST/ChangeLog.html
false
diff --git a/MP-TAB3/Shared/MainLayout.razor.cs b/MP-TAB3/Shared/MainLayout.razor.cs
index 82edadb9..50cf8145 100644
--- a/MP-TAB3/Shared/MainLayout.razor.cs
+++ b/MP-TAB3/Shared/MainLayout.razor.cs
@@ -92,7 +92,10 @@ namespace MP_TAB3.Shared
{
get => MsgServ.MatrOpr;
}
- protected int typeScadLogin { get; set; } = 0;
+ ///
+ /// Tipo scadenza login, a -1 di default così da NON avere problemi in caso di setuop errato...
+ ///
+ protected int typeScadLogin { get; set; } = -1;
protected int dtScadLogin { get; set; } = 0;
protected Guid currDevGuid { get; set; } = new Guid();
@@ -102,14 +105,8 @@ namespace MP_TAB3.Shared
TimeSpan tsDeltaSave = DateTime.Now.Subtract(MsgServ.dtLastSave);
switch (typeScadLogin)
{
- case 0:
- if (tsDeltaAct.Minutes >= dtScadLogin)
- {
- NavMan.NavigateTo("logout");
- }
- break;
case 1:
- if (tsDeltaAct.Minutes >= dtScadLogin)
+ if (tsDeltaAct.TotalMinutes >= dtScadLogin)
{
var userTkn = await TDataService.OperatoreGetRedis(MatrOpr, currDevGuid);
if (!string.IsNullOrEmpty(userTkn))
@@ -138,6 +135,17 @@ namespace MP_TAB3.Shared
}
}
break;
+ case 2:
+ if (tsDeltaAct.TotalMinutes >= dtScadLogin)
+ {
+ NavMan.NavigateTo("logout");
+ }
+ break;
+ case 0:
+ case -1:
+ await ReloadMemStor();
+ typeScadLogin = MStor.GetConfInt("TAB_TypeScadLogin");
+ break;
}
}
diff --git a/MP.Data/Services/MessageService.cs b/MP.Data/Services/MessageService.cs
index 000f9e77..6d818038 100644
--- a/MP.Data/Services/MessageService.cs
+++ b/MP.Data/Services/MessageService.cs
@@ -262,6 +262,8 @@ namespace MP.Data.Services
var rigaOpr = await TDService.OperatoreSearch(opData.currOpr.MatrOpr, opData.currOpr.authKey);
if (rigaOpr != null)
{
+ await SetLastMatrOprAsync(rigaOpr.MatrOpr);
+
userTknDTO newUserTkn = new userTknDTO()
{
currOpr = rigaOpr,
@@ -271,8 +273,10 @@ namespace MP.Data.Services
var jsonTkn = JsonConvert.SerializeObject(newUserTkn);
string hash = TDService.EncryptData(jsonTkn);
RigaOper = rigaOpr;
- await SetLastMatrOprAsync(rigaOpr.MatrOpr);
- await SetCurrOperDtoLSAsync(hash);
+ if (!hash.Equals(decodValue))
+ {
+ await SetCurrOperDtoLSAsync(hash);
+ }
if (saveOpr)
{
await TDService.OperatoreSetRedis(rigaOpr.MatrOpr, hash, devGuid);
@@ -370,8 +374,8 @@ namespace MP.Data.Services
public async Task GetMachineMse(string idxMacchina)
{
MappaStatoExpl answ = null;
- string rawData = await localStorage.GetItemAsync(machineMse(idxMacchina));
- if (rawData != "")
+ var rawData = await localStorage.GetItemAsync(machineMse(idxMacchina));
+ if (!string.IsNullOrEmpty(rawData))
{
answ = JsonConvert.DeserializeObject(rawData);
}