Egalware/limanapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/NewTicketUI

Browse Source
This commit is contained in:
marco.salvi
2022-02-09 12:49:31 +01:00
parent 450181bbd9 5d49772dba
commit 45c5de32a8
17 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LiMan.Transfer/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>License Manager</i>
<h4>Versione: 1.1.2202.0907</h4>
<h4>Versione: 1.1.2202.0912</h4>
<br />
Note di rilascio:
<ul>
LiMan.Transfer/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.1.2202.0907
1.1.2202.0912
LiMan.Transfer/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.1.2202.0907</version>
<version>1.1.2202.0912</version>
<url>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.Transfer.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
LiMan.UI/App.razor
+12 -10
View File
@@ -1,10 +1,12 @@
<Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">
<Found Context="routeData">
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
</Found>
<NotFound>
<LayoutView Layout="@typeof(MainLayout)">
<p>Sorry, there's nothing at this address.</p>
</LayoutView>
</NotFound>
</Router>
<CascadingAuthenticationState>
<Router AppAssembly="@typeof(Program).Assembly" PreferExactMatches="@true">
<Found Context="routeData">
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
</Found>
<NotFound>
<LayoutView Layout="@typeof(MainLayout)">
<p>Sorry, there's nothing at this address.</p>
</LayoutView>
</NotFound>
</Router>
</CascadingAuthenticationState>
LiMan.UI/Components/CmpTop.razor
+3 -1
View File
@@ -8,7 +8,9 @@
<div class="form-row pt-3">
<div class="col-7 col-md-6 col-lg-4 col-xl-3">
@*<LoginDisplay></LoginDisplay>*@
<AuthorizeView>
<LoginDisplay />
</AuthorizeView>
</div>
<div class="col-12 col-lg-4 col-xl-6 d-none d-lg-block text-center h4 text-truncate">
<span class="@PageIcon" aria-hidden="true"></span> @PageName
LiMan.UI/LiMan.UI.csproj
+2 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<Version>1.1.2202.0907</Version>
<Version>1.1.2202.0912</Version>
<RootNamespace>LiMan.UI</RootNamespace>
<AssemblyName>LiMan.UI</AssemblyName>
</PropertyGroup>
@@ -37,6 +37,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.Negotiate" Version="5.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
LiMan.UI/Pages/Applicazioni.razor
+1
View File
@@ -1,4 +1,5 @@
@page "/Applicazioni"
@attribute [Authorize]
@using LiMan.UI.Components
@using LiMan.UI.Data
LiMan.UI/Pages/Installazioni.razor
+1
View File
@@ -1,4 +1,5 @@
@page "/Installazioni"
@attribute [Authorize]
@using LiMan.UI.Components
@using LiMan.UI.Data
LiMan.UI/Pages/LiManDB.razor
+1
View File
@@ -1,4 +1,5 @@
@page "/LiManDB"
@attribute [Authorize]
@using LiMan.UI.Components
LiMan.UI/Pages/LiManGLS.razor
+1
View File
@@ -1,4 +1,5 @@
@page "/LiManGLS"
@attribute [Authorize]
@using LiMan.UI.Components
LiMan.UI/Pages/LicenseManager.razor
+1
View File
@@ -1,4 +1,5 @@
@page "/LicenseManager"
@attribute [Authorize]
@using LiMan.UI.Components
LiMan.UI/Pages/ListaTicket.razor
+1
View File
@@ -1,4 +1,5 @@
@page "/ListaTicket"
@attribute [Authorize]
@using LiMan.UI.Components
@using LiMan.UI.Data
LiMan.UI/Properties/launchSettings.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"windowsAuthentication": true,
"anonymousAuthentication": false,
"iisExpress": {
"applicationUrl": "http://localhost:61247",
"sslPort": 44392
LiMan.UI/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>License Manager</i>
<h4>Versione: 1.1.2202.0907</h4>
<h4>Versione: 1.1.2202.0912</h4>
<br />
Note di rilascio:
<ul>
LiMan.UI/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.1.2202.0907
1.1.2202.0912
LiMan.UI/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.1.2202.0907</version>
<version>1.1.2202.0912</version>
<url>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/LiMan.UI.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/LiMan/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
LiMan.UI/Startup.cs
+12
View File
@@ -16,6 +16,7 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Identity.UI.Services;
using Microsoft.Extensions.FileProviders;
using Microsoft.AspNetCore.Authentication.Negotiate;
using Microsoft.AspNetCore.Http;
namespace LiMan.UI
@@ -85,6 +86,9 @@ namespace LiMan.UI
app.UseRouting();
app.UseAuthentication();
app.UseAuthorization();
app.UseEndpoints(endpoints =>
{
endpoints.MapBlazorHub();
@@ -96,6 +100,14 @@ namespace LiMan.UI
// For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940
public void ConfigureServices(IServiceCollection services)
{
services.AddAuthentication(NegotiateDefaults.AuthenticationScheme)
.AddNegotiate();
services.AddAuthorization(options =>
{
// By default, all incoming requests will be authorized according to the default policy.
options.FallbackPolicy = options.DefaultPolicy;
});
// cookie applicazione da 14 gg (defaul) a 30
services.ConfigureApplicationCookie(o =>
{