Cleanup of code

AuthPermissions.AspNetCore/AccessTenantData/IAccessTenantDataCookie.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 using AuthPermissions.AspNetCore.AccessTenantData.Services;

AuthPermissions.AspNetCore/AccessTenantData/ILinkToTenantDataService.cs

@@ -1,7 +1,6 @@
-// Copyright (c) 2022 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System.Threading.Tasks;
 using AuthPermissions.AspNetCore.AccessTenantData.Services;
 using AuthPermissions.BaseCode.CommonCode;
 using StatusGeneric;

AuthPermissions.AspNetCore/AccessTenantData/Services/AccessTenantDataCookie.cs

@@ -1,7 +1,6 @@
-// Copyright (c) 2022 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System;
 using Microsoft.AspNetCore.Http;
 
 namespace AuthPermissions.AspNetCore.AccessTenantData.Services;
@@ -11,11 +10,10 @@ namespace AuthPermissions.AspNetCore.AccessTenantData.Services;
 /// </summary>
 public class AccessTenantDataCookie : IAccessTenantDataCookie
 {
+    private const string CookieName = nameof(AccessTenantDataCookie);
     private readonly IRequestCookieCollection _cookiesIn;
     private readonly IResponseCookies _cookiesOut;
 
-    private const string CookieName = nameof(AccessTenantDataCookie);
-
     /// <summary>
     /// Takes in the <see cref="IHttpContextAccessor"/> to get the cookie in / out parts
     /// </summary>

AuthPermissions.AspNetCore/AccessTenantData/Services/LinkToTenantDataService.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 using AuthPermissions.AdminCode;
@@ -20,11 +20,11 @@ namespace AuthPermissions.AspNetCore.AccessTenantData.Services;
 public class LinkToTenantDataService : ILinkToTenantDataService
 {
     private readonly AuthPermissionsDbContext _context;
-    private readonly AuthPermissionsOptions _options;
     private readonly IAccessTenantDataCookie _cookieAccessor;
 
     private readonly IEncryptDecryptService _encryptorService;
     private readonly IDefaultLocalizer _localizeDefault;
+    private readonly AuthPermissionsOptions _options;
 
     /// <summary>
     /// Ctor

AuthPermissions.AspNetCore/GetDataKeyCode/GetDataKeyFromAppAndHierarchicalUsersAccessTenantData.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 using AuthPermissions.AspNetCore.AccessTenantData;

AuthPermissions.AspNetCore/GetDataKeyCode/GetDataKeyFromAppUserAccessTenantData.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 using AuthPermissions.AspNetCore.AccessTenantData;

AuthPermissions.AspNetCore/GetDataKeyCode/GetDataKeyFromUserNormal.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 using AuthPermissions.BaseCode.CommonCode;

AuthPermissions.AspNetCore/GetDataKeyCode/GetShardingDataAppAndHierarchicalUsersAccessTenantData.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 using AuthPermissions.AspNetCore.AccessTenantData;

AuthPermissions.AspNetCore/GetDataKeyCode/GetShardingDataUserAccessTenantData.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 using AuthPermissions.AspNetCore.AccessTenantData;

AuthPermissions.AspNetCore/GetDataKeyCode/GetShardingDataUserNormal.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 using AuthPermissions.AspNetCore.ShardingServices;

AuthPermissions.AspNetCore/GetDataKeyCode/IGetDataKeyFromUser.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 using AuthPermissions.BaseCode.DataLayer.EfCode;

AuthPermissions.AspNetCore/GetDataKeyCode/IGetShardingDataFromUser.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 namespace AuthPermissions.AspNetCore.GetDataKeyCode;
@@ -18,5 +18,4 @@ public interface IGetShardingDataFromUser
     /// If null, then use the default connection string as defined at the time when your application's DbContext was registered
     /// </summary>
     string ConnectionString { get; }
-
 }

AuthPermissions.AspNetCore/HasPermissionAttribute.cs

@@ -1,7 +1,6 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System;
 using AuthPermissions.BaseCode.CommonCode;
 using Microsoft.AspNetCore.Authorization;
 

AuthPermissions.AspNetCore/JwtTokenCode/ITokenBuilder.cs

@@ -1,8 +1,6 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System.Threading.Tasks;
-
 namespace AuthPermissions.AspNetCore.JwtTokenCode
 {
      /// <summary>

AuthPermissions.AspNetCore/JwtTokenCode/TokenAndRefreshToken.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 using System.ComponentModel.DataAnnotations;

AuthPermissions.AspNetCore/JwtTokenCode/TokenBuilder.cs

@@ -1,13 +1,9 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
-using System.Linq;
 using System.Security.Claims;
 using System.Text;
-using System.Threading.Tasks;
 using AuthPermissions.BaseCode;
 using AuthPermissions.BaseCode.CommonCode;
 using AuthPermissions.BaseCode.DataLayer.Classes;
@@ -23,10 +19,10 @@ namespace AuthPermissions.AspNetCore.JwtTokenCode
     /// </summary>
     public class TokenBuilder : ITokenBuilder
     {
-        private readonly AuthPermissionsOptions _options;
         private readonly IClaimsCalculator _claimsCalculator;
         private readonly AuthPermissionsDbContext _context;
         private readonly ILogger _logger;
+        private readonly AuthPermissionsOptions _options;
 
         /// <summary>
         /// 

AuthPermissions.AspNetCore/OpenIdCode/AzureAdEventSettings.cs

@@ -1,4 +1,7 @@
-using Microsoft.AspNetCore.Authentication.OpenIdConnect;
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Licensed under MIT license. See License.txt in the project root for license information.
+
+using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 
 namespace AuthPermissions.AspNetCore.OpenIdCode
 {
@@ -7,22 +10,6 @@ namespace AuthPermissions.AspNetCore.OpenIdCode
     /// </summary>
     public class AzureAdEventSettings
     {
-        /// <summary>
-        /// This provides a standard set of claim names when working with Azure AD
-        /// </summary>
-        /// <param name="authenticationSchemeName">Optional:
-        /// Needs to be that same as used in AddAuthentication call - defaults to <see cref="OpenIdConnectDefaults.AuthenticationScheme"/></param>
-        /// <returns>AzureAdEventSettings</returns>
-        public static AzureAdEventSettings AzureAdDefaultSettings(
-            string authenticationSchemeName = OpenIdConnectDefaults.AuthenticationScheme)
-        {
-            return new AzureAdEventSettings(
-                "http://schemas.microsoft.com/identity/claims/objectidentifier",
-                "preferred_username",
-                "name",
-                authenticationSchemeName);
-        }
-
         /// <summary>
         /// This lets you define the claim names in an OpenIDConnect to an Azure AD
         /// </summary>
@@ -43,18 +30,36 @@ public AzureAdEventSettings(string userIdClaimName, string emailClaimName, strin
         /// Contains the claim name holding the UserId
         /// </summary>
         public string UserIdClaimName { get; }
+
         /// <summary>
         /// Contains the claim name holding the user's email
         /// </summary>
         public string EmailClaimName { get; }
+
         /// <summary>
         /// Contains the claim name holding the user's name
         /// </summary>
         public string UsernameClaimName { get; }
+
         /// <summary>
         /// This holds the AuthenticationScheme Name
         /// </summary>
         public string AuthenticationSchemeName { get; }
 
+        /// <summary>
+        /// This provides a standard set of claim names when working with Azure AD
+        /// </summary>
+        /// <param name="authenticationSchemeName">Optional:
+        /// Needs to be that same as used in AddAuthentication call - defaults to <see cref="OpenIdConnectDefaults.AuthenticationScheme"/></param>
+        /// <returns>AzureAdEventSettings</returns>
+        public static AzureAdEventSettings AzureAdDefaultSettings(
+            string authenticationSchemeName = OpenIdConnectDefaults.AuthenticationScheme)
+        {
+            return new AzureAdEventSettings(
+                "http://schemas.microsoft.com/identity/claims/objectidentifier",
+                "preferred_username",
+                "name",
+                authenticationSchemeName);
+        }
     }
 }

AuthPermissions.AspNetCore/OpenIdCode/AzureAdOpenIdExtension.cs

@@ -1,7 +1,6 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System.Linq;
 using System.Security.Claims;
 using AuthPermissions.AdminCode;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;

AuthPermissions.AspNetCore/OpenIdCode/AzureAdOptions.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 namespace AuthPermissions.AspNetCore.OpenIdCode

AuthPermissions.AspNetCore/PolicyCode/AuthorizationPolicyProvider.cs

@@ -1,7 +1,6 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Options;
 

AuthPermissions.AspNetCore/PolicyCode/PermissionExtensions.cs

@@ -1,7 +1,6 @@
-// Copyright (c) 2022 GitHub: @idan-h
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-
 using Microsoft.AspNetCore.Builder;
 
 namespace AuthPermissions.AspNetCore.PolicyCode

AuthPermissions.AspNetCore/PolicyCode/PermissionPolicyHandler.cs

@@ -1,9 +1,6 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System;
-using System.Linq;
-using System.Threading.Tasks;
 using AuthPermissions.BaseCode;
 using AuthPermissions.BaseCode.PermissionsCode;
 using Microsoft.AspNetCore.Authorization;

AuthPermissions.AspNetCore/PolicyCode/PermissionRequirement.cs

@@ -1,7 +1,6 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System;
 using Microsoft.AspNetCore.Authorization;
 
 namespace AuthPermissions.AspNetCore.PolicyCode

AuthPermissions.AspNetCore/Services/AddPermissionsToUserClaims.cs

@@ -1,9 +1,7 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System.Runtime.InteropServices.ComTypes;
 using System.Security.Claims;
-using System.Threading.Tasks;
 using AuthPermissions.BaseCode.CommonCode;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;

AuthPermissions.AspNetCore/Services/DisableJwtRefreshToken.cs

@@ -1,9 +1,6 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System.Linq;
-using System.Threading.Tasks;
-using AuthPermissions.BaseCode;
 using AuthPermissions.BaseCode.CommonCode;
 using AuthPermissions.BaseCode.DataLayer.EfCode;
 using LocalizeMessagesAndErrors.UnitTestingCode;

AuthPermissions.AspNetCore/Services/IDisableJwtRefreshToken.cs

@@ -1,8 +1,6 @@
-// Copyright (c) 2022 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System.Threading.Tasks;
-
 namespace AuthPermissions.AspNetCore.Services;
 
 /// <summary>

AuthPermissions.AspNetCore/Services/IndividualAccountUserLookup.cs

@@ -1,7 +1,6 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System.Threading.Tasks;
 using AuthPermissions.BaseCode.SetupCode;
 using AuthPermissions.BulkLoadServices.Concrete;
 using Microsoft.AspNetCore.Identity;

AuthPermissions.AspNetCore/Services/SyncIndividualAccountUsers.cs

@@ -1,9 +1,6 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using AuthPermissions.AdminCode;
 using AuthPermissions.AdminCode.Services;
 using Microsoft.AspNetCore.Identity;

AuthPermissions.AspNetCore/SetupExtensions.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2021 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 using AuthPermissions.AdminCode;

AuthPermissions.AspNetCore/ShardingServices/ConnectionStringsOption.cs

@@ -6,4 +6,4 @@ namespace AuthPermissions.AspNetCore.ShardingServices;
 /// <summary>
 /// This is used to get all the connection strings in the appsettings file
 /// </summary>
-public class ConnectionStringsOption : Dictionary<string, string> { }
+public class ConnectionStringsOption : Dictionary<string, string> {}

AuthPermissions.AspNetCore/ShardingServices/DatabaseSpecificMethods/PostgresDatabaseSpecificMethods.cs

@@ -2,7 +2,6 @@
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 using System.ComponentModel;
-using AuthPermissions.BaseCode;
 using AuthPermissions.BaseCode.CommonCode;
 using AuthPermissions.BaseCode.SetupCode;
 using Medallion.Threading.Postgres;

AuthPermissions.AspNetCore/ShardingServices/DatabaseSpecificMethods/SqlServerDatabaseSpecificMethods.cs

@@ -2,7 +2,6 @@
 // Licensed under MIT license. See License.txt in the project root for license information.
 
 using System.ComponentModel;
-
 using AuthPermissions.BaseCode.CommonCode;
 using AuthPermissions.BaseCode.SetupCode;
 using Medallion.Threading.SqlServer;
@@ -16,7 +15,6 @@ namespace AuthPermissions.AspNetCore.ShardingServices.DatabaseSpecificMethods;
 /// </summary>
 public class SqlServerDatabaseSpecificMethods : IDatabaseSpecificMethods
 {
-
     /// <summary>
     /// This is used select the <see cref="IDatabaseSpecificMethods"/> from the AuthP's <see cref="SetupInternalData.AuthPDatabaseType"/>
     /// </summary>

AuthPermissions.AspNetCore/ShardingServices/DatabaseSpecificMethods/SqliteInMemorySpecificMethods.cs

@@ -1,5 +1,5 @@
-// // Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
-// // Licensed under MIT license. See License.txt in the project root for license information.
+// Copyright (c) 2023 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Licensed under MIT license. See License.txt in the project root for license information.
 
 using AuthPermissions.BaseCode;
 using AuthPermissions.BaseCode.CommonCode;