Run Code Clean Up

daohainam · Nov 14, 2023 · 92d8bc3 · 92d8bc3
1 parent 7650daf
commit 92d8bc3
Show file tree

Hide file tree

Showing 243 changed files with 623 additions and 1,944 deletions.
diff --git a/Middleware/Authentication/AuthenticationMiddleware.cs b/Middleware/Authentication/AuthenticationMiddleware.cs
@@ -1,6 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 using MiniWebServer.MiniApp;
 using MiniWebServer.MiniApp.Authentication;
 

diff --git a/Middleware/Authentication/AuthenticationMiddlewareExtensions.cs b/Middleware/Authentication/AuthenticationMiddlewareExtensions.cs
@@ -2,11 +2,6 @@
 using Microsoft.Extensions.Logging;
 using MiniWebServer.MiniApp.Authentication;
 using MiniWebServer.MiniApp.Builders;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MiniWebServer.Authentication
 {

diff --git a/Middleware/Authentication/AuthenticationOptions.cs b/Middleware/Authentication/AuthenticationOptions.cs
@@ -1,11 +1,4 @@
-using MiniWebServer.MiniApp.Authentication;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MiniWebServer.Authentication
+namespace MiniWebServer.Authentication
 {
     public class AuthenticationOptions
     {

diff --git a/Middleware/Authentication/CookieAuthenticationOptions.cs b/Middleware/Authentication/CookieAuthenticationOptions.cs
@@ -1,23 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MiniWebServer.Authentication
+namespace MiniWebServer.Authentication
 {
     public class CookieAuthenticationOptions
     {
         public const string DefaultCookieName = ".miniWeb.UID";
 
-        public CookieAuthenticationOptions(string? cookieName = null) { 
+        public CookieAuthenticationOptions(string? cookieName = null)
+        {
             CookieName = cookieName ?? DefaultCookieName;
             if (CookieName.Length == 0)
             {
                 throw new ArgumentException(nameof(cookieName) + " cannot be empty");
             }
 
         }
-        public string CookieName { get; } 
+        public string CookieName { get; }
     }
 }
diff --git a/Middleware/Authentication/CookieAuthenticationService.cs b/Middleware/Authentication/CookieAuthenticationService.cs
@@ -4,12 +4,6 @@
 using MiniWebServer.Abstractions.Http;
 using MiniWebServer.MiniApp;
 using MiniWebServer.MiniApp.Authentication;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MiniWebServer.Authentication
 {
@@ -105,7 +99,7 @@ public Task SignInAsync(IMiniAppContext context, System.Security.Claims.ClaimsPr
 
         public Task SignOutAsync(IMiniAppContext context)
         {
-            var principal = context.User; 
+            var principal = context.User;
             if (principal == null)
                 return Task.CompletedTask;
 

diff --git a/Middleware/Authentication/CookieDefaults.cs b/Middleware/Authentication/CookieDefaults.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MiniWebServer.Authentication
+namespace MiniWebServer.Authentication
 {
     public sealed class CookieDefaults
     {

diff --git a/Middleware/Authentication/DefaultPrincipalKeyGenerator.cs b/Middleware/Authentication/DefaultPrincipalKeyGenerator.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Principal;
-using System.Text;
-using System.Threading.Tasks;
+using System.Security.Principal;
 
 namespace MiniWebServer.Authentication
 {

diff --git a/Middleware/Authentication/IPrincipalKeyGenerator.cs b/Middleware/Authentication/IPrincipalKeyGenerator.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Principal;
-using System.Text;
-using System.Threading.Tasks;
+using System.Security.Principal;
 
 namespace MiniWebServer.Authentication
 {

diff --git a/Middleware/Authentication/IPrincipalStore.cs b/Middleware/Authentication/IPrincipalStore.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
+using System.Security.Claims;
 
 namespace MiniWebServer.Authentication
 {

diff --git a/Middleware/Authentication/JwtAuthenticationOptions.cs b/Middleware/Authentication/JwtAuthenticationOptions.cs
@@ -1,9 +1,4 @@
 using Microsoft.IdentityModel.Tokens;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MiniWebServer.Authentication
 {

diff --git a/Middleware/Authentication/JwtAuthenticationService.cs b/Middleware/Authentication/JwtAuthenticationService.cs
@@ -1,19 +1,12 @@
-using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.IdentityModel.Logging;
+using Microsoft.IdentityModel.Tokens;
 using MiniWebServer.MiniApp;
 using MiniWebServer.MiniApp.Authentication;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.IdentityModel.Tokens.Jwt;
-using System.IO;
-using System.Net.Http.Headers;
-using Microsoft.IdentityModel.Tokens;
 using System.Security.Claims;
 using System.Security.Principal;
-using Microsoft.IdentityModel.Logging;
 
 namespace MiniWebServer.Authentication
 {
@@ -77,7 +70,8 @@ public async Task<AuthenticationResult> AuthenticateAsync(IMiniAppContext contex
                         }
                     }
                 }
-            } catch (Exception ex)
+            }
+            catch (Exception ex)
             {
                 logger.LogError(ex, "Error authenticating");
             }
@@ -102,7 +96,7 @@ private async Task<TokenValidationResult> ValidateAsync(string token, JwtSecurit
             if (tokenValidationParameters == null)
                 return new TokenValidationResult() { IsValid = false };
 
-            
+
             var result = await handler.ValidateTokenAsync(token, tokenValidationParameters);
 
             if (!result.IsValid)

diff --git a/Middleware/Authentication/JwtBearerDefaults.cs b/Middleware/Authentication/JwtBearerDefaults.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MiniWebServer.Authentication
+namespace MiniWebServer.Authentication
 {
     public sealed class JwtBearerDefaults
     {

diff --git a/Middleware/Authentication/MemoryPrincipalStore.cs b/Middleware/Authentication/MemoryPrincipalStore.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Concurrent;
 using System.Security.Claims;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MiniWebServer.Authentication
 {
@@ -14,8 +9,9 @@ public class MemoryPrincipalStore : IPrincipalStore
 
         public ClaimsPrincipal? GetPrincipal(string key)
         {
-            if (principals.TryGetValue(key, out ClaimsPrincipal? principal)) { 
-                return principal; 
+            if (principals.TryGetValue(key, out ClaimsPrincipal? principal))
+            {
+                return principal;
             }
 
             return null;

diff --git a/Middleware/Authorization/AuthorizationOptions.cs b/Middleware/Authorization/AuthorizationOptions.cs
@@ -1,10 +1,5 @@
 using MiniWebServer.MiniApp;
 using MiniWebServer.MiniApp.Authorization;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MiniWebServer.Authorization
 {

diff --git a/Middleware/Authorization/IRouteMatcher.cs b/Middleware/Authorization/IRouteMatcher.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MiniWebServer.Authorization
+namespace MiniWebServer.Authorization
 {
     public interface IRouteMatcher
     {

diff --git a/Middleware/Authorization/RegExRouteMatcher.cs b/Middleware/Authorization/RegExRouteMatcher.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MiniWebServer.Authorization
+namespace MiniWebServer.Authorization
 {
     public class RegExRouteMatcher : IRouteMatcher
     {

diff --git a/Middleware/Authorization/RouteDictionaryExtensions.cs b/Middleware/Authorization/RouteDictionaryExtensions.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MiniWebServer.Authorization
+namespace MiniWebServer.Authorization
 {
     public static class RouteDictionaryExtensions
     {
@@ -16,14 +9,14 @@ public static void Add(this IDictionary<string, string[]> dictionary, string key
                 value
             };
 
-            if (values != null )
+            if (values != null)
             {
                 foreach (string v in values)
                 {
                     strings.Add(v);
                 }
             }
-            dictionary[key] = strings.ToArray(); 
+            dictionary[key] = strings.ToArray();
         }
     }
 }
diff --git a/Middleware/HstsMiddleware/HstsMiddleware.cs b/Middleware/HstsMiddleware/HstsMiddleware.cs
@@ -1,7 +1,4 @@
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using MiniWebServer.MiniApp;
-using MiniWebServer.MiniApp.Content;
+using MiniWebServer.MiniApp;
 using System.Text;
 
 namespace MiniWebServer.HstsMiddleware

diff --git a/Middleware/HstsMiddleware/HstsMiddlewareExtensions.cs b/Middleware/HstsMiddleware/HstsMiddlewareExtensions.cs
@@ -1,11 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using MiniWebServer.MiniApp.Builders;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MiniWebServer.HstsMiddleware
 {

diff --git a/Middleware/HstsMiddleware/HstsOptions.cs b/Middleware/HstsMiddleware/HstsOptions.cs
@@ -1,12 +1,4 @@
-using MiniWebServer.Abstractions;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MiniWebServer.HstsMiddleware
+namespace MiniWebServer.HstsMiddleware
 {
     public class HstsOptions
     {

diff --git a/Middleware/HttpsRedirection/HttpsRedirectionMiddleware.cs b/Middleware/HttpsRedirection/HttpsRedirectionMiddleware.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using MiniWebServer.MiniApp;
-using MiniWebServer.MiniApp.Content;
 
 namespace MiniWebServer.HttpsRedirection
 {

diff --git a/Middleware/HttpsRedirection/HttpsRedirectionMiddlewareExtensions.cs b/Middleware/HttpsRedirection/HttpsRedirectionMiddlewareExtensions.cs
@@ -1,11 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using MiniWebServer.MiniApp.Builders;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MiniWebServer.HttpsRedirection
 {

diff --git a/Middleware/HttpsRedirection/HttpsRedirectionOptions.cs b/Middleware/HttpsRedirection/HttpsRedirectionOptions.cs
@@ -1,9 +1,4 @@
 using MiniWebServer.Abstractions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MiniWebServer.HttpsRedirection
 {

diff --git a/Middleware/Mvc/CreateParameterValueResult.cs b/Middleware/Mvc/CreateParameterValueResult.cs
@@ -16,19 +16,21 @@ public static CreateParameterValueResult Success(object? value)
                 return successEmptyResult;
             }
 
-            return new CreateParameterValueResult { 
-                Value = value, IsCreated = true
+            return new CreateParameterValueResult
+            {
+                Value = value,
+                IsCreated = true
             };
         }
 
         public static CreateParameterValueResult Fail()
         {
-            return failResult; 
+            return failResult;
         }
 
 
         // we have some singleton values here to prevent alloc/free memory blocks
-        private static readonly CreateParameterValueResult failResult = new() 
+        private static readonly CreateParameterValueResult failResult = new()
         {
             Value = null,
             IsCreated = false

diff --git a/Middleware/Mvc/IActionFinder.cs b/Middleware/Mvc/IActionFinder.cs
@@ -1,10 +1,5 @@
 using MiniWebServer.MiniApp;
 using MiniWebServer.Mvc.Abstraction;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace MiniWebServer.Mvc
 {

diff --git a/Middleware/Mvc/IRouteMatcher.cs b/Middleware/Mvc/IRouteMatcher.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MiniWebServer.Mvc
+namespace MiniWebServer.Mvc
 {
     public interface IRouteMatcher
     {