rainxh11 · jeffward01 · Jan 11, 2023 · Jan 11, 2023
diff --git a/Revoke.NET.Akavache/AkavacheBlackList.cs b/Revoke.NET.Akavache/AkavacheBlackList.cs
@@ -39,7 +39,7 @@ public async Task<bool> IsRevoked(string key)
         try
         {
             await this._blackList.Vacuum();
-            var exist = await this._blackList.Get(key);
+            byte[] exist = await this._blackList.Get(key);
 
             return exist.Length > 0;
         }
@@ -63,7 +63,9 @@ public async Task<bool> Revoke(string key)
         }
     }
 
-    public async Task<bool> Revoke(string key, TimeSpan expireAfter)
+    public async Task<bool> Revoke(
+        string key,
+        TimeSpan expireAfter)
     {
         try
         {
@@ -77,7 +79,9 @@ public async Task<bool> Revoke(string key, TimeSpan expireAfter)
         }
     }
 
-    public async Task<bool> Revoke(string key, DateTime expireOn)
+    public async Task<bool> Revoke(
+        string key,
+        DateTime expireOn)
     {
         try
         {
@@ -91,7 +95,10 @@ public async Task<bool> Revoke(string key, DateTime expireOn)
         }
     }
 
-    public static async Task<IBlackList> CreateStoreAsync(string cacheName, IBlobCache blobCache, TimeSpan? defaultTtl = null)
+    public static async Task<IBlackList> CreateStoreAsync(
+        string cacheName,
+        IBlobCache blobCache,
+        TimeSpan? defaultTtl = null)
     {
         _defaultTtl = defaultTtl;
         Registrations.Start(cacheName);

diff --git a/Revoke.NET.Akavache/Revoke.NET.Akavache.csproj b/Revoke.NET.Akavache/Revoke.NET.Akavache.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0</TargetFrameworks>
+        <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>10.0</LangVersion>
         <PackageIcon>revoke.net.png</PackageIcon>
         <PackageReadmeFile>readme.md</PackageReadmeFile>
@@ -22,7 +21,6 @@
         <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
         <GenerateDocumentationFile>True</GenerateDocumentationFile>
     </PropertyGroup>
-
     <ItemGroup>
         <None Include="..\assets\revoke.net.png" Pack="true" PackagePath="\"/>
         <None Include="readme.md" Pack="true" PackagePath="\"/>

diff --git a/Revoke.NET.Akavache/RevokeService.cs b/Revoke.NET.Akavache/RevokeService.cs
@@ -22,7 +22,9 @@ public static IServiceCollection AddRevokeAkavacheInMemoryStore(this IServiceCol
                 .GetResult());
     }
 
