Run dotnet format (#1764)

src/Core/AssemblyInfo.cs

@@ -1,3 +1,3 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
 [assembly: InternalsVisibleTo("Core.Test")]

src/Core/Constants.cs

@@ -11,7 +11,7 @@
         public const long FileSize501mb = 501L * 1024L * 1024L;
     }
 
-    public static class TokenPurposes 
+    public static class TokenPurposes
     {
         public const string LinkSso = "LinkSso";
     }

src/Core/Context/CurrentContentOrganization.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Table;

src/Core/Context/CurrentContentProvider.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Bit.Core.Enums;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Data;

src/Core/Context/CurrentContext.cs

@@ -1,16 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Bit.Core.Models.Table;
-using Bit.Core.Enums;
-using Microsoft.AspNetCore.Http;
-using Bit.Core.Repositories;
-using System.Threading.Tasks;
 using System.Security.Claims;
+using System.Threading.Tasks;
+using Bit.Core.Enums;
 using Bit.Core.Enums.Provider;
-using Bit.Core.Utilities;
 using Bit.Core.Models.Data;
+using Bit.Core.Models.Table;
+using Bit.Core.Repositories;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Http;
 
 namespace Bit.Core.Context
 {
@@ -414,7 +414,7 @@ namespace Bit.Core.Context
             }
             return Organizations;
         }
