Run dotnet format (#1764)

.gitattributes

@@ -1,3 +1,4 @@
 *.sh eol=lf
+*.cs eol=lf
 .dockerignore eol=lf
 dockerfile eol=lf

.github/workflows/build.yml

@@ -72,9 +72,9 @@ jobs:
         run: dotnet tool restore
         shell: pwsh
 
-      # - name: Verify Format
-      #   run: dotnet tool run dotnet-format --check
-      #   shell: pwsh
+      - name: Verify Format
+        run: dotnet tool run dotnet-format --check
+        shell: pwsh
 
       - name: Test OSS solution
         run: dotnet test ./test --configuration Debug --no-build

bitwarden_license/src/Sso/Controllers/AccountController.cs

@@ -1,8 +1,18 @@
-using Bit.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Bit.Core;
 using Bit.Core.Enums;
+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 Bit.Sso.Models;
 using Bit.Sso.Utilities;
 using IdentityModel;
@@ -11,20 +21,10 @@ using IdentityServer4.Extensions;
 using IdentityServer4.Services;
 using IdentityServer4.Stores;
 using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Logging;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Bit.Core.Models;
-using Bit.Core.Models.Api;
-using Bit.Core.Utilities;
-using Bit.Core.Models.Data;
-using Bit.Core.Settings;
+using Microsoft.Extensions.Logging;
 
 namespace Bit.Sso.Controllers
 {

bitwarden_license/src/Sso/Controllers/HomeController.cs

@@ -1,11 +1,11 @@
 using System;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Authorization;
-using IdentityServer4.Services;
+using System.Diagnostics;
 using System.Threading.Tasks;
 using Bit.Sso.Models;
-using System.Diagnostics;
+using IdentityServer4.Services;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Diagnostics;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Sso.Controllers
 {

bitwarden_license/src/Sso/Controllers/InfoController.cs

@@ -1,6 +1,6 @@
 using System;
-using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Sso.Controllers
 {

bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs

@@ -9,8 +9,8 @@ using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
-using Bit.Core.Utilities;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
 using Bit.Sso.Models;
 using Bit.Sso.Utilities;
 using IdentityModel;

bitwarden_license/src/Sso/Utilities/ExtendedOptionsMonitorCache.cs

@@ -1,6 +1,6 @@
-using Microsoft.Extensions.Options;
-using System;
+using System;
 using System.Collections.Concurrent;
+using Microsoft.Extensions.Options;
 
 namespace Bit.Sso.Utilities
 {

bitwarden_license/src/Sso/Utilities/ServiceCollectionExtensions.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using Bit.Core.Business.Sso;
 using Bit.Core.IdentityServer;
-using Bit.Core.Utilities;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
 using Bit.Sso.Models;
 using IdentityServer4.Models;
 using IdentityServer4.ResponseHandling;

bitwarden_license/test/CmmCore.Test/Services/ProviderServiceTests.cs

@@ -2,8 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Bit.CommCore.Test.AutoFixture.ProviderUserFixtures;
 using Bit.CommCore.Services;
+using Bit.CommCore.Test.AutoFixture.ProviderUserFixtures;
+using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
@@ -14,14 +15,13 @@ using Bit.Core.Models.Table.Provider;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Utilities;
+using Bit.Test.Common.AutoFixture;
+using Bit.Test.Common.AutoFixture.Attributes;
 using Microsoft.AspNetCore.DataProtection;
 using NSubstitute;
 using NSubstitute.ReturnsExtensions;
 using Xunit;
 using ProviderUser = Bit.Core.Models.Table.Provider.ProviderUser;
-using Bit.Core.Context;
-using Bit.Test.Common.AutoFixture;
-using Bit.Test.Common.AutoFixture.Attributes;
 
 namespace Bit.CommCore.Test.Services
 {

src/Admin/Controllers/ErrorController.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Diagnostics;
+using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Admin.Controllers

src/Admin/Controllers/HomeController.cs

@@ -1,10 +1,10 @@
 using System.Diagnostics;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Admin.Models;
-using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Settings;
 using System.Net.Http;
 using System.Threading.Tasks;
+using Bit.Admin.Models;
+using Bit.Core.Settings;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json.Linq;
 
 namespace Bit.Admin.Controllers

src/Admin/Controllers/InfoController.cs

@@ -1,6 +1,6 @@
 using System;
-using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Admin.Controllers
 {

src/Admin/Controllers/OrganizationsController.cs

@@ -1,16 +1,16 @@
 using System;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Repositories;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bit.Admin.Models;
-using System.Collections.Generic;
+using Bit.Core.Enums;
+using Bit.Core.Models.Business;
 using Bit.Core.Models.Table;
-using Bit.Core.Utilities;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
-using Bit.Core.Models.Business;
-using Bit.Core.Enums;
+using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Admin.Controllers
 {
@@ -143,7 +143,8 @@ namespace Bit.Admin.Controllers
             model.ToOrganization(organization);
             await _organizationRepository.ReplaceAsync(organization);
             await _applicationCacheService.UpsertOrganizationAbilityAsync(organization);
-            await _referenceEventService.RaiseEventAsync(new ReferenceEvent(ReferenceEventType.OrganizationEditedByAdmin, organization) {
+            await _referenceEventService.RaiseEventAsync(new ReferenceEvent(ReferenceEventType.OrganizationEditedByAdmin, organization)
+            {
                 EventRaisedByUser = _userService.GetUserName(User),
                 SalesAssistedTrialStarted = model.SalesAssistedTrialStarted,
             });

src/Admin/Controllers/UsersController.cs

@@ -1,14 +1,14 @@
 using System;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Repositories;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bit.Admin.Models;
-using System.Collections.Generic;
 using Bit.Core.Models.Table;
-using Bit.Core.Utilities;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Admin.Controllers
 {

src/Admin/HostedServices/AzureQueueBlockIpHostedService.cs

@@ -2,10 +2,10 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure.Storage.Queues;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Azure.Storage.Queues;
 
 namespace Bit.Admin.HostedServices
 {

src/Admin/HostedServices/AzureQueueMailHostedService.cs

@@ -1,18 +1,18 @@
-using System;
-using Microsoft.Extensions.Hosting;
-using Azure.Storage.Queues;
-using Microsoft.Extensions.Logging;
-using Bit.Core.Settings;
-using System.Threading.Tasks;
-using System.Threading;
-using Bit.Core.Services;
-using Newtonsoft.Json;
-using Bit.Core.Models.Mail;
-using Azure.Storage.Queues.Models;
-using System.Linq;
+using System;
 using System.Collections.Generic;
-using Newtonsoft.Json.Linq;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure.Storage.Queues;
+using Azure.Storage.Queues.Models;
+using Bit.Core.Models.Mail;
+using Bit.Core.Services;
+using Bit.Core.Settings;
 using Bit.Core.Utilities;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Bit.Admin.HostedServices
 {

src/Admin/Jobs/DeleteSendsJob.cs

@@ -1,6 +1,6 @@
 using System;
-using System.Threading.Tasks;
 using System.Linq;
+using System.Threading.Tasks;
 using Bit.Core;
 using Bit.Core.Context;
 using Bit.Core.Jobs;

src/Admin/Models/OrganizationEditModel.cs

@@ -5,8 +5,8 @@ using Bit.Core.Enums;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data;
 using Bit.Core.Models.Table;
-using Bit.Core.Utilities;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
 
 namespace Bit.Admin.Models
 {

src/Admin/Models/TaxRateAddEditModel.cs

@@ -1,4 +1,4 @@
-namespace Bit.Admin.Models
+namespace Bit.Admin.Models
 {
     public class TaxRateAddEditModel
     {

src/Admin/Models/TaxRatesModel.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Models.Table;
+using Bit.Core.Models.Table;
 
 namespace Bit.Admin.Models
 {

src/Admin/Models/UserEditModel.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Table;
-using Bit.Core.Utilities;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
 
 namespace Bit.Admin.Models
 {

src/Api/Controllers/AccountsController.cs

@@ -1,6 +1,14 @@
-using Bit.Api.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Bit.Api.Models.Request;
+using Bit.Api.Models.Request.Accounts;
+using Bit.Api.Models.Response;
+using Bit.Api.Utilities;
 using Bit.Core;
 using Bit.Core.Enums;
+using Bit.Core.Enums.Provider;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data;
@@ -11,14 +19,6 @@ using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Bit.Api.Models.Request;
-using Bit.Api.Models.Request.Accounts;
-using Bit.Api.Models.Response;
-using Bit.Core.Enums.Provider;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/CiphersController.cs

@@ -1,27 +1,27 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Repositories;
-using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Exceptions;
-using Bit.Core.Services;
-using Bit.Core.Context;
-using Bit.Core.Utilities;
-using Bit.Api.Utilities;
-using System.Collections.Generic;
-using Bit.Core.Models.Table;
-using Bit.Core.Settings;
-using Core.Models.Data;
 using Azure.Messaging.EventGrid;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
+using Bit.Api.Utilities;
+using Bit.Core;
+using Bit.Core.Context;
+using Bit.Core.Exceptions;
 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 Core.Models.Data;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
-using Bit.Core;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/CollectionsController.cs

@@ -1,16 +1,16 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Repositories;
-using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Exceptions;
-using Bit.Core.Services;
-using Bit.Core.Context;
-using Bit.Core.Models.Table;
-using System.Collections.Generic;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
+using Bit.Core.Context;
+using Bit.Core.Exceptions;
+using Bit.Core.Models.Table;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/DevicesController.cs

@@ -4,12 +4,12 @@ using System.Linq;
 using System.Threading.Tasks;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Repositories;
-using Microsoft.AspNetCore.Authorization;
 using Bit.Core.Exceptions;
 using Bit.Core.Models.Table;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/EventsController.cs

@@ -2,13 +2,13 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Bit.Api.Models.Response;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Repositories;
-using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Exceptions;
-using Bit.Core.Services;
 using Bit.Core.Context;
+using Bit.Core.Exceptions;
 using Bit.Core.Models.Data;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/FoldersController.cs

@@ -3,11 +3,11 @@ using System.Linq;
 using System.Threading.Tasks;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Repositories;
-using Microsoft.AspNetCore.Authorization;
 using Bit.Core.Exceptions;
+using Bit.Core.Repositories;
 using Bit.Core.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/GroupsController.cs

@@ -1,15 +1,15 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Repositories;
-using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Exceptions;
-using Bit.Core.Services;
-using Bit.Core.Context;
-using System.Collections.Generic;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
+using Bit.Core.Context;
+using Bit.Core.Exceptions;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/HibpController.cs

@@ -1,16 +1,16 @@
 using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Authorization;
+using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Security.Cryptography;
-using Bit.Core.Services;
+using System.Threading.Tasks;
 using Bit.Core.Context;
-using System.Net;
 using Bit.Core.Exceptions;
-using System.Linq;
-using Bit.Core.Utilities;
+using Bit.Core.Services;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/InfoController.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/InstallationsController.cs

@@ -2,11 +2,11 @@
 using System.Threading.Tasks;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Repositories;
-using Microsoft.AspNetCore.Authorization;
 using Bit.Core.Exceptions;
+using Bit.Core.Repositories;
 using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/LicensesController.cs

@@ -1,13 +1,13 @@
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Services;
-using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Context;
+using System;
 using System.Threading.Tasks;
-using Bit.Core.Models.Business;
+using Bit.Core.Context;
 using Bit.Core.Exceptions;
+using Bit.Core.Models.Business;
 using Bit.Core.Repositories;
-using System;
+using Bit.Core.Services;
 using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/MiscController.cs

@@ -1,9 +1,9 @@
-using Microsoft.AspNetCore.Mvc;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Bit.Api.Models.Request;
+using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Settings;
+using Microsoft.AspNetCore.Mvc;
 using Stripe;
 
 namespace Bit.Api.Controllers

src/Api/Controllers/OrganizationSponsorshipsController.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Core.Context;

src/Api/Controllers/OrganizationUsersController.cs

@@ -1,18 +1,18 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Repositories;
-using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Exceptions;
-using Bit.Core.Services;
-using Bit.Core.Context;
-using System.Collections.Generic;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
+using Bit.Core.Context;
 using Bit.Core.Enums;
+using Bit.Core.Exceptions;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/OrganizationsController.cs

@@ -5,18 +5,18 @@ using Bit.Api.Models.Request;
 using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Api.Models.Response;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Repositories;
-using Microsoft.AspNetCore.Authorization;
+using Bit.Api.Utilities;
+using Bit.Core.Context;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Services;
-using Bit.Core.Context;
-using Bit.Api.Utilities;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Data;
-using Bit.Core.Utilities;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 
 namespace Bit.Api.Controllers

src/Api/Controllers/PlansController.cs

@@ -1,10 +1,10 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Utilities;
-using System.Linq;
-using Bit.Core.Repositories;
+using System.Linq;
 using System.Threading.Tasks;
 using Bit.Api.Models.Response;
+using Bit.Core.Repositories;
+using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/PoliciesController.cs

@@ -3,16 +3,16 @@ using System.Linq;
 using System.Threading.Tasks;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Repositories;
-using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Exceptions;
-using Bit.Core.Services;
 using Bit.Core.Context;
 using Bit.Core.Enums;
-using Bit.Core.Utilities;
+using Bit.Core.Exceptions;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.DataProtection;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/ProviderUsersController.cs

@@ -5,13 +5,13 @@ using System.Threading.Tasks;
 using Bit.Api.Models.Request.Providers;
 using Bit.Api.Models.Response;
 using Bit.Api.Models.Response.Providers;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Repositories;
-using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Exceptions;
-using Bit.Core.Services;
 using Bit.Core.Context;
+using Bit.Core.Exceptions;
 using Bit.Core.Models.Business.Provider;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/PushController.cs

@@ -1,14 +1,14 @@
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Services;
-using Microsoft.AspNetCore.Authorization;
+using System.Linq;
+using System.Threading.Tasks;
 using Bit.Core.Context;
 using Bit.Core.Exceptions;
-using System.Threading.Tasks;
-using System.Linq;
-using Microsoft.AspNetCore.Hosting;
 using Bit.Core.Models.Api;
-using Bit.Core.Utilities;
+using Bit.Core.Services;
 using Bit.Core.Settings;
+using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Hosting;
 
 namespace Bit.Api.Controllers

src/Api/Controllers/SendsController.cs

@@ -1,25 +1,25 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Repositories;
-using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Exceptions;
-using Bit.Core.Services;
-using Bit.Core.Utilities;
-using Bit.Core.Settings;
-using Bit.Core.Enums;
-using Bit.Core.Context;
 using Azure.Messaging.EventGrid;
-using Bit.Api.Utilities;
-using System.Collections.Generic;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
-using Bit.Core.Models.Table;
-using Newtonsoft.Json;
-using Bit.Core.Models.Data;
-using Microsoft.Extensions.Logging;
+using Bit.Api.Utilities;
 using Bit.Core;
+using Bit.Core.Context;
+using Bit.Core.Enums;
+using Bit.Core.Exceptions;
+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 Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/SettingsController.cs

@@ -2,9 +2,9 @@
 using System.Threading.Tasks;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Response;
+using Bit.Core.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Services;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/SyncController.cs

@@ -1,18 +1,18 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
+using Bit.Api.Models.Response;
+using Bit.Core.Enums;
+using Bit.Core.Enums.Provider;
+using Bit.Core.Exceptions;
+using Bit.Core.Models.Data;
+using Bit.Core.Models.Table;
+using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Bit.Core.Settings;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Services;
-using Bit.Core.Repositories;
-using Bit.Core.Enums;
-using Bit.Core.Exceptions;
-using System.Linq;
-using Bit.Core.Models.Table;
-using System.Collections.Generic;
-using Bit.Api.Models.Response;
-using Bit.Core.Enums.Provider;
-using Bit.Core.Models.Data;
-using Bit.Core.Settings;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/TwoFactorController.cs

@@ -1,23 +1,23 @@
 using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using Bit.Core.Exceptions;
-using Bit.Core.Services;
-using Microsoft.AspNetCore.Identity;
-using Bit.Core.Models.Table;
-using Bit.Core.Enums;
 using System.Linq;
+using System.Threading.Tasks;
 using Bit.Api.Models.Request;
 using Bit.Api.Models.Request.Accounts;
 using Bit.Api.Models.Response;
 using Bit.Api.Models.Response.TwoFactor;
 using Bit.Core.Context;
+using Bit.Core.Enums;
+using Bit.Core.Exceptions;
+using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
+using Bit.Core.Services;
+using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Bit.Core.Utilities.Duo;
-using Bit.Core.Settings;
 using Fido2NetLib;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Controllers/UsersController.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Threading.Tasks;
 using Bit.Api.Models.Response;
-using Microsoft.AspNetCore.Mvc;
+using Bit.Core.Exceptions;
 using Bit.Core.Repositories;
 using Microsoft.AspNetCore.Authorization;
-using Bit.Core.Exceptions;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Api.Controllers
 {

src/Api/Models/Request/AttachmentRequestModel.cs

@@ -1,4 +1,4 @@
-namespace Bit.Api.Models.Request
+namespace Bit.Api.Models.Request
 {
     public class AttachmentRequestModel
     {

src/Api/Models/Request/Organizations/OrganizationSponsorshipRedeemRequestModel.cs

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

src/Api/Models/Request/Organizations/OrganizationSponsorshipRequestModel.cs

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

src/Api/Models/Request/Organizations/OrganizationSubscriptionUpdateRequestModel.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace Bit.Api.Models.Request.Organizations
 {

src/Api/Models/Request/Providers/ProviderOrganizationCreateRequestModel.cs

@@ -1,4 +1,4 @@
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using Bit.Api.Models.Request.Organizations;
 using Bit.Core.Utilities;
 

src/Api/Models/Response/AttachmentUploadDataResponseModel.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response

src/Api/Models/Response/OrganizationAutoEnrollStatusResponseModel.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response

src/Api/Models/Response/PlanResponseModel.cs

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

src/Api/Models/Response/SendFileDownloadDataResponseModel.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Models.Api;
+using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response
 {

src/Api/Models/Response/SendFileUploadDataResponseModel.cs

@@ -1,4 +1,4 @@
-using Bit.Core.Enums;
+using Bit.Core.Enums;
 using Bit.Core.Models.Api;
 
 namespace Bit.Api.Models.Response

src/Api/Models/Response/TaxRateResponseModel.cs

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

src/Api/Program.cs

@@ -1,9 +1,9 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
+using AspNetCoreRateLimit;
 using Bit.Core.Utilities;
-using Serilog.Events;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Tokens;
-using AspNetCoreRateLimit;
+using Serilog.Events;
 
 namespace Bit.Api
 {

src/Api/Utilities/ApiHelpers.cs

@@ -1,13 +1,13 @@
-using Bit.Core.Utilities;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using Azure.Messaging.EventGrid;
-using Azure.Messaging.EventGrid.SystemEvents;
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
+using Azure.Messaging.EventGrid;
+using Azure.Messaging.EventGrid.SystemEvents;
+using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 
 namespace Bit.Api.Utilities
 {

src/Api/Utilities/DisableFormValueModelBindingAttribute.cs

@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Mvc.Filters;
+using System;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
-using System;
 
 namespace Bit.Api.Utilities
 {

src/Api/Utilities/ExceptionHandlerFilterAttribute.cs

@@ -1,15 +1,15 @@
 using System;
 using Bit.Api.Models.Public.Response;
-using InternalApi = Bit.Core.Models.Api;
 using Bit.Core.Exceptions;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Tokens;
 using Stripe;
-using Microsoft.Extensions.Hosting;
+using InternalApi = Bit.Core.Models.Api;
 
 namespace Bit.Api.Utilities
 {

src/Api/Utilities/ModelStateValidationFilterAttribute.cs

@@ -1,8 +1,8 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Linq;
+using Bit.Api.Models.Public.Response;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using InternalApi = Bit.Core.Models.Api;
-using System.Linq;
-using Bit.Api.Models.Public.Response;
 
 namespace Bit.Api.Utilities
 {

src/Api/Utilities/MultipartFormDataHelper.cs

@@ -1,12 +1,12 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.WebUtilities;
-using Microsoft.Net.Http.Headers;
-using System;
+using System;
 using System.IO;
 using System.Threading.Tasks;
 using Bit.Api.Models.Request;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Primitives;
+using Microsoft.Net.Http.Headers;
 using Newtonsoft.Json;
 
 namespace Bit.Api.Utilities

src/Billing/Controllers/AppleController.cs

@@ -1,13 +1,13 @@
-using Bit.Core;
+using System;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Bit.Core;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
-using System;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Bit.Billing.Controllers
 {

src/Billing/Controllers/BitPayController.cs

@@ -1,4 +1,9 @@
-using Bit.Billing.Models;
+using System;
+using System.Data.SqlClient;
+using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
+using Bit.Billing.Models;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
@@ -6,11 +11,6 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using System;
-using System.Data.SqlClient;
-using System.Globalization;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Bit.Billing.Controllers
 {

src/Billing/Controllers/FreshdeskController.cs

@@ -1,20 +1,19 @@
-using Bit.Core.Repositories;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
-using System.ComponentModel.DataAnnotations;
-
+using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
 
 namespace Bit.Billing.Controllers
 {

src/Billing/Controllers/InfoController.cs

@@ -1,6 +1,6 @@
 using System;
-using Microsoft.AspNetCore.Mvc;
 using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Bit.Billing.Controllers
 {

src/Billing/Controllers/PayPalController.cs

@@ -1,4 +1,8 @@
-using Bit.Billing.Utilities;
+using System.Data.SqlClient;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
+using Bit.Billing.Utilities;
 using Bit.Core.Enums;
 using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
@@ -7,10 +11,6 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using System.Data.SqlClient;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Bit.Billing.Controllers
 {

src/Billing/Controllers/StripeController.cs

@@ -1,4 +1,10 @@
-using Bit.Core.Enums;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Bit.Core.Enums;
 using Bit.Core.Models.Business;
 using Bit.Core.Models.Table;
 using Bit.Core.Repositories;
@@ -11,12 +17,6 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Stripe;
-using System;
-using System.Collections.Generic;
-using System.Data.SqlClient;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Bit.Billing.Controllers
 {

src/Billing/Program.cs

@@ -1,7 +1,7 @@
-using Microsoft.AspNetCore.Hosting;
-using Bit.Core.Utilities;
-using Serilog.Events;
+using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
+using Serilog.Events;
 
 namespace Bit.Billing
 {

src/Billing/Startup.cs

@@ -1,17 +1,17 @@
 using System;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
+using System.Globalization;
 using Bit.Core.Context;
 using Bit.Core.Settings;
-using Stripe;
 using Bit.Core.Utilities;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.AspNetCore.Routing;
-using System.Globalization;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
+using Stripe;
 
 namespace Bit.Billing
 {

src/Core/AssemblyInfo.cs

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

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
 {

src/Core/Enums/BitwardenClient.cs

@@ -1,4 +1,4 @@
-namespace Bit.Core.Enums
+namespace Bit.Core.Enums
 {
     public static class BitwardenClient
     {

src/Core/Enums/CipherStateAction.cs

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

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,4 +1,4 @@
-namespace Bit.Core.Enums
+namespace Bit.Core.Enums
 {
     public enum SupportedDatabaseProviders
     {

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/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
 {

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
 {

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
 {
@@ -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;

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
 {