-    public static IServiceCollection AddRevokeAkavacheStore(this IServiceCollection services, Func<IServiceProvider, IBlobCache> configBlobCache)
+    public static IServiceCollection AddRevokeAkavacheStore(
+        this IServiceCollection services,
+        Func<IServiceProvider, IBlobCache> configBlobCache)
     {
         return services.AddSingleton(
             provider => AkavacheBlackList.CreateStoreAsync("RevokeStore", configBlobCache(provider))

diff --git a/Revoke.NET.AspNetCore/Revoke.NET.AspNetCore.csproj b/Revoke.NET.AspNetCore/Revoke.NET.AspNetCore.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1</TargetFrameworks>
         <LangVersion>10.0</LangVersion>

diff --git a/Revoke.NET.AspNetCore/RevokeHttpMiddleware.cs b/Revoke.NET.AspNetCore/RevokeHttpMiddleware.cs
@@ -16,21 +16,28 @@ public class RevokeHttpMiddleware : IMiddleware
     private readonly Func<HttpResponse, Task<HttpResponse>>? _responseFunc;
 #nullable disable
 
-    public RevokeHttpMiddleware(IBlackList store, ILogger<RevokeHttpMiddleware> logger, Func<HttpContext, string> selector)
+    public RevokeHttpMiddleware(
+        IBlackList store,
+        ILogger<RevokeHttpMiddleware> logger,
+        Func<HttpContext, string> selector)
     {
         this._store = store;
         this._logger = logger;
         this._selector = selector;
     }
 
-    public RevokeHttpMiddleware(IBlackList store, Func<HttpContext, string> selector)
+    public RevokeHttpMiddleware(
+        IBlackList store,
+        Func<HttpContext, string> selector)
     {
         this._store = store;
         this._selector = selector;
     }
 
     public RevokeHttpMiddleware(
-        IBlackList store, ILogger<RevokeHttpMiddleware> logger, Func<HttpContext, string> selector,
+        IBlackList store,
+        ILogger<RevokeHttpMiddleware> logger,
+        Func<HttpContext, string> selector,
         Func<HttpResponse, Task<HttpResponse>> responseFunc)
     {
         this._store = store;
@@ -39,18 +46,23 @@ public RevokeHttpMiddleware(
         this._responseFunc = responseFunc;
     }
 
-    public RevokeHttpMiddleware(IBlackList store, Func<HttpContext, string> selector, Func<HttpResponse, Task<HttpResponse>> responseFunc)
+    public RevokeHttpMiddleware(
+        IBlackList store,
+        Func<HttpContext, string> selector,
+        Func<HttpResponse, Task<HttpResponse>> responseFunc)
     {
         this._store = store;
         this._selector = selector;
         this._responseFunc = responseFunc;
     }
 
-    public async Task InvokeAsync(HttpContext context, RequestDelegate next)
+    public async Task InvokeAsync(
+        HttpContext context,
+        RequestDelegate next)
     {
         try
         {
-            var revokeKey = this._selector(context);
+            string revokeKey = this._selector(context);
             if (revokeKey != null)
             {
                 if (await this._store.IsRevoked(revokeKey))
@@ -78,7 +90,7 @@ public async Task InvokeAsync(HttpContext context, RequestDelegate next)
         }
         catch (Exception ex)
         {
-            this._logger?.LogError("{ErrorMessage}",ex.Message);
+            this._logger?.LogError("{ErrorMessage}", ex.Message);
             await next(context);
         }
     }

diff --git a/Revoke.NET.AspNetCore/RevokeService.cs b/Revoke.NET.AspNetCore/RevokeService.cs
@@ -7,16 +7,19 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Primitives;
 
 public static class RevokeService
 {
-    public static IServiceCollection AddHttpContextRevokeMiddleware(this IServiceCollection services, Func<HttpContext, string> selector)
+    public static IServiceCollection AddHttpContextRevokeMiddleware(
+        this IServiceCollection services,
+        Func<HttpContext, string> selector)
     {
         return services.AddSingleton(
             provider =>
             {
-                var store = provider.GetService<IBlackList>();
-                var logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
+                IBlackList? store = provider.GetService<IBlackList>();
+                ILogger<RevokeHttpMiddleware>? logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
 
                 return new RevokeHttpMiddleware(store, logger, selector);
             });
@@ -32,13 +35,16 @@ public static IServiceCollection AddHttpContextRevokeMiddleware(this IServiceCol
     /// </param>
     /// <param name="responseFunc">custom response function</param>
     /// <returns></returns>
-    public static IServiceCollection AddHttpContextRevokeMiddleware(this IServiceCollection services, Func<HttpContext, string> selector, Func<HttpResponse, Task<HttpResponse>> responseFunc)
+    public static IServiceCollection AddHttpContextRevokeMiddleware(
+        this IServiceCollection services,
+        Func<HttpContext, string> selector,
+        Func<HttpResponse, Task<HttpResponse>> responseFunc)
     {
         return services.AddSingleton(
             provider =>
             {
-                var store = provider.GetService<IBlackList>();
-                var logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
+                IBlackList? store = provider.GetService<IBlackList>();
+                ILogger<RevokeHttpMiddleware>? logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
 
                 return new RevokeHttpMiddleware(store, logger, selector, responseFunc);
             });
@@ -51,12 +57,12 @@ public static IServiceCollection AddHttpContextRevokeMiddleware(this IServiceCol
     /// <returns></returns>
     public static IServiceCollection AddJWTBearerTokenRevokeMiddleware(this IServiceCollection services)
     {
-        var bearerTokenSelector = new Func<HttpContext, string>(
+        Func<HttpContext, string>? bearerTokenSelector = new Func<HttpContext, string>(
             context =>
             {
-                if (context.Request.Headers.TryGetValue("Authorization", out var authHeader))
+                if (context.Request.Headers.TryGetValue("Authorization", out StringValues authHeader))
                 {
-                    var jwtToken = AuthenticationHeaderValue.Parse(authHeader)
+                    string? jwtToken = AuthenticationHeaderValue.Parse(authHeader)
                         .Parameter;
                     if (jwtToken != null)
                     {
@@ -70,8 +76,8 @@ public static IServiceCollection AddJWTBearerTokenRevokeMiddleware(this IService
         return services.AddSingleton(
             provider =>
             {
-                var store = provider.GetService<IBlackList>();
-                var logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
+                IBlackList? store = provider.GetService<IBlackList>();
+                ILogger<RevokeHttpMiddleware>? logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
 
                 return new RevokeHttpMiddleware(store, logger, bearerTokenSelector);
             });
@@ -83,14 +89,16 @@ public static IServiceCollection AddJWTBearerTokenRevokeMiddleware(this IService
     /// <param name="services"></param>
     /// <param name="responseFunc">custom response function</param>
     /// <returns></returns>
-    public static IServiceCollection AddJWTBearerTokenRevokeMiddleware(this IServiceCollection services, Func<HttpResponse, Task<HttpResponse>> responseFunc)
+    public static IServiceCollection AddJWTBearerTokenRevokeMiddleware(
+        this IServiceCollection services,
+        Func<HttpResponse, Task<HttpResponse>> responseFunc)
     {
-        var bearerTokenSelector = new Func<HttpContext, string>(
+        Func<HttpContext, string>? bearerTokenSelector = new Func<HttpContext, string>(
             context =>
             {
-                if (context.Request.Headers.TryGetValue("Authorization", out var authHeader))
+                if (context.Request.Headers.TryGetValue("Authorization", out StringValues authHeader))
                 {
-                    var jwtToken = AuthenticationHeaderValue.Parse(authHeader)
+                    string? jwtToken = AuthenticationHeaderValue.Parse(authHeader)
                         .Parameter;
                     if (jwtToken != null)
                     {
@@ -104,8 +112,8 @@ public static IServiceCollection AddJWTBearerTokenRevokeMiddleware(this IService
         return services.AddSingleton(
             provider =>
             {
-                var store = provider.GetService<IBlackList>();
-                var logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
+                IBlackList? store = provider.GetService<IBlackList>();
+                ILogger<RevokeHttpMiddleware>? logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
 
                 return new RevokeHttpMiddleware(store, logger, bearerTokenSelector, responseFunc);
             });
@@ -118,13 +126,13 @@ public static IServiceCollection AddJWTBearerTokenRevokeMiddleware(this IService
     /// <returns></returns>
     public static IServiceCollection AddIpRevokeMiddleware(this IServiceCollection services)
     {
-        var ipSelector = new Func<HttpContext, string>(context => context.Request.Host.Host);
+        Func<HttpContext, string>? ipSelector = new Func<HttpContext, string>(context => context.Request.Host.Host);
 
         return services.AddSingleton(
             provider =>
             {
-                var store = provider.GetService<IBlackList>();
-                var logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
+                IBlackList? store = provider.GetService<IBlackList>();
+                ILogger<RevokeHttpMiddleware>? logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
 
                 return new RevokeHttpMiddleware(store, logger, ipSelector);
             });
@@ -136,15 +144,17 @@ public static IServiceCollection AddIpRevokeMiddleware(this IServiceCollection s
     /// <param name="services"></param>
     /// <param name="responseFunc">custom response function</param>
     /// <returns></returns>
-    public static IServiceCollection AddIpRevokeMiddleware(this IServiceCollection services, Func<HttpResponse, Task<HttpResponse>> responseFunc)
+    public static IServiceCollection AddIpRevokeMiddleware(
+        this IServiceCollection services,
+        Func<HttpResponse, Task<HttpResponse>> responseFunc)
     {
-        var ipSelector = new Func<HttpContext, string>(context => context.Request.Host.Host);
+        Func<HttpContext, string>? ipSelector = new Func<HttpContext, string>(context => context.Request.Host.Host);
 
         return services.AddSingleton(
             provider =>
             {
-                var store = provider.GetService<IBlackList>();
-                var logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
+                IBlackList? store = provider.GetService<IBlackList>();
+                ILogger<RevokeHttpMiddleware>? logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
 
                 return new RevokeHttpMiddleware(store, logger, ipSelector, responseFunc);
             });
@@ -157,13 +167,13 @@ public static IServiceCollection AddIpRevokeMiddleware(this IServiceCollection s
     /// <returns></returns>
     public static IServiceCollection AddUserIdRevokeMiddleware(this IServiceCollection services)
     {
-        var ipSelector = new Func<HttpContext, string>(context => context.Request.Host.Host);
+        Func<HttpContext, string>? ipSelector = new Func<HttpContext, string>(context => context.Request.Host.Host);
 
         return services.AddSingleton(
             provider =>
             {
-                var store = provider.GetService<IBlackList>();
-                var logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
+                IBlackList? store = provider.GetService<IBlackList>();
+                ILogger<RevokeHttpMiddleware>? logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
 
                 return new RevokeHttpMiddleware(store, logger, ipSelector);
             });
@@ -175,15 +185,17 @@ public static IServiceCollection AddUserIdRevokeMiddleware(this IServiceCollecti
     /// <param name="services"></param>
     /// <param name="responseFunc">custom response function</param>
     /// <returns></returns>
-    public static IServiceCollection AddUserIdRevokeMiddleware(this IServiceCollection services, Func<HttpResponse, Task<HttpResponse>> responseFunc)
+    public static IServiceCollection AddUserIdRevokeMiddleware(
+        this IServiceCollection services,
+        Func<HttpResponse, Task<HttpResponse>> responseFunc)
     {
-        var ipSelector = new Func<HttpContext, string>(context => context.Request.Host.Host);
+        Func<HttpContext, string>? ipSelector = new Func<HttpContext, string>(context => context.Request.Host.Host);
 
         return services.AddSingleton(
             provider =>
             {
-                var store = provider.GetService<IBlackList>();
-                var logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
+                IBlackList? store = provider.GetService<IBlackList>();
+                ILogger<RevokeHttpMiddleware>? logger = provider.GetService<ILogger<RevokeHttpMiddleware>>();
 
                 return new RevokeHttpMiddleware(store, logger, ipSelector, responseFunc);
             });

diff --git a/Revoke.NET.EasyCaching/EasyCachingBlackList.cs b/Revoke.NET.EasyCaching/EasyCachingBlackList.cs
@@ -9,13 +9,17 @@ internal class EasyCachingBlackList : IBlackList
     private readonly TimeSpan? _defaultTtl;
     private readonly IEasyCachingProvider _easyCaching;
 
-    public EasyCachingBlackList(IEasyCachingProvider easyCaching, TimeSpan? defaultTtl = null)
+    public EasyCachingBlackList(
+        IEasyCachingProvider easyCaching,
+        TimeSpan? defaultTtl = null)
     {
         this._defaultTtl = defaultTtl;
         this._easyCaching = easyCaching;
     }
 
-    public async Task<bool> Revoke(string key, TimeSpan expireAfter)
+    public async Task<bool> Revoke(
+        string key,
+        TimeSpan expireAfter)
     {
         try
         {
@@ -29,7 +33,9 @@ public async Task<bool> Revoke(string key, TimeSpan expireAfter)
         }
     }
 
-    public async Task<bool> Revoke(string key, DateTime expireOn)
+    public async Task<bool> Revoke(
+        string key,
+        DateTime expireOn)
     {
         try
         {

diff --git a/Revoke.NET.EasyCaching/Revoke.NET.EasyCaching.csproj b/Revoke.NET.EasyCaching/Revoke.NET.EasyCaching.csproj
@@ -1,5 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>10.0</LangVersion>
@@ -21,7 +20,6 @@
         <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
         <GenerateDocumentationFile>True</GenerateDocumentationFile>
     </PropertyGroup>
-
     <ItemGroup>
         <None Include="..\assets\revoke.net.png" Pack="true" PackagePath="\"/>
         <None Include="..\LICENSE" Pack="true" PackagePath="\"/>
@@ -31,9 +29,7 @@
     </ItemGroup>
     <Target DependsOnTargets="ResolveReferences" Name="CopyProjectReferencesToPackage">
         <ItemGroup>
-            <BuildOutputInPackage
-                    Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))"/>
+            <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference'))"/>
         </ItemGroup>
     </Target>
-
 </Project>