From ed30f3dcc4633e756febac0a5f65d185df624ea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Michel?= <cedric.michel@outlook.be>
Date: Mon, 1 Nov 2021 15:35:26 +0100
Subject: [PATCH] fix bad redirection (#608)

* fix bad redirection
fix cleanning of local storage on startup

* update all nuget package

* avoid magic string
---
 src/ApplicationCore/ApplicationCore.csproj |  2 +-
 src/BlazorAdmin/Program.cs                 | 10 ++++++----
 src/Infrastructure/Infrastructure.csproj   |  2 +-
 src/PublicApi/PublicApi.csproj             |  2 +-
 src/Web/Controllers/ManageController.cs    |  2 +-
 src/Web/Web.csproj                         |  2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/ApplicationCore/ApplicationCore.csproj b/src/ApplicationCore/ApplicationCore.csproj
index 81cd750..15462bf 100644
--- a/src/ApplicationCore/ApplicationCore.csproj
+++ b/src/ApplicationCore/ApplicationCore.csproj
@@ -6,7 +6,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Ardalis.GuardClauses" Version="3.2.0" />
+		<PackageReference Include="Ardalis.GuardClauses" Version="3.3.0" />
 		<PackageReference Include="Ardalis.Specification" Version="5.2.0" />
 		<PackageReference Include="MediatR" Version="9.0.0" />
 		<PackageReference Include="System.Security.Claims" Version="4.3.0" />
diff --git a/src/BlazorAdmin/Program.cs b/src/BlazorAdmin/Program.cs
index e33aa75..042a275 100644
--- a/src/BlazorAdmin/Program.cs
+++ b/src/BlazorAdmin/Program.cs
@@ -1,6 +1,7 @@
 using BlazorAdmin.Services;
 using Blazored.LocalStorage;
 using BlazorShared;
+using BlazorShared.Models;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -27,13 +28,13 @@ namespace BlazorAdmin
 
             builder.Services.AddScoped<ToastService>();
             builder.Services.AddScoped<HttpService>();
-           
+
             builder.Services.AddBlazoredLocalStorage();
-           
+
             builder.Services.AddAuthorizationCore();
             builder.Services.AddScoped<AuthenticationStateProvider, CustomAuthStateProvider>();
             builder.Services.AddScoped(sp => (CustomAuthStateProvider)sp.GetRequiredService<AuthenticationStateProvider>());
-           
+
             builder.Services.AddBlazorServices();
 
             builder.Logging.AddConfiguration(builder.Configuration.GetSection("Logging"));
@@ -48,7 +49,8 @@ namespace BlazorAdmin
             var sp = services.BuildServiceProvider();
             var localStorageService = sp.GetRequiredService<ILocalStorageService>();
 
-            await localStorageService.RemoveItemAsync("brands");
+            await localStorageService.RemoveItemAsync(typeof(CatalogBrand).Name);
+            await localStorageService.RemoveItemAsync(typeof(CatalogType).Name);
         }
     }
 }
diff --git a/src/Infrastructure/Infrastructure.csproj b/src/Infrastructure/Infrastructure.csproj
index 1fe3dae..0b916f9 100644
--- a/src/Infrastructure/Infrastructure.csproj
+++ b/src/Infrastructure/Infrastructure.csproj
@@ -9,7 +9,7 @@
 		<PackageReference Include="Ardalis.Specification.EntityFrameworkCore" Version="5.2.0" />
 		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.11" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.11" />
-		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.13.1" />
+		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\ApplicationCore\ApplicationCore.csproj" />
diff --git a/src/PublicApi/PublicApi.csproj b/src/PublicApi/PublicApi.csproj
index 52b3257..7d99e41 100644
--- a/src/PublicApi/PublicApi.csproj
+++ b/src/PublicApi/PublicApi.csproj
@@ -29,7 +29,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.11.1" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.2" />
 
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.13.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Web/Controllers/ManageController.cs b/src/Web/Controllers/ManageController.cs
index 97036b8..c03f507 100644
--- a/src/Web/Controllers/ManageController.cs
+++ b/src/Web/Controllers/ManageController.cs
@@ -125,7 +125,7 @@ namespace Microsoft.eShopWeb.Web.Controllers
             await _emailSender.SendEmailConfirmationAsync(email, callbackUrl);
 
             StatusMessage = "Verification email sent. Please check your email.";
-            return RedirectToAction(nameof(Index));
+            return RedirectToAction(nameof(MyAccount));
         }
 
         [HttpGet]
diff --git a/src/Web/Web.csproj b/src/Web/Web.csproj
index 7416a4b..d016923 100644
--- a/src/Web/Web.csproj
+++ b/src/Web/Web.csproj
@@ -42,7 +42,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.13.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.14.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="wwwroot\fonts\" />