remove IHttpContextAccessor (#33)

* remove IHttpContextAccessor

* add package updates

* add year update and run code cleanup

* add version bump to 2.0 due to breaking changes

* fix test helper project

* Update src/MyCSharp.HttpUserAgentParser/HttpContextExtensions.cs

Co-authored-by: Günther Foidl <[email protected]>

* add PR feedback

* remove year from header line

Co-authored-by: Günther Foidl <[email protected]>

Author: BenjaminAbt

.editorconfig

@@ -19,7 +19,7 @@ trim_trailing_whitespace = true
 # C# files
 [*.cs]
 
-file_header_template = Copyright © myCSharp 2020-2021, all rights reserved
+file_header_template = Copyright © myCSharp.de - all rights reserved
 
 #### .NET Coding Conventions ####
 

MyCSharp.HttpUserAgentParser.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31306.274
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.32804.182
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{008A2BAB-78B4-42EB-A5D4-DE434438CEF0}"
 EndProject
@@ -35,6 +35,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{FAAD18A0-E
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyCSharp.HttpUserAgentParser.Benchmarks", "perf\MyCSharp.HttpUserAgentParser.Benchmarks\MyCSharp.HttpUserAgentParser.Benchmarks.csproj", "{A0D213E9-6408-46D1-AFAF-5096C2F6E027}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCSharp.HttpUserAgentParser.TestHelpers", "tests\MyCSharp.HttpUserAgentParser.TestHelpers\MyCSharp.HttpUserAgentParser.TestHelpers.csproj", "{165EE915-1A4F-4875-90CE-1A2AE1540AE7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -69,6 +71,10 @@ Global
 		{A0D213E9-6408-46D1-AFAF-5096C2F6E027}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A0D213E9-6408-46D1-AFAF-5096C2F6E027}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A0D213E9-6408-46D1-AFAF-5096C2F6E027}.Release|Any CPU.Build.0 = Release|Any CPU
+		{165EE915-1A4F-4875-90CE-1A2AE1540AE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{165EE915-1A4F-4875-90CE-1A2AE1540AE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{165EE915-1A4F-4875-90CE-1A2AE1540AE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{165EE915-1A4F-4875-90CE-1A2AE1540AE7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -81,6 +87,7 @@ Global
 		{3C8CCD44-F47C-4624-8997-54C42F02E376} = {008A2BAB-78B4-42EB-A5D4-DE434438CEF0}
 		{39FC1EC2-2AD3-411F-A545-AB6CCB94FB7E} = {F54C9296-4EF7-40F0-9F20-F23A2270ABC9}
 		{A0D213E9-6408-46D1-AFAF-5096C2F6E027} = {FAAD18A0-E1B8-448D-B611-AFBDA8A89808}
+		{165EE915-1A4F-4875-90CE-1A2AE1540AE7} = {F54C9296-4EF7-40F0-9F20-F23A2270ABC9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E8B0C994-0BF2-4692-9E22-E48B265B2804}

perf/MyCSharp.HttpUserAgentParser.Benchmarks/HttpUserAgentParserBenchmarks.cs

@@ -1,4 +1,4 @@
-// Copyright © myCSharp 2020-2021, all rights reserved
+// Copyright © myCSharp.de - all rights reserved
 
 using System.Collections.Generic;
 using System.Linq;

perf/MyCSharp.HttpUserAgentParser.Benchmarks/LibraryComparison/LibraryComparisonBenchmarks.cs

@@ -1,4 +1,4 @@
-// Copyright © myCSharp 2020-2021, all rights reserved
+// Copyright © myCSharp.de - all rights reserved
 
 using System.Collections.Generic;
 using BenchmarkDotNet.Attributes;

perf/MyCSharp.HttpUserAgentParser.Benchmarks/MyCSharp.HttpUserAgentParser.Benchmarks.csproj

@@ -15,8 +15,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
-        <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.1" Condition="'$(OS)' == 'Windows_NT'" />
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
+        <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.2" Condition="'$(OS)' == 'Windows_NT'" />
     </ItemGroup>
 
     <ItemGroup>
@@ -26,7 +26,7 @@
     <ItemGroup Label="Libraries for comparison">
         <PackageReference Include="UAParser" Version="3.1.47" />
         <PackageReference Include="DeviceDetector.NET" Version="4.3.0" />
-        <PackageReference Include="Ng.UserAgentService" Version="1.0.3" />
+        <PackageReference Include="Ng.UserAgentService" Version="1.1.0" />
     </ItemGroup>
 
 </Project>

perf/MyCSharp.HttpUserAgentParser.Benchmarks/Program.cs

@@ -1,4 +1,4 @@
-// Copyright © myCSharp 2020-2021, all rights reserved
+// Copyright © myCSharp.de - all rights reserved
 
 using System.Reflection;
 using BenchmarkDotNet.Configs;

src/MyCSharp.HttpUserAgentParser.AspNetCore/DependencyInjection/HttpUserAgentParserDependencyInjectionOptionsExtensions.cs

@@ -1,4 +1,4 @@
-// Copyright © myCSharp 2020-2021, all rights reserved
+// Copyright © myCSharp.de - all rights reserved
 
 using Microsoft.Extensions.DependencyInjection;
 using MyCSharp.HttpUserAgentParser.DependencyInjection;

src/MyCSharp.HttpUserAgentParser.AspNetCore/HttpUserAgentParserAccessor.cs

@@ -1,4 +1,4 @@
-// Copyright © myCSharp 2020-2021, all rights reserved
+// Copyright © myCSharp.de - all rights reserved
 
 using Microsoft.AspNetCore.Http;
 using MyCSharp.HttpUserAgentParser.Providers;
@@ -13,41 +13,47 @@ public interface IHttpUserAgentParserAccessor
         /// <summary>
         /// User agent value
         /// </summary>
-        string HttpContextUserAgent { get; }
+        string? GetHttpContextUserAgent(HttpContext httpContext);
 
         /// <summary>
         /// Returns current <see cref="HttpUserAgentInformation"/>
         /// </summary>
-        HttpUserAgentInformation Get();
+        HttpUserAgentInformation? Get(HttpContext httpContext);
     }
 
     /// <summary>
     /// User Agent parser accessor. Implements <see cref="IHttpContextAccessor.HttpContext"/>
     /// </summary>
     public class HttpUserAgentParserAccessor : IHttpUserAgentParserAccessor
     {
-        private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IHttpUserAgentParserProvider _httpUserAgentParser;
 
         /// <summary>
         /// Creates a new instance of <see cref="HttpUserAgentParserAccessor"/>
         /// </summary>
-        public HttpUserAgentParserAccessor(IHttpContextAccessor httpContextAccessor, IHttpUserAgentParserProvider httpUserAgentParser)
+        public HttpUserAgentParserAccessor(IHttpUserAgentParserProvider httpUserAgentParser)
         {
-            _httpContextAccessor = httpContextAccessor;
             _httpUserAgentParser = httpUserAgentParser;
         }
 
         /// <summary>
         /// User agent of current <see cref="IHttpContextAccessor"/>
         /// </summary>
-        public string HttpContextUserAgent =>
-            _httpContextAccessor.HttpContext?.Request?.Headers["User-Agent"].ToString()!;
+        public string? GetHttpContextUserAgent(HttpContext httpContext)
+            => httpContext.GetUserAgentString();
 
         /// <summary>
         /// Returns current <see cref="HttpUserAgentInformation"/> of current <see cref="IHttpContextAccessor"/>
         /// </summary>
-        public HttpUserAgentInformation Get()
-            => _httpUserAgentParser.Parse(this.HttpContextUserAgent);
+        public HttpUserAgentInformation? Get(HttpContext httpContext)
+        {
+            string? httpUserAgent = GetHttpContextUserAgent(httpContext);
+            if (string.IsNullOrEmpty(httpUserAgent))
+            {
+                return null;
+            }
+
+            return _httpUserAgentParser.Parse(httpUserAgent);
+        }
     }
 }

src/MyCSharp.HttpUserAgentParser.MemoryCache/DependencyInjection/HttpUserAgentParserMemoryCacheServiceCollectionExtensions.cs

@@ -1,4 +1,4 @@
-// Copyright © myCSharp 2020-2021, all rights reserved
+// Copyright © myCSharp.de - all rights reserved
 
 using System;
 using Microsoft.Extensions.DependencyInjection;

src/MyCSharp.HttpUserAgentParser.MemoryCache/HttpUserAgentParserMemoryCachedProvider.cs

@@ -1,4 +1,4 @@
-// Copyright © myCSharp 2020-2021, all rights reserved
+// Copyright © myCSharp.de - all rights reserved
 
 using System;
 using Microsoft.Extensions.Caching.Memory;
@@ -9,7 +9,7 @@ namespace MyCSharp.HttpUserAgentParser.MemoryCache
     /// <inheritdoc/>
     public class HttpUserAgentParserMemoryCachedProvider : IHttpUserAgentParserProvider
     {
-        private readonly IMemoryCache _memoryCache;
+        private readonly Microsoft.Extensions.Caching.Memory.MemoryCache _memoryCache;
         private readonly HttpUserAgentParserMemoryCachedProviderOptions _options;
 
         /// <summary>