Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix login che sparisce da timeout cookie

Browse Source
This commit is contained in:
Samuele Locatelli
2023-12-12 16:13:08 +01:00
parent 75b330abc4
commit 3fdb713a05
7 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-TAB-SERV/MP-TAB-SERV.csproj
+1 -1
View File
@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<Version>6.16.2312.1215</Version>
<Version>6.16.2312.1216</Version>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP_TAB_SERV</RootNamespace>
</PropertyGroup>
MP-TAB-SERV/Pages/_Layout.cshtml
-7
View File
@@ -38,14 +38,7 @@
<a class="dismiss">🗙</a>
</div>
@*<script src="_content/ZXingBlazor/lib/barcodereader/zxing.js"></script>
<script src="_content/ZXingBlazor/lib/barcodereader/barcode.js"></script>*@
@*<script src="_content/ZXingBlazor/lib/barcodereader/zxing.js"></script>*@
@*<script src="_content/ZXingBlazor/lib/zxing/zxing.min.js"></script>
<script src="MP/TAB3/_content/ZXingBlazor/lib/zxing/zxing.min.js"></script>*@
@*<script src="_content/ZXingBlazor/lib/barcodereader/barcode.js"></script>*@
<script src="~/lib//BarcodeReade.razor.js"></script>
<script src="lib/WindowSize.js"></script>
<script src="lib/bootstrap/js/bootstrap.bundle.js"></script>
<script src="_framework/blazor.server.js"></script>
MP-TAB-SERV/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2312.1215</h4>
<h4>Versione: 6.16.2312.1216</h4>
<br /> Note di rilascio:
<ul>
<li>
MP-TAB-SERV/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2312.1215
6.16.2312.1216
MP-TAB-SERV/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2312.1215</version>
<version>6.16.2312.1216</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>
MP-TAB-SERV/Shared/MainLayout.razor.cs
+31 -6
View File
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Components.Routing;
using Microsoft.JSInterop;
using MP.Data.DatabaseModels;
using MP.Data.Services;
using MP_TAB_SERV.Components;
using NLog;
namespace MP_TAB_SERV.Shared
@@ -65,14 +66,24 @@ namespace MP_TAB_SERV.Shared
protected string bodyTipe
{
get => NavMan.Uri.Contains("reg-new-device") ? "mainBodyNoSide" : "mainBody";
get => pageOk ? "mainBodyNoSide" : "mainBody";
}
protected bool pageOk
{
get
{
string currPage = NavMan.Uri;
return currPage.Contains("logout") || currPage.Contains("reg-new-device");
}
}
protected async Task handleBodyClick()
{
await Task.Delay(1);
if (!NavMan.Uri.Contains("reg-new-device"))
MsgServ.dtLastAction = DateTime.Now;
if (!pageOk)
{
await checkDtDiff2Logout();
}
@@ -87,29 +98,43 @@ namespace MP_TAB_SERV.Shared
protected async Task checkDtDiff2Logout()
{
var diffOfTime = DateTime.Now - MsgServ.dtLastAction;
TimeSpan tsDeltaAct = DateTime.Now.Subtract(MsgServ.dtLastAction);
TimeSpan tsDeltaSave = DateTime.Now.Subtract(MsgServ.dtLastSave);
switch (typeScadLogin)
{
case 0:
if (diffOfTime.Minutes >= dtScadLogin)
if (tsDeltaAct.Minutes >= dtScadLogin)
{
NavMan.NavigateTo("logout");
}
break;
case 1:
if (diffOfTime.Minutes >= dtScadLogin)
if (tsDeltaAct.Minutes >= dtScadLogin)
{
var userTkn = await TDataService.OperatoreGetRedis(MatrOpr);
if (!string.IsNullOrEmpty(userTkn))
{
await MsgServ.DoLogIn(userTkn);
MsgServ.dtLastAction = DateTime.Now;
MsgServ.dtLastSave = DateTime.Now;
}
else
{
NavMan.NavigateTo("logout");
}
}
else
{
// se fosse oltre mezzo periodo da ultimo save --> salvo!
if (tsDeltaSave.TotalMinutes > dtScadLogin * 0.8)
{
var userTkn = await TDataService.OperatoreGetRedis(MatrOpr);
if (!string.IsNullOrEmpty(userTkn))
{
await MsgServ.DoLogIn(userTkn);
MsgServ.dtLastSave = DateTime.Now;
}
}
}
break;
}
}
MP.Data/Services/MessageService.cs
+1
View File
@@ -119,6 +119,7 @@ namespace MP.Data.Services
}
public DateTime dtLastAction { get; set; } = DateTime.Now;
public DateTime dtLastSave { get; set; } = DateTime.Now;
public int MatrOpr
{