Refactor code and use some new C# 12 stuffs :)

daohainam · Dec 7, 2023 · ba1af65 · ba1af65
1 parent 989f769
commit ba1af65
Show file tree

Hide file tree

Showing 104 changed files with 286 additions and 746 deletions.
diff --git a/Middleware/Authentication/AuthenticationMiddleware.cs b/Middleware/Authentication/AuthenticationMiddleware.cs
@@ -4,15 +4,8 @@
 
 namespace MiniWebServer.Authentication
 {
-    public class AuthenticationMiddleware : IMiddleware
+    public class AuthenticationMiddleware(AuthenticationOptions options) : IMiddleware
     {
-        private readonly AuthenticationOptions options;
-
-        public AuthenticationMiddleware(AuthenticationOptions options)
-        {
-            this.options = options ?? new();
-        }
-
         public async Task InvokeAsync(IMiniAppRequestContext context, ICallable next, CancellationToken cancellationToken = default)
         {
             var authenticationServices = context.Services.GetServices<IAuthenticationService>();

diff --git a/Middleware/Authentication/CookieAuthenticationService.cs b/Middleware/Authentication/CookieAuthenticationService.cs
@@ -122,7 +122,7 @@ public Task SignOutAsync(IMiniAppRequestContext context)
             return Task.CompletedTask;
         }
 
-        protected Task<bool> IsValidAuthenticationCookieAsync(string cookieValue)
+        protected static Task<bool> IsValidAuthenticationCookieAsync(string cookieValue)
         {
             // todo: validate authentication cookie
             return Task.FromResult(false);

diff --git a/Middleware/Authentication/JwtAuthenticationOptions.cs b/Middleware/Authentication/JwtAuthenticationOptions.cs
@@ -2,13 +2,8 @@
 
 namespace MiniWebServer.Authentication
 {
-    public class JwtAuthenticationOptions
+    public class JwtAuthenticationOptions(TokenValidationParameters tokenValidationParameters)
     {
-        public JwtAuthenticationOptions(TokenValidationParameters tokenValidationParameters)
-        {
-            TokenValidationParameters = tokenValidationParameters ?? throw new ArgumentNullException(nameof(tokenValidationParameters));
-        }
-
-        public TokenValidationParameters TokenValidationParameters { get; }
+        public TokenValidationParameters TokenValidationParameters { get; } = tokenValidationParameters ?? throw new ArgumentNullException(nameof(tokenValidationParameters));
     }
 }
diff --git a/Middleware/Authentication/JwtAuthenticationService.cs b/Middleware/Authentication/JwtAuthenticationService.cs
@@ -59,7 +59,7 @@ public async Task<AuthenticationResult> AuthenticateAsync(IMiniAppRequestContext
                                 }
                             }
 
-                            context.User = new GenericPrincipal(result.ClaimsIdentity, roles.ToArray());
+                            context.User = new GenericPrincipal(result.ClaimsIdentity, [.. roles]);
                             //context.User = new GenericPrincipal(result.ClaimsIdentity, Array.Empty<string>());
 
                             return new AuthenticationResult(true, context.User);

diff --git a/Middleware/Authorization/AuthorizationMiddleware.cs b/Middleware/Authorization/AuthorizationMiddleware.cs
@@ -3,16 +3,9 @@
 
 namespace MiniWebServer.Authorization
 {
-    public class AuthorizationMiddleware : IMiddleware
+    public class AuthorizationMiddleware(AuthorizationOptions options, IRouteMatcher routeMatcher) : IMiddleware
     {
-        private readonly AuthorizationOptions options;
-        private readonly IRouteMatcher routeMatcher;
-
-        public AuthorizationMiddleware(AuthorizationOptions options, IRouteMatcher routeMatcher)
-        {
-            this.options = options ?? new();
-            this.routeMatcher = routeMatcher;
-        }
+        private readonly AuthorizationOptions options = options ?? new();
 
         public async Task InvokeAsync(IMiniAppRequestContext context, ICallable next, CancellationToken cancellationToken = default)
         {

diff --git a/Middleware/Authorization/AuthorizationOptions.cs b/Middleware/Authorization/AuthorizationOptions.cs
@@ -5,8 +5,8 @@ namespace MiniWebServer.Authorization
 {
     public class AuthorizationOptions
     {
-        private readonly Dictionary<string, IPolicy> policies = new();
-        private readonly Dictionary<string, string[]> routes = new();
+        private readonly Dictionary<string, IPolicy> policies = [];
+        private readonly Dictionary<string, string[]> routes = [];
 
         public IDictionary<string, IPolicy> Policies => policies;
         public IDictionary<string, string[]> Routes => routes;

diff --git a/Middleware/Authorization/RouteDictionaryExtensions.cs b/Middleware/Authorization/RouteDictionaryExtensions.cs
@@ -4,10 +4,10 @@ public static class RouteDictionaryExtensions
     {
         public static void Add(this IDictionary<string, string[]> dictionary, string key, string value, params string[]? values)
         {
-            List<string> strings = new()
-            {
+            List<string> strings =
+            [
                 value
-            };
+            ];
 
             if (values != null)
             {
@@ -16,7 +16,7 @@ public static void Add(this IDictionary<string, string[]> dictionary, string key
                     strings.Add(v);
                 }
             }
-            dictionary[key] = strings.ToArray();
+            dictionary[key] = [.. strings];
         }
     }
 }
diff --git a/Middleware/HstsMiddleware/HstsMiddleware.cs b/Middleware/HstsMiddleware/HstsMiddleware.cs
@@ -3,15 +3,8 @@
 
 namespace MiniWebServer.HstsMiddleware
 {
-    public class HstsMiddleware : IMiddleware
+    public class HstsMiddleware(HstsOptions options) : IMiddleware
     {
-        private readonly HstsOptions options;
-
-        public HstsMiddleware(HstsOptions options)
-        {
-            this.options = options;
-        }
-
         public async Task InvokeAsync(IMiniAppRequestContext context, ICallable next, CancellationToken cancellationToken = default)
         {
             StringBuilder sb = new();

diff --git a/Middleware/HttpsRedirection/HttpsRedirectionMiddleware.cs b/Middleware/HttpsRedirection/HttpsRedirectionMiddleware.cs
@@ -4,16 +4,9 @@
 
 namespace MiniWebServer.HttpsRedirection
 {
-    public class HttpsRedirectionMiddleware : IMiddleware
+    public class HttpsRedirectionMiddleware(HttpsRedirectionOptions options, ILogger<HttpsRedirectionMiddleware>? logger) : IMiddleware
     {
-        private readonly HttpsRedirectionOptions options;
-        private readonly ILogger<HttpsRedirectionMiddleware> logger;
-
-        public HttpsRedirectionMiddleware(HttpsRedirectionOptions options, ILogger<HttpsRedirectionMiddleware>? logger)
-        {
-            this.options = options;
-            this.logger = logger ?? NullLogger<HttpsRedirectionMiddleware>.Instance;
-        }
+        private readonly ILogger<HttpsRedirectionMiddleware> logger = logger ?? NullLogger<HttpsRedirectionMiddleware>.Instance;
 
         public async Task InvokeAsync(IMiniAppRequestContext context, ICallable next, CancellationToken cancellationToken = default)
         {

diff --git a/Middleware/Mvc/LocalAction/LocalAction.cs b/Middleware/Mvc/LocalAction/LocalAction.cs
@@ -2,17 +2,10 @@
 
 namespace MiniWebServer.Mvc.LocalAction
 {
-    internal class LocalAction
+    internal class LocalAction(string route, ActionInfo actionInfo, ActionMethods actionMethods = ActionMethods.All)
     {
-        public LocalAction(string route, ActionInfo actionInfo, ActionMethods actionMethods = ActionMethods.All)
-        {
-            Route = route ?? throw new ArgumentNullException(nameof(route));
-            ActionInfo = actionInfo ?? throw new ArgumentNullException(nameof(actionInfo));
-            ActionMethods = actionMethods;
-        }
-
-        public string Route { get; }
-        public ActionInfo ActionInfo { get; }
-        public ActionMethods ActionMethods { get; }
+        public string Route { get; } = route ?? throw new ArgumentNullException(nameof(route));
+        public ActionInfo ActionInfo { get; } = actionInfo ?? throw new ArgumentNullException(nameof(actionInfo));
+        public ActionMethods ActionMethods { get; } = actionMethods;
     }
 }
diff --git a/Middleware/Mvc/LocalAction/LocalActionFinder.cs b/Middleware/Mvc/LocalAction/LocalActionFinder.cs
@@ -4,16 +4,11 @@
 
 namespace MiniWebServer.Mvc.LocalAction
 {
-    internal class LocalActionFinder : IActionFinder
+    internal class LocalActionFinder(LocalActionRegistry registry, IRouteMatcher routeMatcher) : IActionFinder
     {
-        private readonly LocalActionRegistry registry;
-        private readonly IRouteMatcher routeMatcher;
+        private readonly LocalActionRegistry registry = registry ?? throw new ArgumentNullException(nameof(registry));
+        private readonly IRouteMatcher routeMatcher = routeMatcher ?? throw new ArgumentNullException(nameof(routeMatcher));
 
-        public LocalActionFinder(LocalActionRegistry registry, IRouteMatcher routeMatcher)
-        {
-            this.registry = registry ?? throw new ArgumentNullException(nameof(registry));
-            this.routeMatcher = routeMatcher ?? throw new ArgumentNullException(nameof(routeMatcher));
-        }
         public ActionInfo? Find(IMiniAppRequestContext context)
         {
             var key = registry.Actions.Keys.Where(k => routeMatcher.IsMatched(context.Request.Url, k)).FirstOrDefault();

diff --git a/Middleware/Mvc/MultipleServiceProvider.cs b/Middleware/Mvc/MultipleServiceProvider.cs
@@ -1,16 +1,7 @@
 namespace MiniWebServer.Mvc
 {
-    internal class MultipleServiceProvider : IServiceProvider
+    internal class MultipleServiceProvider(IServiceProvider parent1, params IServiceProvider[] parents) : IServiceProvider
     {
-        private readonly IServiceProvider parent1;
-        private readonly IServiceProvider[] parents;
-
-        public MultipleServiceProvider(IServiceProvider parent1, params IServiceProvider[] parents)
-        {
-            this.parent1 = parent1;
-            this.parents = parents;
-        }
-
         public object? GetService(Type serviceType)
         {
             object? service = parent1.GetService(serviceType);

diff --git a/Middleware/Mvc/MvcMiddleware.cs b/Middleware/Mvc/MvcMiddleware.cs
@@ -139,7 +139,7 @@ private async Task<bool> CallActionMethodAsync(IServiceProvider localServiceProv
                 }
             }
 
-            var actionResult = actionInfo.MethodInfo.Invoke(controller, actionParameterValues.ToArray());
+            var actionResult = actionInfo.MethodInfo.Invoke(controller, [.. actionParameterValues]);
             if (actionResult != null)
             {
                 // if this is an async function then we will call it asyncly
@@ -347,7 +347,7 @@ static public async Task<CreateParameterValueResult> TryCreateValueAsync(
                     {
                         // looking for a public static bool TryParse method
                         var tryParseMethod = parameterType.GetMethod("TryParse", BindingFlags.Public | BindingFlags.Static, null,
-                            new Type[] { typeof(string), parameterType.MakeByRefType() },
+                            [typeof(string), parameterType.MakeByRefType()],
                             null);
                         if (tryParseMethod != null && tryParseMethod.ReturnType == typeof(bool))
                         {

diff --git a/Middleware/Mvc/MvcOptions.cs b/Middleware/Mvc/MvcOptions.cs
@@ -1,12 +1,7 @@
 namespace MiniWebServer.Mvc
 {
-    public class MvcOptions
+    public class MvcOptions(IActionFinder actionFinder)
     {
-        public MvcOptions(IActionFinder actionFinder)
-        {
-            ActionFinder = actionFinder ?? throw new ArgumentNullException(nameof(actionFinder));
-        }
-
-        public IActionFinder ActionFinder { get; }
+        public IActionFinder ActionFinder { get; } = actionFinder ?? throw new ArgumentNullException(nameof(actionFinder));
     }
 }
diff --git a/Middleware/OutputCaching/OutputCachePolicy.cs b/Middleware/OutputCaching/OutputCachePolicy.cs
@@ -3,23 +3,14 @@
 
 namespace MiniWebServer.OutputCaching
 {
-    public class OutputCachePolicy : IOutputCachePolicy
+    public class OutputCachePolicy(Func<string, bool> pathMatching, IEnumerable<HttpMethod>? methods, IEnumerable<HttpResponseCodes>? httpResponseCodes = null, TimeSpan? expire = null) : IOutputCachePolicy
     {
-        public OutputCachePolicy(Func<string, bool> pathMatching, IEnumerable<HttpMethod>? methods, IEnumerable<HttpResponseCodes>? httpResponseCodes = null, TimeSpan? expire = null)
-        {
-            PathMatching = pathMatching ?? throw new ArgumentNullException(nameof(pathMatching));
+        public IEnumerable<HttpMethod> Methods { get; set; } = methods ?? DefaultHttpMethods;
+        public Func<string, bool> PathMatching { get; set; } = pathMatching ?? throw new ArgumentNullException(nameof(pathMatching));
+        public IEnumerable<HttpResponseCodes> HttpResponseCodes { get; set; } = httpResponseCodes ?? DefaultHttpResponseCodes;
+        public TimeSpan? Expire { get; set; } = expire;
 
-            Methods = methods ?? DefaultHttpMethods;
-            HttpResponseCodes = httpResponseCodes ?? DefaultHttpResponseCodes;
-            Expire = expire;
-        }
-
-        public IEnumerable<HttpMethod> Methods { get; set; }
-        public Func<string, bool> PathMatching { get; set; }
-        public IEnumerable<HttpResponseCodes> HttpResponseCodes { get; set; }
-        public TimeSpan? Expire { get; set; }
-
-        private static readonly HttpResponseCodes[] DefaultHttpResponseCodes = { Abstractions.HttpResponseCodes.OK };
-        private static readonly HttpMethod[] DefaultHttpMethods = { HttpMethod.Head, HttpMethod.Get };
+        private static readonly HttpResponseCodes[] DefaultHttpResponseCodes = [Abstractions.HttpResponseCodes.OK];
+        private static readonly HttpMethod[] DefaultHttpMethods = [HttpMethod.Head, HttpMethod.Get];
     }
 }
diff --git a/Middleware/OutputCaching/OutputCachePolicyBuilder.cs b/Middleware/OutputCaching/OutputCachePolicyBuilder.cs
@@ -5,8 +5,8 @@ namespace MiniWebServer.OutputCaching
     public class OutputCachePolicyBuilder : IOutputCachePolicyBuilder
     {
         private string? name;
-        private readonly List<HttpResponseCodes> httpResponseCodes = new();
-        private readonly List<Abstractions.Http.HttpMethod> methods = new();
+        private readonly List<HttpResponseCodes> httpResponseCodes = [];
+        private readonly List<Abstractions.Http.HttpMethod> methods = [];
         private TimeSpan? expire;
         private Func<string, bool>? pathMatching;
 
@@ -48,8 +48,8 @@ public IOutputCachePolicy Build()
         {
             var policy = new OutputCachePolicy(
                 pathMatching ?? (path => false),
-                methods.Any() ? methods : null, // null to use default values
-                httpResponseCodes.Any() ? httpResponseCodes : null,
+                methods.Count != 0 ? methods : null, // null to use default values
+                httpResponseCodes.Count != 0 ? httpResponseCodes : null,
                 expire
                 );
 

diff --git a/Middleware/Session/DistributedCacheSession.cs b/Middleware/Session/DistributedCacheSession.cs
@@ -11,7 +11,7 @@ public class DistributedCacheSession : ISession
     {
         private const string KeyPrefix = "_#M.S#_";
 
-        private readonly Dictionary<string, byte[]> localStore = new();
+        private readonly Dictionary<string, byte[]> localStore = [];
         private SpinLock spinLock = new(); // do not make it readonly, or .NET will create a new shadow instance to keep it immutable
         private readonly int waitTimeoutMs = 0;
 

diff --git a/Middleware/Session/SessionMiddleware.cs b/Middleware/Session/SessionMiddleware.cs
@@ -40,7 +40,7 @@ public async Task InvokeAsync(IMiniAppRequestContext context, ICallable next, Ca
                 }
                 else
                 {
-                    sessionId = null;
+                    //sessionId = null;
                 }
             }
             else // session key not found, create one

diff --git a/Middleware/Session/SessionOptions.cs b/Middleware/Session/SessionOptions.cs
@@ -1,14 +1,9 @@
 namespace MiniWebServer.Session
 {
-    public class SessionOptions
+    public class SessionOptions(string? sessionIdKey = default)
     {
         public const string DefaultSessionIdKey = ".miniWeb.SID";
 
-        public SessionOptions(string? sessionIdKey = default)
-        {
-            SessionIdKey = sessionIdKey ?? DefaultSessionIdKey;
-        }
-
-        public string SessionIdKey { get; } = DefaultSessionIdKey;
+        public string SessionIdKey { get; } = sessionIdKey ?? DefaultSessionIdKey;
     }
 }
diff --git a/Middleware/StaticFiles/StaticFilesCacheOptions.cs b/Middleware/StaticFiles/StaticFilesCacheOptions.cs
@@ -1,12 +1,7 @@
 namespace MiniWebServer.StaticFiles
 {
-    public class StaticFilesCacheOptions
+    public class StaticFilesCacheOptions(long maxAge)
     {
-        public StaticFilesCacheOptions(long maxAge)
-        {
-            MaxAge = maxAge;
-        }
-
-        public long MaxAge { get; }
+        public long MaxAge { get; } = maxAge;
     }
 }
diff --git a/Middleware/StaticFiles/StaticFilesMiddleware.cs b/Middleware/StaticFiles/StaticFilesMiddleware.cs
@@ -34,14 +34,14 @@ public async Task InvokeAsync(IMiniAppRequestContext context, ICallable next, Ca
 
             if (!url.Contains("..") && directoryInfo.Exists)
             {
-                if (url.StartsWith("/"))
+                if (url.StartsWith('/'))
                 {
                     url = url[1..];
                 }
                 url = url.Replace('/', Path.DirectorySeparatorChar);
 
                 FileInfo? file = null;
-                if (string.IsNullOrEmpty(url) && options.DefaultDocuments.Any())
+                if (string.IsNullOrEmpty(url) && options.DefaultDocuments.Length != 0)
                 {
                     foreach (var document in options.DefaultDocuments)
                     {
@@ -60,7 +60,7 @@ public async Task InvokeAsync(IMiniAppRequestContext context, ICallable next, Ca
                     {
                         var dir = new DirectoryInfo(file.FullName);
                         file = null;
-                        if (options.DefaultDocuments.Any() && dir.Exists)
+                        if (options.DefaultDocuments.Length != 0 && dir.Exists)
                         {
                             foreach (var document in options.DefaultDocuments)
                             {

diff --git a/Middleware/StaticFiles/StaticFilesOptions.cs b/Middleware/StaticFiles/StaticFilesOptions.cs
@@ -5,7 +5,7 @@ public class StaticFilesOptions
         public StaticFilesOptions(string? root = null, string[]? defaultDocuments = null, StaticFilesCacheOptions? cacheOptions = null, bool? useCompression = null, int? minimumFileSizeToCompress = null, int? compressionQuality = null, string[]? fileCompressionMimeTypes = null)
         {
             Root = root ?? "wwwroot";
-            DefaultDocuments = defaultDocuments ?? new string[] { "index.htm", "index.html" };
+            DefaultDocuments = defaultDocuments ?? ["index.htm", "index.html"];
             CacheOptions = cacheOptions ?? new StaticFilesCacheOptions(0);
             UseCompression = useCompression ?? true;
             MinimumFileSizeToCompress = minimumFileSizeToCompress ?? 1024;
@@ -14,12 +14,12 @@ public StaticFilesOptions(string? root = null, string[]? defaultDocuments = null
             {
                 throw new ArgumentOutOfRangeException(nameof(compressionQuality), "compressionQuality must be from 0 (no compression) to 11 (max compression)");
             }
-            FileCompressionMimeTypes = fileCompressionMimeTypes ?? new string[] {
+            FileCompressionMimeTypes = fileCompressionMimeTypes ?? [
                 "text/plain",
                 "text/html",
                 "text/css",
                 "text/javascript"
-            };
+            ];
         }
 
         public string Root { get; }
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                     else
                     {
-                        sessionId = null;
+                        //sessionId = null;
                     }
                 }
                 else // session key not found, create one
@@ Expand Down @@