-        
+
         public async Task<ICollection<CurrentContentProvider>> ProviderMembershipAsync(
             IProviderUserRepository providerUserRepository, Guid userId)
         {

src/Core/Enums/BitwardenClient.cs

@@ -1,6 +1,6 @@
-namespace Bit.Core.Enums
+namespace Bit.Core.Enums
 {
-    public static class BitwardenClient 
+    public static class BitwardenClient
     {
         public const string
             Web = "web",

src/Core/Enums/CipherStateAction.cs

@@ -1,9 +1,9 @@
-namespace Bit.Core.Enums
+namespace Bit.Core.Enums
 {
-      public enum CipherStateAction 
-      {
-         Restore,
-         SoftDelete,
-         HardDelete,
-      }
+    public enum CipherStateAction
+    {
+        Restore,
+        SoftDelete,
+        HardDelete,
+    }
 }

src/Core/Enums/EventType.cs

@@ -62,7 +62,7 @@
         Organization_DisabledKeyConnector = 1607,
 
         Policy_Updated = 1700,
-        
+
         ProviderUser_Invited = 1800,
         ProviderUser_Confirmed = 1801,
         ProviderUser_Updated = 1802,

src/Core/Enums/FileUploadType.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Enums
+namespace Bit.Core.Enums
 {
     public enum FileUploadType
     {

src/Core/Enums/PlanSponsorshipType.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Core.Enums
 {

src/Core/Enums/ProductType.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Core.Enums
 {

src/Core/Enums/SupportedDatabaseProviders.cs

@@ -1,6 +1,6 @@
-namespace Bit.Core.Enums
+namespace Bit.Core.Enums
 {
-    public enum SupportedDatabaseProviders 
+    public enum SupportedDatabaseProviders
     {
         SqlServer,
         MySql,

src/Core/Identity/AuthenticatorTokenProvider.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
-using Bit.Core.Models.Table;
 using Bit.Core.Enums;
-using OtpNet;
+using Bit.Core.Models.Table;
 using Bit.Core.Services;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
+using OtpNet;
 
 namespace Bit.Core.Identity
 {

src/Core/Identity/DuoWebTokenProvider.cs

@@ -1,13 +1,13 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
-using Bit.Core.Models.Table;
+using System;
+using System.Threading.Tasks;
 using Bit.Core.Enums;
-using Bit.Core.Utilities.Duo;
 using Bit.Core.Models;
-using System;
-using Microsoft.Extensions.DependencyInjection;
+using Bit.Core.Models.Table;
 using Bit.Core.Services;
 using Bit.Core.Settings;
+using Bit.Core.Utilities.Duo;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Bit.Core.Identity
 {

src/Core/Identity/EmailTokenProvider.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
-using Bit.Core.Models.Table;
 using Bit.Core.Enums;
-using Bit.Core.Services;
-using Microsoft.Extensions.DependencyInjection;
 using Bit.Core.Models;
+using Bit.Core.Models.Table;
+using Bit.Core.Services;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Bit.Core.Identity
 {

src/Core/Identity/OrganizationDuoWebTokenProvider.cs

@@ -1,9 +1,9 @@
 using System.Threading.Tasks;
-using Bit.Core.Models.Table;
 using Bit.Core.Enums;
-using Bit.Core.Utilities.Duo;
 using Bit.Core.Models;
+using Bit.Core.Models.Table;
 using Bit.Core.Settings;
+using Bit.Core.Utilities.Duo;
 
 namespace Bit.Core.Identity
 {

src/Core/Identity/ReadOnlyDatabaseIdentityUserStore.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
+using Microsoft.AspNetCore.Identity;
 
 namespace Bit.Core.Identity
 {

src/Core/Identity/ReadOnlyEnvIdentityUserStore.cs

@@ -48,7 +48,7 @@ namespace Bit.Core.Identity
             {
                 return Task.FromResult<IdentityUser>(null);
             }
-            
+
             return Task.FromResult(new IdentityUser
             {
                 Id = normalizedEmail,

src/Core/Identity/RoleStore.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
 using Bit.Core.Models.Table;
+using Microsoft.AspNetCore.Identity;
 
 namespace Bit.Core.Identity
 {

src/Core/Identity/TwoFactorRememberTokenProvider.cs

@@ -1,8 +1,8 @@
-using Microsoft.AspNetCore.Identity;
-using Bit.Core.Models.Table;
-using Microsoft.Extensions.Options;
+using Bit.Core.Models.Table;
 using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 namespace Bit.Core.Identity
 {

src/Core/Identity/U2fTokenProvider.cs

@@ -1,20 +1,20 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
-using Bit.Core.Models.Table;
-using Bit.Core.Enums;
-using Bit.Core.Models;
-using Bit.Core.Repositories;
-using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using U2fLib = U2F.Core.Crypto.U2F;
-using U2F.Core.Models;
-using U2F.Core.Exceptions;
-using U2F.Core.Utils;
-using System;
+using System.Threading.Tasks;
+using Bit.Core.Enums;
+using Bit.Core.Models;
+using Bit.Core.Models.Table;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
+using U2F.Core.Exceptions;
+using U2F.Core.Models;
+using U2F.Core.Utils;
+using U2fLib = U2F.Core.Crypto.U2F;
 
 namespace Bit.Core.Identity
 {

src/Core/Identity/UserStore.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
+using Bit.Core.Context;
 using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
-using Bit.Core.Context;
 using Bit.Core.Settings;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Bit.Core.Identity

src/Core/Identity/WebAuthnTokenProvider.cs

@@ -1,18 +1,18 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
-using Bit.Core.Models.Table;
-using Bit.Core.Enums;
-using Bit.Core.Models;
-using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System;
+using System.Threading.Tasks;
+using Bit.Core.Enums;
+using Bit.Core.Models;
+using Bit.Core.Models.Table;
 using Bit.Core.Services;
-using Microsoft.Extensions.DependencyInjection;
-using Fido2NetLib.Objects;
-using Fido2NetLib;
-using Bit.Core.Utilities;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
+using Fido2NetLib;
+using Fido2NetLib.Objects;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
 
 namespace Bit.Core.Identity
 {

src/Core/Identity/YubicoOtpTokenProvider.cs

@@ -1,13 +1,13 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
-using Bit.Core.Models.Table;
-using Bit.Core.Enums;
-using YubicoDotNetClient;
+using System;
 using System.Linq;
+using System.Threading.Tasks;
+using Bit.Core.Enums;
+using Bit.Core.Models.Table;
 using Bit.Core.Services;
 using Bit.Core.Settings;
-using System;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
+using YubicoDotNetClient;
 
 namespace Bit.Core.Identity
 {

src/Core/IdentityServer/ApiClient.cs

@@ -1,7 +1,7 @@
-using IdentityServer4.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Bit.Core.Settings;
+using IdentityServer4.Models;
 
 namespace Bit.Core.IdentityServer
 {

src/Core/IdentityServer/ApiResources.cs

@@ -1,6 +1,6 @@
-using IdentityModel;
+using System.Collections.Generic;
+using IdentityModel;
 using IdentityServer4.Models;
-using System.Collections.Generic;
 
 namespace Bit.Core.IdentityServer
 {

src/Core/IdentityServer/ApiScopes.cs

@@ -1,5 +1,5 @@
-using IdentityServer4.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using IdentityServer4.Models;
 
 namespace Bit.Core.IdentityServer
 {

src/Core/IdentityServer/BaseRequestValidator.cs

@@ -1,25 +1,25 @@
-using Bit.Core.Models.Table;
-using Bit.Core.Enums;
-using Bit.Core.Repositories;
-using IdentityServer4.Validation;
-using Microsoft.AspNetCore.Identity;
-using System;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Reflection;
 using System.Security.Claims;
 using System.Text.Json;
 using System.Threading.Tasks;
-using Bit.Core.Services;
-using System.Linq;
-using Bit.Core.Models;
-using Bit.Core.Identity;
-using Bit.Core.Models.Data;
-using Bit.Core.Utilities;
-using System.ComponentModel.DataAnnotations;
-using System.Reflection;
-using Microsoft.Extensions.Logging;
-using Bit.Core.Models.Api;
 using Bit.Core.Context;
+using Bit.Core.Enums;
+using Bit.Core.Identity;
+using Bit.Core.Models;
+using Bit.Core.Models.Api;
+using Bit.Core.Models.Data;
+using Bit.Core.Models.Table;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
+using IdentityServer4.Validation;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.Logging;
 
 namespace Bit.Core.IdentityServer
 {
@@ -319,7 +319,7 @@ namespace Bit.Core.IdentityServer
                         var orgPolicy = await _policyRepository.GetByOrganizationIdTypeAsync(userOrg.OrganizationId,
                             PolicyType.RequireSso);
                         // Owners and Admins are exempt from this policy
-                        if (orgPolicy != null && orgPolicy.Enabled && 
+                        if (orgPolicy != null && orgPolicy.Enabled &&
                             userOrg.Type != OrganizationUserType.Owner && userOrg.Type != OrganizationUserType.Admin)
                         {
                             return false;

src/Core/IdentityServer/ClientStore.cs

@@ -1,17 +1,17 @@
-using System.Linq;
-using IdentityServer4.Stores;
-using System.Threading.Tasks;
-using IdentityServer4.Models;
+using System;
 using System.Collections.Generic;
-using Bit.Core.Repositories;
-using System;
-using IdentityModel;
-using Bit.Core.Utilities;
+using System.Collections.ObjectModel;
+using System.Linq;
 using System.Security.Claims;
+using System.Threading.Tasks;
+using Bit.Core.Context;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
-using Bit.Core.Context;
-using System.Collections.ObjectModel;
+using Bit.Core.Utilities;
+using IdentityModel;
+using IdentityServer4.Models;
+using IdentityServer4.Stores;
 
 namespace Bit.Core.IdentityServer
 {
@@ -45,7 +45,7 @@ namespace Bit.Core.IdentityServer
             _userRepository = userRepository;
             _globalSettings = globalSettings;
             _staticClientStore = staticClientStore;
-            _licensingService = licensingService; 
+            _licensingService = licensingService;
             _currentContext = currentContext;
             _organizationUserRepository = organizationUserRepository;
             _providerUserRepository = providerUserRepository;
@@ -138,11 +138,11 @@ namespace Bit.Core.IdentityServer
                     var user = await _userRepository.GetByIdAsync(id);
                     if (user != null)
                     {
-                        var claims = new Collection<ClientClaim>() 
+                        var claims = new Collection<ClientClaim>()
                         {
                             new ClientClaim(JwtClaimTypes.Subject, user.Id.ToString()),
                             new ClientClaim(JwtClaimTypes.AuthenticationMethod, "Application", "external")
-                        }; 
+                        };
                         var orgs = await _currentContext.OrganizationMembershipAsync(_organizationUserRepository, user.Id);
                         var providers = await _currentContext.ProviderMembershipAsync(_providerUserRepository, user.Id);
                         var isPremium = await _licensingService.ValidateUserPremiumAsync(user);

src/Core/IdentityServer/ConfigureOpenIdConnectDistributedOptions.cs

@@ -1,10 +1,10 @@
 using System;
+using Bit.Core.Settings;
 using IdentityServer4.Configuration;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Caching.Redis;
 using Microsoft.Extensions.Options;
-using Bit.Core.Settings;
 
 namespace Bit.Core.IdentityServer
 {

src/Core/IdentityServer/CustomTokenRequestValidator.cs

@@ -1,21 +1,21 @@
 using System;
-using Bit.Core.Models.Table;
-using Bit.Core.Repositories;
-using IdentityServer4.Validation;
-using Microsoft.AspNetCore.Identity;
 using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Bit.Core.Services;
-using Bit.Core.Settings;
-using Bit.Core.Context;
 using System.Linq;
+using System.Security.Claims;
 using System.Text.Json;
+using System.Threading.Tasks;
+using Bit.Core.Context;
 using Bit.Core.Identity;
 using Bit.Core.Models.Data;
-using Microsoft.Extensions.Logging;
-using IdentityServer4.Extensions;
+using Bit.Core.Models.Table;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Bit.Core.Settings;
 using IdentityModel;
+using IdentityServer4.Extensions;
+using IdentityServer4.Validation;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.Logging;
 
 namespace Bit.Core.IdentityServer
 {
@@ -64,7 +64,7 @@ namespace Bit.Core.IdentityServer
 
         protected async override Task<(User, bool)> ValidateContextAsync(CustomTokenRequestValidationContext context)
         {
-            var email = context.Result.ValidatedRequest.Subject?.GetDisplayName() 
+            var email = context.Result.ValidatedRequest.Subject?.GetDisplayName()
                 ?? context.Result.ValidatedRequest.ClientClaims?.FirstOrDefault(claim => claim.Type == JwtClaimTypes.Email)?.Value;
             var user = string.IsNullOrWhiteSpace(email) ? null : await _userManager.FindByEmailAsync(email);
             return (user, user != null);
@@ -94,7 +94,8 @@ namespace Bit.Core.IdentityServer
             // Apikey login
             if (context.Result.ValidatedRequest.GrantType == "client_credentials")
             {
-                if (user.UsesKeyConnector) {
+                if (user.UsesKeyConnector)
+                {
                     // KeyConnectorUrl is configured in the CLI client, we just need to tell the client to use it
                     context.Result.CustomResponse["ApiUseKeyConnector"] = true;
                     context.Result.CustomResponse["ResetMasterPassword"] = false;
@@ -129,8 +130,8 @@ namespace Bit.Core.IdentityServer
             context.Result.CustomResponse = customResponse;
         }
 
-        protected override void SetSsoResult(CustomTokenRequestValidationContext context, 
-            Dictionary<string, object> customResponse) 
+        protected override void SetSsoResult(CustomTokenRequestValidationContext context,
+            Dictionary<string, object> customResponse)
         {
             context.Result.Error = "invalid_grant";
             context.Result.ErrorDescription = "Single Sign on required.";

src/Core/IdentityServer/DistributedCacheCookieManager.cs

@@ -22,7 +22,7 @@ namespace Bit.Core.IdentityServer
         {
             var id = Guid.NewGuid().ToString();
             var cacheKey = GetKey(key, id);
-            
+
             var expiresUtc = options.Expires ?? DateTimeOffset.UtcNow.AddMinutes(15);
             var cacheOptions = new DistributedCacheEntryOptions()
                 .SetAbsoluteExpiration(expiresUtc);

src/Core/IdentityServer/DistributedCacheTicketDataFormatter.cs

@@ -34,7 +34,7 @@ namespace Bit.Core.IdentityServer
 
             var options = new DistributedCacheEntryOptions();
             options.SetAbsoluteExpiration(expiresUtc);
-            
+
             var ticket = TicketSerializer.Default.Serialize(data);
             Cache.Set(cacheKey, ticket, options);
 

src/Core/IdentityServer/OidcIdentityClient.cs

@@ -1,7 +1,7 @@
-using IdentityServer4;
-using IdentityServer4.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Bit.Core.Settings;
+using IdentityServer4;
+using IdentityServer4.Models;
 
 namespace Bit.Core.IdentityServer
 {

src/Core/IdentityServer/ProfileService.cs

@@ -1,16 +1,16 @@
-using IdentityServer4.Services;
-using System.Threading.Tasks;
-using IdentityServer4.Models;
-using Bit.Core.Repositories;
-using Bit.Core.Services;
-using System.Security.Claims;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System;
-using IdentityModel;
-using Bit.Core.Utilities;
+using System.Security.Claims;
+using System.Threading.Tasks;
 using Bit.Core.Context;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
+using IdentityModel;
+using IdentityServer4.Models;
+using IdentityServer4.Services;
 
 namespace Bit.Core.IdentityServer
 {

src/Core/IdentityServer/ResourceOwnerPasswordValidator.cs

@@ -1,16 +1,16 @@
-using Bit.Core.Models.Table;
+using System.Collections.Generic;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Bit.Core.Context;
+using Bit.Core.Identity;
+using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Bit.Core.Settings;
+using Bit.Core.Utilities;
 using IdentityServer4.Models;
 using IdentityServer4.Validation;
 using Microsoft.AspNetCore.Identity;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Bit.Core.Services;
-using Bit.Core.Identity;
-using Bit.Core.Context;
-using Bit.Core.Settings;
-using Bit.Core.Utilities;
 using Microsoft.Extensions.Logging;
 
 namespace Bit.Core.IdentityServer

src/Core/IdentityServer/StaticClientStore.cs

@@ -1,8 +1,8 @@
-using IdentityServer4.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using Bit.Core.Settings;
 using Bit.Core.Enums;
+using Bit.Core.Settings;
+using IdentityServer4.Models;
 
 namespace Bit.Core.IdentityServer
 {

src/Core/IdentityServer/TokenRetrieval.cs

@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Http;
-using System;
+using System;
 using System.Linq;
+using Microsoft.AspNetCore.Http;
 
 namespace Bit.Core.IdentityServer
 {

src/Core/IdentityServer/VaultCorsPolicyService.cs

@@ -1,7 +1,7 @@
-using Bit.Core.Utilities;
-using IdentityServer4.Services;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
+using IdentityServer4.Services;
 
 namespace Bit.Core.IdentityServer
 {

src/Core/Jobs/BaseJobsHostedService.cs

@@ -4,12 +4,12 @@ using System.Collections.Specialized;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Bit.Core.Settings;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Quartz;
 using Quartz.Impl;
 using Quartz.Impl.Matchers;
-using Bit.Core.Settings;
 
 namespace Bit.Core.Jobs
 {

src/Core/Models/Api/Request/ICaptchaProtectedModel.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Models.Api
+namespace Bit.Core.Models.Api
 {
     public interface ICaptchaProtectedModel
     {

src/Core/Models/Api/Request/PushRegistrationRequestModel.cs

@@ -1,5 +1,5 @@
-using Bit.Core.Enums;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Api
 {

src/Core/Models/Api/Request/PushSendRequestModel.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Enums;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Collections.Generic;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Models.Api
 {

src/Core/Models/Api/Response/ErrorResponseModel.cs

@@ -1,5 +1,5 @@
-using System.Linq;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Linq;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
 namespace Bit.Core.Models.Api

src/Core/Models/Business/BillingInfo.cs

@@ -1,8 +1,8 @@
-using Bit.Core.Enums;
+using System;
+using System.Collections.Generic;
+using Bit.Core.Enums;
 using Bit.Core.Models.Table;
 using Stripe;
-using System;
-using System.Collections.Generic;
 
 namespace Bit.Core.Models.Business
 {

src/Core/Models/Business/ExpiringToken.cs

@@ -1,11 +1,11 @@
-using System;
+using System;
 
 namespace Bit.Core.Models.Business
 {
     public class ExpiringToken
     {
-        public readonly string Token; 
-        public readonly DateTime ExpirationDate; 
+        public readonly string Token;
+        public readonly DateTime ExpirationDate;
 
         public ExpiringToken(string token, DateTime expirationDate)
         {

src/Core/Models/Business/ImportedGroup.cs

@@ -1,5 +1,5 @@
-using Bit.Core.Models.Table;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using Bit.Core.Models.Table;
 
 namespace Bit.Core.Models.Business
 {

src/Core/Models/Business/OrganizationLicense.cs

@@ -1,14 +1,14 @@
-using Bit.Core.Enums;
-using Bit.Core.Models.Table;
-using Bit.Core.Services;
-using Bit.Core.Settings;
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Linq;
 using System.Reflection;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using Bit.Core.Enums;
+using Bit.Core.Models.Table;
+using Bit.Core.Services;
+using Bit.Core.Settings;
+using Newtonsoft.Json;
 
 namespace Bit.Core.Models.Business
 {

src/Core/Models/Business/OrganizationUserInvite.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Bit.Core.Models.Data;
 
 namespace Bit.Core.Models.Business
@@ -11,7 +11,7 @@ namespace Bit.Core.Models.Business
         public Permissions Permissions { get; set; }
         public IEnumerable<SelectionReadOnly> Collections { get; set; }
 
-        public OrganizationUserInvite() {}
+        public OrganizationUserInvite() { }
 
         public OrganizationUserInvite(OrganizationUserInviteData requestModel)
         {

src/Core/Models/Business/Provider/ProviderUserInvite.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Bit.Core.Enums.Provider;
 

src/Core/Models/Business/ReferenceEvent.cs

@@ -24,7 +24,7 @@ namespace Bit.Core.Models.Business
 
         [JsonConverter(typeof(StringEnumConverter))]
         public ReferenceEventType Type { get; set; }
-        
+
         [JsonConverter(typeof(StringEnumConverter))]
         public ReferenceEventSource Source { get; set; }
 

src/Core/Models/Business/SubscriptionCreateOptions.cs

@@ -1,6 +1,6 @@
+using System.Collections.Generic;
 using Bit.Core.Models.Table;
 using Stripe;
-using System.Collections.Generic;
 
 namespace Bit.Core.Models.Business
 {

src/Core/Models/Business/SubscriptionInfo.cs

@@ -1,7 +1,7 @@
-using Stripe;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using Stripe;
 
 namespace Bit.Core.Models.Business
 {

src/Core/Models/Business/SubscriptionUpdate.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Bit.Core.Models.Table;
 using Stripe;

src/Core/Models/Business/UserLicense.cs

@@ -1,12 +1,12 @@
-using Bit.Core.Models.Table;
-using Bit.Core.Services;
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Linq;
 using System.Reflection;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using Bit.Core.Models.Table;
+using Bit.Core.Services;
+using Newtonsoft.Json;
 
 namespace Bit.Core.Models.Business
 {

src/Core/Models/Data/CipherAttachment.cs

@@ -1,5 +1,5 @@
-using Newtonsoft.Json;
-using System;
+using System;
+using Newtonsoft.Json;
 
 namespace Bit.Core.Models.Data
 {

src/Core/Models/Data/EventMessage.cs

@@ -1,6 +1,6 @@
 using System;
-using Bit.Core.Enums;
 using Bit.Core.Context;
+using Bit.Core.Enums;
 using Bit.Core.Settings;
 
 namespace Bit.Core.Models.Data

src/Core/Models/Data/EventTableEntity.cs

@@ -143,7 +143,7 @@ namespace Bit.Core.Models.Data
             {
                 return $"OrganizationId={e.OrganizationId}";
             }
-            
+
             if (e.ProviderId.HasValue)
             {
                 return $"ProviderId={e.ProviderId}";

src/Core/Models/Data/GroupWithCollections.cs

@@ -1,4 +1,4 @@
-using System.Data;
+using System.Data;
 using Bit.Core.Models.Table;
 
 namespace Bit.Core.Models.Data

src/Core/Models/Data/OrganizationUserOrganizationDetails.cs

@@ -15,7 +15,7 @@ namespace Bit.Core.Models.Data
         public bool UseEvents { get; set; }
         public bool UseTotp { get; set; }
         public bool Use2fa { get; set; }
-        public bool UseApi{ get; set; }
+        public bool UseApi { get; set; }
         public bool UseResetPassword { get; set; }
         public bool SelfHost { get; set; }
         public bool UsersGetPremium { get; set; }

src/Core/Models/Data/OrganizationUserResetPasswordDetails.cs

@@ -12,12 +12,12 @@ namespace Bit.Core.Models.Data
             {
                 throw new ArgumentNullException(nameof(orgUser));
             }
-            
+
             if (user == null)
             {
                 throw new ArgumentNullException(nameof(user));
             }
-            
+
             if (org == null)
             {
                 throw new ArgumentNullException(nameof(org));

src/Core/Models/Data/OrganizationUserWithCollections.cs

@@ -1,4 +1,4 @@
-using System.Data;
+using System.Data;
 using Bit.Core.Models.Table;
 
 namespace Bit.Core.Models.Data

src/Core/Models/Data/Permissions.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace Bit.Core.Models.Data 
+namespace Bit.Core.Models.Data
 {
     public class Permissions
     {

src/Core/Models/Data/Provider/ProviderUserOrganizationDetails.cs

@@ -16,7 +16,7 @@ namespace Bit.Core.Models.Data
         public bool UseEvents { get; set; }
         public bool UseTotp { get; set; }
         public bool Use2fa { get; set; }
-        public bool UseApi{ get; set; }
+        public bool UseApi { get; set; }
         public bool UseResetPassword { get; set; }
         public bool SelfHost { get; set; }
         public bool UsersGetPremium { get; set; }

src/Core/Models/Data/SendOptionsPolicyData.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Core.Models.Data
 {

src/Core/Models/Data/SsoConfigurationData.cs

@@ -95,19 +95,19 @@ namespace Bit.Core.Models.Data
             .Where(c => !string.IsNullOrWhiteSpace(c))?
             .Select(c => c.Trim()) ??
             Array.Empty<string>();
-        
+
         public IEnumerable<string> GetAdditionalUserIdClaimTypes() => AdditionalUserIdClaimTypes?
             .Split(',')?
             .Where(c => !string.IsNullOrWhiteSpace(c))?
             .Select(c => c.Trim()) ??
             Array.Empty<string>();
-        
+
         public IEnumerable<string> GetAdditionalEmailClaimTypes() => AdditionalEmailClaimTypes?
             .Split(',')?
             .Where(c => !string.IsNullOrWhiteSpace(c))?
             .Select(c => c.Trim()) ??
             Array.Empty<string>();
-        
+
         public IEnumerable<string> GetAdditionalNameClaimTypes() => AdditionalNameClaimTypes?
             .Split(',')?
             .Where(c => !string.IsNullOrWhiteSpace(c))?

src/Core/Models/EntityFramework/Collection.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/CollectionCipher.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/CollectionGroup.cs

@@ -1,4 +1,4 @@
-using AutoMapper;
+using AutoMapper;
 
 namespace Bit.Core.Models.EntityFramework
 {

src/Core/Models/EntityFramework/CollectionUser.cs

@@ -1,4 +1,4 @@
-using AutoMapper;
+using AutoMapper;
 
 namespace Bit.Core.Models.EntityFramework
 {

src/Core/Models/EntityFramework/Device.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/EmergencyAccess.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/Event.cs

@@ -1,4 +1,4 @@
-using AutoMapper;
+using AutoMapper;
 
 namespace Bit.Core.Models.EntityFramework
 {

src/Core/Models/EntityFramework/Folder.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/Grant.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/Group.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/GroupUser.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/Installation.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/OrganizationUser.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/Policy.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/Provider/Provider.cs

@@ -1,4 +1,4 @@
-using AutoMapper;
+using AutoMapper;
 
 namespace Bit.Core.Models.EntityFramework.Provider
 {

src/Core/Models/EntityFramework/Provider/ProviderOrganization.cs

@@ -1,4 +1,4 @@
-using AutoMapper;
+using AutoMapper;
 
 namespace Bit.Core.Models.EntityFramework.Provider
 {

src/Core/Models/EntityFramework/Provider/ProviderUser.cs

@@ -1,4 +1,4 @@
-using AutoMapper;
+using AutoMapper;
 
 namespace Bit.Core.Models.EntityFramework.Provider
 {

src/Core/Models/EntityFramework/Role.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/Send.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/SsoConfig.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/SsoUser.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/TaxRate.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/Transaction.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/EntityFramework/U2f.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Text.Json;
 using AutoMapper;
 

src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseOfferExistingAccountViewModel.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Models.Mail.FamiliesForEnterprise
+namespace Bit.Core.Models.Mail.FamiliesForEnterprise
 {
     public class FamiliesForEnterpriseOfferExistingAccountViewModel : BaseMailModel
     {

src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseOfferNewAccountViewModel.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Models.Mail.FamiliesForEnterprise
+namespace Bit.Core.Models.Mail.FamiliesForEnterprise
 {
     public class FamiliesForEnterpriseOfferNewAccountViewModel : BaseMailModel
     {

src/Core/Models/Mail/FamiliesForEnterprise/FamiliesForEnterpriseSponsorshipRevertingViewModel.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Models.Mail.FamiliesForEnterprise
+namespace Bit.Core.Models.Mail.FamiliesForEnterprise
 {
     public class FamiliesForEnterpriseSponsorshipRevertingViewModel : BaseMailModel
     {

src/Core/Models/Mail/IMailQueueMessage.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace Bit.Core.Models.Mail
 {

src/Core/Models/Mail/MailQueueMessage.cs

@@ -1,6 +1,6 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
+using System.Collections.Generic;
 using Bit.Core.Utilities;
+using Newtonsoft.Json;
 
 namespace Bit.Core.Models.Mail
 {

src/Core/Models/Mail/OrganizationSeatsAutoscaledViewModel.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Bit.Core.Models.Mail
 {

src/Core/Models/Mail/OrganizationSeatsMaxReachedViewModel.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace Bit.Core.Models.Mail
 {

src/Core/Models/PushNotification.cs

@@ -1,6 +1,6 @@
-using Bit.Core.Enums;
-using System;
+using System;
 using System.Collections.Generic;
+using Bit.Core.Enums;
 
 namespace Bit.Core.Models
 {
@@ -12,7 +12,7 @@ namespace Bit.Core.Models
             Payload = payload;
             ContextId = contextId;
         }
-        
+
         public PushType Type { get; set; }
         public T Payload { get; set; }
         public string ContextId { get; set; }

src/Core/Models/StaticStore/SponsoredPlan.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 

src/Core/Models/Table/Cipher.cs

@@ -1,8 +1,8 @@
 using System;
-using Bit.Core.Utilities;
-using Bit.Core.Models.Data;
-using Newtonsoft.Json;
 using System.Collections.Generic;
+using Bit.Core.Models.Data;
+using Bit.Core.Utilities;
+using Newtonsoft.Json;
 
 namespace Bit.Core.Models.Table
 {