Remove nuget dependency and enable .net6

linkdotnet · linkdotnet · commit 7adf303ee10c · 2021-09-11T13:53:08.000+02:00
diff --git a/LinkDotNet.Blog.IntegrationTests/Web/Pages/BlogPostPageTests.cs b/LinkDotNet.Blog.IntegrationTests/Web/Pages/BlogPostPageTests.cs
@@ -1,12 +1,12 @@
 ﻿using System.Threading.Tasks;
-using Blazored.LocalStorage;
 using Blazored.Toast.Services;
 using Bunit;
 using Bunit.TestDoubles;
 using FluentAssertions;
 using LinkDotNet.Blog.TestUtilities;
 using LinkDotNet.Blog.Web.Pages;
 using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Shared.Services;
 using LinkDotNet.Domain;
 using LinkDotNet.Infrastructure.Persistence;
 using Microsoft.EntityFrameworkCore;
@@ -47,8 +47,8 @@ public async Task ShouldSubtractLikeOnEvent()
             using var ctx = new TestContext();
             var localStorage = new Mock<ILocalStorageService>();
             var hasLikedStorage = $"hasLiked/{publishedPost.Id}";
-            localStorage.Setup(l => l.ContainKeyAsync(hasLikedStorage, default)).ReturnsAsync(true);
-            localStorage.Setup(l => l.GetItemAsync<bool>(hasLikedStorage, default)).ReturnsAsync(true);
+            localStorage.Setup(l => l.ContainKeyAsync(hasLikedStorage)).ReturnsAsync(true);
+            localStorage.Setup(l => l.GetItemAsync<bool>(hasLikedStorage)).ReturnsAsync(true);
             ctx.JSInterop.Mode = JSRuntimeMode.Loose;
             RegisterComponents(ctx, localStorage.Object);
             ctx.AddTestAuthorization().SetAuthorized("s");
diff --git a/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs b/LinkDotNet.Blog.IntegrationTests/Web/Pages/IndexTests.cs
@@ -6,6 +6,7 @@
 using LinkDotNet.Blog.Web;
 using LinkDotNet.Blog.Web.Pages;
 using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Shared.Services;
 using LinkDotNet.Domain;
 using LinkDotNet.Infrastructure.Persistence;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchByTagTests.cs b/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchByTagTests.cs
@@ -5,7 +5,7 @@
 using FluentAssertions;
 using LinkDotNet.Blog.TestUtilities;
 using LinkDotNet.Blog.Web.Pages;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Shared.Services;
 using LinkDotNet.Domain;
 using LinkDotNet.Infrastructure.Persistence;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchTests.cs b/LinkDotNet.Blog.IntegrationTests/Web/Pages/SearchTests.cs
@@ -5,6 +5,7 @@
 using LinkDotNet.Blog.TestUtilities;
 using LinkDotNet.Blog.Web.Pages;
 using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Shared.Services;
 using LinkDotNet.Domain;
 using LinkDotNet.Infrastructure.Persistence;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs b/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs
@@ -7,6 +7,7 @@
 using LinkDotNet.Blog.TestUtilities;
 using LinkDotNet.Blog.Web;
 using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Shared.Services;
 using LinkDotNet.Domain;
 using LinkDotNet.Infrastructure.Persistence;
 using Microsoft.Extensions.DependencyInjection;
diff --git a/LinkDotNet.Blog.IntegrationTests/Web/StartupTests.cs b/LinkDotNet.Blog.IntegrationTests/Web/StartupTests.cs
@@ -1,7 +1,7 @@
 ﻿using FluentAssertions;
 using LinkDotNet.Blog.Web;
 using LinkDotNet.Blog.Web.Pages.Admin;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Shared.Services;
 using LinkDotNet.Domain;
 using LinkDotNet.Infrastructure.Persistence;
 using Microsoft.AspNetCore;
diff --git a/LinkDotNet.Blog.UnitTests/Web/Shared/LikeTests.cs b/LinkDotNet.Blog.UnitTests/Web/Shared/LikeTests.cs
@@ -1,8 +1,8 @@
-﻿using Blazored.LocalStorage;
-using Bunit;
+﻿using Bunit;
 using FluentAssertions;
 using LinkDotNet.Blog.TestUtilities;
 using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Shared.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using Xunit;
@@ -60,15 +60,15 @@ public void ShouldSetLocalStorageVariableOnClick()
 
             cut.Find("button").Click();
 
-            localStorage.Verify(l => l.SetItemAsync("hasLiked/id", true, default), Times.Once);
+            localStorage.Verify(l => l.SetItemAsync("hasLiked/id", true), Times.Once);
         }
 
         [Fact]
         public void ShouldCheckLocalStorageOnInit()
         {
             var localStorage = new Mock<ILocalStorageService>();
-            localStorage.Setup(l => l.ContainKeyAsync("hasLiked/id", default)).ReturnsAsync(true);
-            localStorage.Setup(l => l.GetItemAsync<bool>("hasLiked/id", default)).ReturnsAsync(true);
+            localStorage.Setup(l => l.ContainKeyAsync("hasLiked/id")).ReturnsAsync(true);
+            localStorage.Setup(l => l.GetItemAsync<bool>("hasLiked/id")).ReturnsAsync(true);
             Services.AddScoped(_ => localStorage.Object);
             var blogPost = new BlogPostBuilder().Build();
             blogPost.Id = "id";
@@ -93,8 +93,8 @@ public void ShouldCheckStorageOnClickAgainAndDoNothingOnMismatch()
             var cut = RenderComponent<Like>(
                 p => p.Add(l => l.BlogPost, blogPost)
                     .Add(l => l.OnBlogPostLiked, _ => wasClicked = true));
-            localStorage.Setup(l => l.ContainKeyAsync("hasLiked/id", default)).ReturnsAsync(true);
-            localStorage.Setup(l => l.GetItemAsync<bool>("hasLiked/id", default)).ReturnsAsync(true);
+            localStorage.Setup(l => l.ContainKeyAsync("hasLiked/id")).ReturnsAsync(true);
+            localStorage.Setup(l => l.GetItemAsync<bool>("hasLiked/id")).ReturnsAsync(true);
 
             cut.Find("button").Click();
 
diff --git a/LinkDotNet.Blog.UnitTests/Web/Shared/SortOrderCalculatorTests.cs b/LinkDotNet.Blog.UnitTests/Web/Shared/SortOrderCalculatorTests.cs
@@ -1,6 +1,6 @@
 ﻿using FluentAssertions;
 using LinkDotNet.Blog.TestUtilities;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Shared.Services;
 using Xunit;
 
 namespace LinkDotNet.Blog.UnitTests.Web.Shared
diff --git a/LinkDotNet.Blog.UnitTests/Web/Shared/UserRecordServiceTests.cs b/LinkDotNet.Blog.UnitTests/Web/Shared/UserRecordServiceTests.cs
@@ -1,10 +1,9 @@
 ﻿using System;
 using System.Threading.Tasks;
-using Blazored.LocalStorage;
 using Bunit;
 using Bunit.TestDoubles;
 using FluentAssertions;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Shared.Services;
 using LinkDotNet.Domain;
 using LinkDotNet.Infrastructure.Persistence;
 using Moq;
@@ -55,9 +54,9 @@ public async Task ShouldGetUserHashAgain()
         {
             UserRecord recordToDb = null;
             var guidForUser = Guid.NewGuid();
-            localStorageService.Setup(l => l.ContainKeyAsync("user", default))
+            localStorageService.Setup(l => l.ContainKeyAsync("user"))
                 .ReturnsAsync(true);
-            localStorageService.Setup(l => l.GetItemAsync<Guid>("user", default))
+            localStorageService.Setup(l => l.GetItemAsync<Guid>("user"))
                 .ReturnsAsync(guidForUser);
             repositoryMock.Setup(r => r.StoreAsync(It.IsAny<UserRecord>()))
                 .Callback<UserRecord>(u => recordToDb = u);
@@ -82,7 +81,7 @@ public async Task ShouldNotStoreForAdmin()
         [Fact]
         public async Task ShouldNotThrowExceptionToOutsideWorld()
         {
-            localStorageService.Setup(l => l.ContainKeyAsync("user", default)).Throws<Exception>();
+            localStorageService.Setup(l => l.ContainKeyAsync("user")).Throws<Exception>();
 
             Func<Task> act = () => sut.StoreUserRecordAsync();
 
diff --git a/LinkDotNet.Blog.Web/LinkDotNet.Blog.Web.csproj b/LinkDotNet.Blog.Web/LinkDotNet.Blog.Web.csproj
@@ -6,7 +6,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazored.LocalStorage" Version="4.1.5" />
         <PackageReference Include="Blazored.Toast" Version="3.1.2" />
         <PackageReference Include="Markdig" Version="0.26.0" />
         <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.9" />
diff --git a/LinkDotNet.Blog.Web/Pages/AboutMe.razor b/LinkDotNet.Blog.Web/Pages/AboutMe.razor
@@ -1,5 +1,6 @@
 ﻿@page "/AboutMe"
 @using LinkDotNet.Blog.Web.Shared.Skills
+@using LinkDotNet.Blog.Web.Shared.Services
 @inject AppConfiguration appConfiguration
 @inject AuthenticationStateProvider authenticationStateProvider
 @inject IUserRecordService userRecordService
diff --git a/LinkDotNet.Blog.Web/Pages/BlogPostPage.razor b/LinkDotNet.Blog.Web/Pages/BlogPostPage.razor
@@ -1,6 +1,7 @@
 @page "/blogPost/{blogPostId}"
 @using LinkDotNet.Domain
 @using LinkDotNet.Blog.Web.Shared.Admin
+@using LinkDotNet.Blog.Web.Shared.Services
 @using LinkDotNet.Infrastructure.Persistence
 @using Markdig
 @using Toolbelt.Blazor.HeadElement
diff --git a/LinkDotNet.Blog.Web/Pages/Index.razor b/LinkDotNet.Blog.Web/Pages/Index.razor
@@ -3,6 +3,7 @@
 @using LinkDotNet.Infrastructure.Persistence
 @using Markdig
 @using X.PagedList
+@using LinkDotNet.Blog.Web.Shared.Services
 @inject IRepository<BlogPost> blogPostRepository
 @inject AppConfiguration appConfiguration
 @inject NavigationManager navigationManager
diff --git a/LinkDotNet.Blog.Web/Pages/Search.razor b/LinkDotNet.Blog.Web/Pages/Search.razor
@@ -1,6 +1,7 @@
 ﻿@page "/search/{searchTerm}"
 @using LinkDotNet.Infrastructure.Persistence
 @using LinkDotNet.Domain
+@using LinkDotNet.Blog.Web.Shared.Services
 @inject IRepository<BlogPost> blogPostRepository
 @inject IUserRecordService userRecordService
 
diff --git a/LinkDotNet.Blog.Web/Pages/SearchByTag.razor b/LinkDotNet.Blog.Web/Pages/SearchByTag.razor
@@ -2,6 +2,7 @@
 @using LinkDotNet.Domain
 @using LinkDotNet.Infrastructure.Persistence
 @using Toolbelt.Blazor.HeadElement
+@using LinkDotNet.Blog.Web.Shared.Services
 @inject IRepository<BlogPost> blogPostRepository
 @inject IUserRecordService userRecordService
 
diff --git a/LinkDotNet.Blog.Web/Shared/Like.razor b/LinkDotNet.Blog.Web/Shared/Like.razor
@@ -1,6 +1,6 @@
 ﻿@using LinkDotNet.Domain
-@using Blazored.LocalStorage
 @using LinkDotNet.Infrastructure.Persistence
+@using LinkDotNet.Blog.Web.Shared.Services
 @inject ILocalStorageService localStorage
 <div class="like-container">
     <small>@BlogPost.Likes @LikeText</small>
diff --git a/LinkDotNet.Blog.Web/Shared/Profile.razor b/LinkDotNet.Blog.Web/Shared/Profile.razor
@@ -1,5 +1,6 @@
 ﻿@using LinkDotNet.Domain
 @using LinkDotNet.Infrastructure.Persistence
+@using LinkDotNet.Blog.Web.Shared.Services
 @inherits MarkdownComponentBase
 
 @inject AppConfiguration appConfiguration
diff --git a/LinkDotNet.Blog.Web/Shared/Services/ISortOrderCalculator.cs b/LinkDotNet.Blog.Web/Shared/Services/ISortOrderCalculator.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections.Generic;
 using LinkDotNet.Domain;
 
-namespace LinkDotNet.Blog.Web.Shared
+namespace LinkDotNet.Blog.Web.Shared.Services
 {
     public interface ISortOrderCalculator
     {
diff --git a/LinkDotNet.Blog.Web/Shared/Services/LocalStorageService.cs b/LinkDotNet.Blog.Web/Shared/Services/LocalStorageService.cs
@@ -0,0 +1,40 @@
+﻿using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
+
+namespace LinkDotNet.Blog.Web.Shared.Services
+{
+    public interface ILocalStorageService
+    {
+        Task<bool> ContainKeyAsync(string key);
+
+        Task<T> GetItemAsync<T>(string key);
+
+        Task SetItemAsync<T>(string key, T value);
+    }
+
+
+    public class LocalStorageService : ILocalStorageService
+    {
+        private readonly ProtectedLocalStorage localStorage;
+
+        public LocalStorageService(ProtectedLocalStorage localStorage)
+        {
+            this.localStorage = localStorage;
+        }
+
+        public async Task<bool> ContainKeyAsync(string key)
+        {
+            return (await localStorage.GetAsync<object>(key)).Success;
+        }
+
+        public async Task<T> GetItemAsync<T>(string key)
+        {
+            return (await localStorage.GetAsync<T>(key)).Value;
+        }
+
+        public async Task SetItemAsync<T>(string key, T value)
+        {
+            await localStorage.SetAsync(key, value);
+        }
+    }
+}
diff --git a/LinkDotNet.Blog.Web/Shared/Services/SortOrderCalculator.cs b/LinkDotNet.Blog.Web/Shared/Services/SortOrderCalculator.cs
@@ -1,7 +1,7 @@
 ﻿using System.Collections.Generic;
 using LinkDotNet.Domain;
 
-namespace LinkDotNet.Blog.Web.Shared
+namespace LinkDotNet.Blog.Web.Shared.Services
 {
     public class SortOrderCalculator : ISortOrderCalculator
     {
diff --git a/LinkDotNet.Blog.Web/Shared/Services/UserRecordService.cs b/LinkDotNet.Blog.Web/Shared/Services/UserRecordService.cs
@@ -1,13 +1,12 @@
 ﻿using System;
 using System.Diagnostics;
 using System.Threading.Tasks;
-using Blazored.LocalStorage;
 using LinkDotNet.Domain;
 using LinkDotNet.Infrastructure.Persistence;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 
-namespace LinkDotNet.Blog.Web.Shared
+namespace LinkDotNet.Blog.Web.Shared.Services
 {
     public interface IUserRecordService
     {
diff --git a/LinkDotNet.Blog.Web/Startup.cs b/LinkDotNet.Blog.Web/Startup.cs
@@ -1,10 +1,9 @@
-using Blazored.LocalStorage;
 using Blazored.Toast;
 using LinkDotNet.Blog.Web.Authentication.Auth0;
 using LinkDotNet.Blog.Web.Authentication.Dummy;
 using LinkDotNet.Blog.Web.Pages.Admin;
 using LinkDotNet.Blog.Web.RegistrationExtensions;
-using LinkDotNet.Blog.Web.Shared;
+using LinkDotNet.Blog.Web.Shared.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
@@ -30,7 +29,6 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.AddRazorPages();
             services.AddServerSideBlazor();
-
             services.AddSingleton(service =>
                 AppConfigurationFactory.Create(service.GetService<IConfiguration>()));
 
@@ -60,8 +58,8 @@ public void ConfigureServices(IServiceCollection services)
              */
 
             services.AddBlazoredToast();
-            services.AddBlazoredLocalStorage();
             services.AddHeadElementHelper();
+            services.AddScoped<ILocalStorageService, LocalStorageService>();
             services.AddSingleton<ISortOrderCalculator, SortOrderCalculator>();
             services.AddScoped<IUserRecordService, UserRecordService>();
             services.AddScoped<IDashboardService, DashboardService>();
