Turn on file scoped namespaces (#2225)

.editorconfig

@@ -114,6 +114,9 @@ csharp_new_line_before_finally = true
 csharp_new_line_before_members_in_object_initializers = true
 csharp_new_line_before_members_in_anonymous_types = true
 
+# Namespace settigns
+csharp_style_namespace_declarations = file_scoped:warning
+
 # All files
 [*]
 guidelines = 120

bitwarden_license/src/Commercial.Core/Services/ProviderService.cs

@@ -13,8 +13,8 @@ using Bit.Core.Settings;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.DataProtection;
 
-namespace Bit.Commercial.Core.Services
-{
+namespace Bit.Commercial.Core.Services;
+
 public class ProviderService : IProviderService
 {
     public static PlanType[] ProviderDisllowedOrganizationTypes = new[] { PlanType.Free, PlanType.FamiliesAnnually, PlanType.FamiliesAnnually2019 };
@@ -506,4 +506,3 @@ namespace Bit.Commercial.Core.Services
         }
     }
 }
-}

bitwarden_license/src/Commercial.Core/Utilities/ServiceCollectionExtensions.cs

@@ -2,8 +2,8 @@
 using Bit.Core.Services;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Bit.Commercial.Core.Utilities
-{
+namespace Bit.Commercial.Core.Utilities;
+
 public static class ServiceCollectionExtensions
 {
     public static void AddCommCoreServices(this IServiceCollection services)
@@ -11,4 +11,3 @@ namespace Bit.Commercial.Core.Utilities
         services.AddScoped<IProviderService, ProviderService>();
     }
 }
-}

bitwarden_license/src/Scim/Context/IScimContext.cs

@@ -4,8 +4,8 @@ using Bit.Core.Models.OrganizationConnectionConfigs;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
 
-namespace Bit.Scim.Context
-{
+namespace Bit.Scim.Context;
+
 public interface IScimContext
 {
     ScimProviderType RequestScimProvider { get; set; }
@@ -18,4 +18,3 @@ namespace Bit.Scim.Context
         IOrganizationRepository organizationRepository,
         IOrganizationConnectionRepository organizationConnectionRepository);
 }
-}

bitwarden_license/src/Scim/Context/ScimContext.cs

@@ -4,8 +4,8 @@ using Bit.Core.Models.OrganizationConnectionConfigs;
 using Bit.Core.Repositories;
 using Bit.Core.Settings;
 
-namespace Bit.Scim.Context
-{
+namespace Bit.Scim.Context;
+
 public class ScimContext : IScimContext
 {
     private bool _builtHttpContext;
@@ -61,4 +61,3 @@ namespace Bit.Scim.Context
         }
     }
 }
-}

bitwarden_license/src/Scim/Controllers/InfoController.cs

@@ -2,8 +2,8 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Scim.Controllers
-{
+namespace Bit.Scim.Controllers;
+
 [AllowAnonymous]
 public class InfoController : Controller
 {
@@ -20,4 +20,3 @@ namespace Bit.Scim.Controllers
         return Json(CoreHelpers.GetVersion());
     }
 }
-}

bitwarden_license/src/Scim/Controllers/v2/GroupsController.cs

@@ -8,8 +8,8 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 
-namespace Bit.Scim.Controllers.v2
-{
+namespace Bit.Scim.Controllers.v2;
+
 [Authorize("Scim")]
 [Route("v2/{organizationId}/groups")]
 public class GroupsController : Controller
@@ -325,4 +325,3 @@ namespace Bit.Scim.Controllers.v2
         await _groupRepository.UpdateUsersAsync(group.Id, memberIds);
     }
 }
-}

bitwarden_license/src/Scim/Controllers/v2/UsersController.cs

@@ -9,8 +9,8 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 
-namespace Bit.Scim.Controllers.v2
-{
+namespace Bit.Scim.Controllers.v2;
+
 [Authorize("Scim")]
 [Route("v2/{organizationId}/users")]
 public class UsersController : Controller
@@ -292,4 +292,3 @@ namespace Bit.Scim.Controllers.v2
         return false;
     }
 }
-}

bitwarden_license/src/Scim/Models/BaseScimGroupModel.cs

@@ -1,7 +1,7 @@
 using Bit.Scim.Utilities;
 
-namespace Bit.Scim.Models
-{
+namespace Bit.Scim.Models;
+
 public abstract class BaseScimGroupModel : BaseScimModel
 {
     public BaseScimGroupModel(bool initSchema = false)
@@ -15,4 +15,3 @@ namespace Bit.Scim.Models
     public string DisplayName { get; set; }
     public string ExternalId { get; set; }
 }
-}

bitwarden_license/src/Scim/Models/BaseScimModel.cs

@@ -1,5 +1,5 @@
-namespace Bit.Scim.Models
-{
+namespace Bit.Scim.Models;
+
 public abstract class BaseScimModel
 {
     public BaseScimModel()
@@ -12,4 +12,3 @@
 
     public List<string> Schemas { get; set; }
 }
-}

bitwarden_license/src/Scim/Models/BaseScimUserModel.cs

@@ -1,7 +1,7 @@
 using Bit.Scim.Utilities;
 
-namespace Bit.Scim.Models
-{
+namespace Bit.Scim.Models;
+
 public abstract class BaseScimUserModel : BaseScimModel
 {
     public BaseScimUserModel(bool initSchema = false)
@@ -53,4 +53,3 @@ namespace Bit.Scim.Models
         public string Type { get; set; }
     }
 }
-}

bitwarden_license/src/Scim/Models/ScimErrorResponseModel.cs

@@ -1,7 +1,7 @@
 using Bit.Scim.Utilities;
 
-namespace Bit.Scim.Models
-{
+namespace Bit.Scim.Models;
+
 public class ScimErrorResponseModel : BaseScimModel
 {
     public ScimErrorResponseModel()
@@ -11,4 +11,3 @@ namespace Bit.Scim.Models
     public string Detail { get; set; }
     public int Status { get; set; }
 }
-}

bitwarden_license/src/Scim/Models/ScimGroupRequestModel.cs

@@ -1,8 +1,8 @@
 using Bit.Core.Entities;
 using Bit.Core.Utilities;
 
-namespace Bit.Scim.Models
-{
+namespace Bit.Scim.Models;
+
 public class ScimGroupRequestModel : BaseScimGroupModel
 {
     public ScimGroupRequestModel()
@@ -28,4 +28,3 @@ namespace Bit.Scim.Models
         public string Display { get; set; }
     }
 }
-}

bitwarden_license/src/Scim/Models/ScimGroupResponseModel.cs

@@ -1,7 +1,7 @@
 using Bit.Core.Entities;
 
-namespace Bit.Scim.Models
-{
+namespace Bit.Scim.Models;
+
 public class ScimGroupResponseModel : BaseScimGroupModel
 {
     public ScimGroupResponseModel()
@@ -23,4 +23,3 @@ namespace Bit.Scim.Models
     public string Id { get; set; }
     public ScimMetaModel Meta { get; private set; }
 }
-}

bitwarden_license/src/Scim/Models/ScimListResponseModel.cs

@@ -1,7 +1,7 @@
 using Bit.Scim.Utilities;
 
-namespace Bit.Scim.Models
-{
+namespace Bit.Scim.Models;
+
 public class ScimListResponseModel<T> : BaseScimModel
 {
     public ScimListResponseModel()
@@ -13,4 +13,3 @@ namespace Bit.Scim.Models
     public int ItemsPerPage { get; set; }
     public List<T> Resources { get; set; }
 }
-}

bitwarden_license/src/Scim/Models/ScimMetaModel.cs

@@ -1,5 +1,5 @@
-namespace Bit.Scim.Models
-{
+namespace Bit.Scim.Models;
+
 public class ScimMetaModel
 {
     public ScimMetaModel(string resourceType)
@@ -11,4 +11,3 @@
     public DateTime? Created { get; set; }
     public DateTime? LastModified { get; set; }
 }
-}

bitwarden_license/src/Scim/Models/ScimPatchModel.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 
-namespace Bit.Scim.Models
-{
+namespace Bit.Scim.Models;
+
 public class ScimPatchModel : BaseScimModel
 {
     public ScimPatchModel()
@@ -16,4 +16,3 @@ namespace Bit.Scim.Models
         public JsonElement Value { get; set; }
     }
 }
-}

bitwarden_license/src/Scim/Models/ScimUserRequestModel.cs

@@ -1,9 +1,8 @@
-namespace Bit.Scim.Models
-{
+namespace Bit.Scim.Models;
+
 public class ScimUserRequestModel : BaseScimUserModel
 {
     public ScimUserRequestModel()
         : base(false)
     { }
 }
-}

bitwarden_license/src/Scim/Models/ScimUserResponseModel.cs

@@ -1,7 +1,7 @@
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 
-namespace Bit.Scim.Models
-{
+namespace Bit.Scim.Models;
+
 public class ScimUserResponseModel : BaseScimUserModel
 {
     public ScimUserResponseModel()
@@ -26,4 +26,3 @@ namespace Bit.Scim.Models
     public string Id { get; set; }
     public ScimMetaModel Meta { get; private set; }
 }
-}

bitwarden_license/src/Scim/Program.cs

@@ -1,8 +1,8 @@
 using Bit.Core.Utilities;
 using Serilog.Events;
 
-namespace Bit.Scim
-{
+namespace Bit.Scim;
+
 public class Program
 {
     public static void Main(string[] args)
@@ -31,4 +31,3 @@ namespace Bit.Scim
             .Run();
     }
 }
-}

bitwarden_license/src/Scim/ScimSettings.cs

@@ -1,6 +1,5 @@
-namespace Bit.Scim
-{
+namespace Bit.Scim;
+
 public class ScimSettings
 {
 }
-}

bitwarden_license/src/Scim/Startup.cs

@@ -9,8 +9,8 @@ using IdentityModel;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Stripe;
 
-namespace Bit.Scim
-{
+namespace Bit.Scim;
+
 public class Startup
 {
     public Startup(IWebHostEnvironment env, IConfiguration configuration)
@@ -113,4 +113,3 @@ namespace Bit.Scim
         app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute());
     }
 }
-}

bitwarden_license/src/Scim/Utilities/ApiKeyAuthenticationHandler.cs

@@ -8,8 +8,8 @@ using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Options;
 
-namespace Bit.Scim.Utilities
-{
+namespace Bit.Scim.Utilities;
+
 public class ApiKeyAuthenticationHandler : AuthenticationHandler<ApiKeyAuthenticationOptions>
 {
     private readonly IOrganizationRepository _organizationRepository;
@@ -87,4 +87,3 @@ namespace Bit.Scim.Utilities
         return AuthenticateResult.Success(ticket);
     }
 }
-}

bitwarden_license/src/Scim/Utilities/ApiKeyAuthenticationOptions.cs

@@ -1,9 +1,8 @@
 using Microsoft.AspNetCore.Authentication;
 
-namespace Bit.Scim.Utilities
-{
+namespace Bit.Scim.Utilities;
+
 public class ApiKeyAuthenticationOptions : AuthenticationSchemeOptions
 {
     public const string DefaultScheme = "ScimApiKey";
 }
-}

bitwarden_license/src/Scim/Utilities/ScimConstants.cs

@@ -1,5 +1,5 @@
-namespace Bit.Scim.Utilities
-{
+namespace Bit.Scim.Utilities;
+
 public static class ScimConstants
 {
     public const string Scim2SchemaListResponse = "urn:ietf:params:scim:api:messages:2.0:ListResponse";
@@ -7,4 +7,3 @@
     public const string Scim2SchemaUser = "urn:ietf:params:scim:schemas:core:2.0:User";
     public const string Scim2SchemaGroup = "urn:ietf:params:scim:schemas:core:2.0:Group";
 }
-}

bitwarden_license/src/Scim/Utilities/ScimContextMiddleware.cs

@@ -2,8 +2,8 @@
 using Bit.Core.Settings;
 using Bit.Scim.Context;
 
-namespace Bit.Scim.Utilities
-{
+namespace Bit.Scim.Utilities;
+
 public class ScimContextMiddleware
 {
     private readonly RequestDelegate _next;
@@ -20,4 +20,3 @@ namespace Bit.Scim.Utilities
         await _next.Invoke(httpContext);
     }
 }
-}

bitwarden_license/src/Sso/Controllers/AccountController.cs

@@ -22,8 +22,8 @@ using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Sso.Controllers
-{
+namespace Bit.Sso.Controllers;
+
 public class AccountController : Controller
 {
     private readonly IAuthenticationSchemeProvider _schemeProvider;
@@ -707,4 +707,3 @@ namespace Bit.Sso.Controllers
            && !context.RedirectUri.StartsWith("http", StringComparison.Ordinal);
     }
 }
-}

bitwarden_license/src/Sso/Controllers/HomeController.cs

@@ -5,8 +5,8 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Sso.Controllers
-{
+namespace Bit.Sso.Controllers;
+
 public class HomeController : Controller
 {
     private readonly IIdentityServerInteractionService _interaction;
@@ -52,4 +52,3 @@ namespace Bit.Sso.Controllers
         return View("Error", vm);
     }
 }
-}

bitwarden_license/src/Sso/Controllers/InfoController.cs

@@ -1,8 +1,8 @@
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Sso.Controllers
-{
+namespace Bit.Sso.Controllers;
+
 public class InfoController : Controller
 {
     [HttpGet("~/alive")]
@@ -18,4 +18,3 @@ namespace Bit.Sso.Controllers
         return Json(CoreHelpers.GetVersion());
     }
 }
-}

bitwarden_license/src/Sso/Controllers/MetadataController.cs

@@ -5,8 +5,8 @@ using Microsoft.AspNetCore.Mvc;
 using Sustainsys.Saml2.AspNetCore2;
 using Sustainsys.Saml2.WebSso;
 
-namespace Bit.Sso.Controllers
-{
+namespace Bit.Sso.Controllers;
+
 public class MetadataController : Controller
 {
     private readonly IAuthenticationSchemeProvider _schemeProvider;
@@ -67,4 +67,3 @@ namespace Bit.Sso.Controllers
         };
     }
 }
-}

bitwarden_license/src/Sso/Models/ErrorViewModel.cs

@@ -1,7 +1,7 @@
 using IdentityServer4.Models;
 
-namespace Bit.Sso.Models
-{
+namespace Bit.Sso.Models;
+
 public class ErrorViewModel
 {
     private string _requestId;
@@ -24,4 +24,3 @@ namespace Bit.Sso.Models
         }
     }
 }
-}

bitwarden_license/src/Sso/Models/RedirectViewModel.cs

@@ -1,7 +1,6 @@
-namespace Bit.Sso.Models
-{
+namespace Bit.Sso.Models;
+
 public class RedirectViewModel
 {
     public string RedirectUrl { get; set; }
 }
-}

bitwarden_license/src/Sso/Models/SamlEnvironment.cs

@@ -1,9 +1,8 @@
 using System.Security.Cryptography.X509Certificates;
 
-namespace Bit.Sso.Models
-{
+namespace Bit.Sso.Models;
+
 public class SamlEnvironment
 {
     public X509Certificate2 SpSigningCertificate { get; set; }
 }
-}

bitwarden_license/src/Sso/Models/SsoPreValidateResponseModel.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Sso.Models
-{
+namespace Bit.Sso.Models;
+
 public class SsoPreValidateResponseModel : JsonResult
 {
     public SsoPreValidateResponseModel(string token) : base(new
@@ -10,4 +10,3 @@ namespace Bit.Sso.Models
     })
     { }
 }
-}

bitwarden_license/src/Sso/Program.cs

@@ -2,8 +2,8 @@
 using Serilog;
 using Serilog.Events;
 
-namespace Bit.Sso
-{
+namespace Bit.Sso;
+
 public class Program
 {
     public static void Main(string[] args)
@@ -31,4 +31,3 @@ namespace Bit.Sso
             .Run();
     }
 }
-}

bitwarden_license/src/Sso/Startup.cs

@@ -8,8 +8,8 @@ using IdentityServer4.Extensions;
 using Microsoft.IdentityModel.Logging;
 using Stripe;
 
-namespace Bit.Sso
-{
+namespace Bit.Sso;
+
 public class Startup
 {
     public Startup(IWebHostEnvironment env, IConfiguration configuration)
@@ -152,4 +152,3 @@ namespace Bit.Sso
         logger.LogInformation(Constants.BypassFiltersEventId, globalSettings.ProjectName + " started.");
     }
 }
-}

bitwarden_license/src/Sso/Utilities/ClaimsExtensions.cs

@@ -1,8 +1,8 @@
 using System.Security.Claims;
 using System.Text.RegularExpressions;
 
-namespace Bit.Sso.Utilities
-{
+namespace Bit.Sso.Utilities;
+
 public static class ClaimsExtensions
 {
     private static readonly Regex _normalizeTextRegEx =
@@ -43,4 +43,3 @@ namespace Bit.Sso.Utilities
         return _normalizeTextRegEx.Replace(text, string.Empty);
     }
 }
-}

bitwarden_license/src/Sso/Utilities/DiscoveryResponseGenerator.cs

@@ -5,8 +5,8 @@ using IdentityServer4.Services;
 using IdentityServer4.Stores;
 using IdentityServer4.Validation;
 
-namespace Bit.Sso.Utilities
-{
+namespace Bit.Sso.Utilities;
+
 public class DiscoveryResponseGenerator : IdentityServer4.ResponseHandling.DiscoveryResponseGenerator
 {
     private readonly GlobalSettings _globalSettings;
@@ -33,4 +33,3 @@ namespace Bit.Sso.Utilities
             _globalSettings.BaseServiceUri.InternalSso);
     }
 }
-}

bitwarden_license/src/Sso/Utilities/DynamicAuthenticationScheme.cs

@@ -3,8 +3,8 @@ using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Sustainsys.Saml2.AspNetCore2;
 
-namespace Bit.Sso.Utilities
-{
+namespace Bit.Sso.Utilities;
+
 public class DynamicAuthenticationScheme : AuthenticationScheme, IDynamicAuthenticationScheme
 {
     public DynamicAuthenticationScheme(string name, string displayName, Type handlerType,
@@ -87,4 +87,3 @@ namespace Bit.Sso.Utilities
         }
     }
 }
-}

bitwarden_license/src/Sso/Utilities/DynamicAuthenticationSchemeProvider.cs

@@ -18,8 +18,8 @@ using Sustainsys.Saml2.AspNetCore2;
 using Sustainsys.Saml2.Configuration;
 using Sustainsys.Saml2.Saml2P;
 
-namespace Bit.Core.Business.Sso
-{
+namespace Bit.Core.Business.Sso;
+
 public class DynamicAuthenticationSchemeProvider : AuthenticationSchemeProvider
 {
     private readonly IPostConfigureOptions<OpenIdConnectOptions> _oidcPostConfigureOptions;
@@ -455,4 +455,3 @@ namespace Bit.Core.Business.Sso
         };
     }
 }
-}

bitwarden_license/src/Sso/Utilities/ExtendedOptionsMonitorCache.cs

@@ -1,8 +1,8 @@
 using System.Collections.Concurrent;
 using Microsoft.Extensions.Options;
 
-namespace Bit.Sso.Utilities
-{
+namespace Bit.Sso.Utilities;
+
 public class ExtendedOptionsMonitorCache<TOptions> : IExtendedOptionsMonitorCache<TOptions> where TOptions : class
 {
     private readonly ConcurrentDictionary<string, Lazy<TOptions>> _cache =
@@ -34,4 +34,3 @@ namespace Bit.Sso.Utilities
         return _cache.TryRemove(name ?? Options.DefaultName, out _);
     }
 }
-}

bitwarden_license/src/Sso/Utilities/IDynamicAuthenticationScheme.cs

@@ -1,8 +1,8 @@
 using Bit.Core.Enums;
 using Microsoft.AspNetCore.Authentication;
 
-namespace Bit.Sso.Utilities
-{
+namespace Bit.Sso.Utilities;
+
 public interface IDynamicAuthenticationScheme
 {
     AuthenticationSchemeOptions Options { get; set; }
@@ -10,4 +10,3 @@ namespace Bit.Sso.Utilities
 
     Task Validate();
 }
-}

bitwarden_license/src/Sso/Utilities/IExtendedOptionsMonitorCache.cs

@@ -1,9 +1,8 @@
 using Microsoft.Extensions.Options;
 
-namespace Bit.Sso.Utilities
-{
+namespace Bit.Sso.Utilities;
+
 public interface IExtendedOptionsMonitorCache<TOptions> : IOptionsMonitorCache<TOptions> where TOptions : class
 {
     void AddOrUpdate(string name, TOptions options);
 }
-}

bitwarden_license/src/Sso/Utilities/OpenIdConnectOptionsExtensions.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 
-namespace Bit.Sso.Utilities
-{
+namespace Bit.Sso.Utilities;
+
 public static class OpenIdConnectOptionsExtensions
 {
     public static async Task<bool> CouldHandleAsync(this OpenIdConnectOptions options, string scheme, HttpContext context)
@@ -60,4 +60,3 @@ namespace Bit.Sso.Utilities
         return false;
     }
 }
-}

bitwarden_license/src/Sso/Utilities/OpenIdConnectScopes.cs

@@ -1,5 +1,5 @@
-namespace Bit.Sso.Utilities
-{
+namespace Bit.Sso.Utilities;
+
 /// <summary>
 /// OpenID Connect Clients use scope values as defined in 3.3 of OAuth 2.0
 /// [RFC6749]. These values represent the standard scope values supported
@@ -61,4 +61,3 @@
     /// </remarks>
     public const string Acr = "acr";
 }
-}

bitwarden_license/src/Sso/Utilities/Saml2OptionsExtensions.cs

@@ -4,8 +4,8 @@ using System.Xml;
 using Sustainsys.Saml2;
 using Sustainsys.Saml2.AspNetCore2;
 
-namespace Bit.Sso.Utilities
-{
+namespace Bit.Sso.Utilities;
+
 public static class Saml2OptionsExtensions
 {
     public static async Task<bool> CouldHandleAsync(this Saml2Options options, string scheme, HttpContext context)
@@ -102,4 +102,3 @@ namespace Bit.Sso.Utilities
         return true;
     }
 }
-}

bitwarden_license/src/Sso/Utilities/SamlClaimTypes.cs

@@ -1,5 +1,5 @@
-namespace Bit.Sso.Utilities
-{
+namespace Bit.Sso.Utilities;
+
 public static class SamlClaimTypes
 {
     public const string Email = "urn:oid:0.9.2342.19200300.100.1.3";
@@ -9,4 +9,3 @@
     public const string CommonName = "urn:oid:2.5.4.3";
     public const string UserId = "urn:oid:0.9.2342.19200300.100.1.1";
 }
-}

bitwarden_license/src/Sso/Utilities/SamlNameIdFormats.cs

@@ -1,5 +1,5 @@
-namespace Bit.Sso.Utilities
-{
+namespace Bit.Sso.Utilities;
+
 public static class SamlNameIdFormats
 {
     // Common
@@ -15,4 +15,3 @@
     public const string KerberosPrincipalName = "urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos";
     public const string EntityIdentifier = "urn:oasis:names:tc:SAML:2.0:nameid-format:entity";
 }
-}

bitwarden_license/src/Sso/Utilities/SamlPropertyKeys.cs

@@ -1,7 +1,6 @@
-namespace Bit.Sso.Utilities
-{
+namespace Bit.Sso.Utilities;
+
 public static class SamlPropertyKeys
 {
     public const string ClaimFormat = "http://schemas.xmlsoap.org/ws/2005/05/identity/claimproperties/format";
 }
-}

bitwarden_license/src/Sso/Utilities/ServiceCollectionExtensions.cs

@@ -9,8 +9,8 @@ using IdentityServer4.ResponseHandling;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Sustainsys.Saml2.AspNetCore2;
 
-namespace Bit.Sso.Utilities
-{
+namespace Bit.Sso.Utilities;
+
 public static class ServiceCollectionExtensions
 {
     public static IServiceCollection AddSsoServices(this IServiceCollection services,
@@ -75,4 +75,3 @@ namespace Bit.Sso.Utilities
         return identityServerBuilder;
     }
 }
-}

bitwarden_license/src/Sso/Utilities/SsoAuthenticationMiddleware.cs

@@ -3,8 +3,8 @@ using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Sustainsys.Saml2.AspNetCore2;
 
-namespace Bit.Sso.Utilities
-{
+namespace Bit.Sso.Utilities;
+
 public class SsoAuthenticationMiddleware
 {
     private readonly RequestDelegate _next;
@@ -82,4 +82,3 @@ namespace Bit.Sso.Utilities
         await _next(context);
     }
 }
-}

bitwarden_license/test/Commercial.Core.Test/AutoFixture/ProviderUserFixtures.cs

@@ -3,8 +3,8 @@ using AutoFixture;
 using AutoFixture.Xunit2;
 using Bit.Core.Enums.Provider;
 
-namespace Bit.Commercial.Core.Test.AutoFixture
-{
+namespace Bit.Commercial.Core.Test.AutoFixture;
+
 internal class ProviderUser : ICustomization
 {
     public ProviderUserStatusType Status { get; set; }
@@ -42,4 +42,3 @@ namespace Bit.Commercial.Core.Test.AutoFixture
         return new ProviderUser(_status, _type);
     }
 }
-}

bitwarden_license/test/Commercial.Core.Test/Services/ProviderServiceTests.cs

@@ -19,8 +19,8 @@ using NSubstitute.ReturnsExtensions;
 using Xunit;
 using ProviderUser = Bit.Core.Entities.Provider.ProviderUser;
 
-namespace Bit.Commercial.Core.Test.Services
-{
+namespace Bit.Commercial.Core.Test.Services;
+
 public class ProviderServiceTests
 {
     [Theory, CustomAutoData(typeof(SutProviderCustomization))]
@@ -547,4 +547,3 @@ namespace Bit.Commercial.Core.Test.Services
             .LogProviderOrganizationEventAsync(providerOrganization, EventType.ProviderOrganization_Removed);
     }
 }
-}

src/Admin/AdminSettings.cs

@@ -1,5 +1,5 @@
-namespace Bit.Admin
-{
+namespace Bit.Admin;
+
 public class AdminSettings
 {
     public virtual string Admins { get; set; }
@@ -13,4 +13,3 @@
         public string AuthKey { get; set; }
     }
 }
-}

src/Admin/Controllers/ErrorController.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers
-{
+namespace Bit.Admin.Controllers;
+
 public class ErrorController : Controller
 {
     [Route("/error")]
@@ -21,4 +21,3 @@ namespace Bit.Admin.Controllers
         }
     }
 }
-}

src/Admin/Controllers/HomeController.cs

@@ -6,8 +6,8 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 
-namespace Bit.Admin.Controllers
-{
+namespace Bit.Admin.Controllers;
+
 public class HomeController : Controller
 {
     private readonly GlobalSettings _globalSettings;
@@ -111,4 +111,3 @@ namespace Bit.Admin.Controllers
     Core,
     Web,
 }
-}

src/Admin/Controllers/InfoController.cs

@@ -1,8 +1,8 @@
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers
-{
+namespace Bit.Admin.Controllers;
+
 public class InfoController : Controller
 {
     [HttpGet("~/alive")]
@@ -18,4 +18,3 @@ namespace Bit.Admin.Controllers
         return Json(CoreHelpers.GetVersion());
     }
 }
-}

src/Admin/Controllers/LoginController.cs

@@ -3,8 +3,8 @@ using Bit.Core.Identity;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers
-{
+namespace Bit.Admin.Controllers;
+
 public class LoginController : Controller
 {
     private readonly PasswordlessSignInManager<IdentityUser> _signInManager;
@@ -90,4 +90,3 @@ namespace Bit.Admin.Controllers
         };
     }
 }
-}

src/Admin/Controllers/LogsController.cs

@@ -7,8 +7,8 @@ using Microsoft.Azure.Cosmos;
 using Microsoft.Azure.Cosmos.Linq;
 using Serilog.Events;
 
-namespace Bit.Admin.Controllers
-{
+namespace Bit.Admin.Controllers;
+
 [Authorize]
 [SelfHosted(NotSelfHostedOnly = true)]
 public class LogsController : Controller
@@ -90,4 +90,3 @@ namespace Bit.Admin.Controllers
         }
     }
 }
-}

src/Admin/Controllers/OrganizationsController.cs

@@ -11,8 +11,8 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers
-{
+namespace Bit.Admin.Controllers;
+
 [Authorize]
 public class OrganizationsController : Controller
 {
@@ -214,4 +214,3 @@ namespace Bit.Admin.Controllers
     }
 
 }
-}

src/Admin/Controllers/ProvidersController.cs

@@ -7,8 +7,8 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers
-{
+namespace Bit.Admin.Controllers;
+
 [Authorize]
 [SelfHosted(NotSelfHostedOnly = true)]
 public class ProvidersController : Controller
@@ -131,4 +131,3 @@ namespace Bit.Admin.Controllers
         return RedirectToAction("Edit", new { id = providerId });
     }
 }
-}

src/Admin/Controllers/ToolsController.cs

@@ -10,8 +10,8 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers
-{
+namespace Bit.Admin.Controllers;
+
 [Authorize]
 [SelfHosted(NotSelfHostedOnly = true)]
 public class ToolsController : Controller
@@ -556,4 +556,3 @@ namespace Bit.Admin.Controllers
         return File(bytes, "application/json", "StripeSubscriptionsSearch.json");
     }
 }
-}

src/Admin/Controllers/UsersController.cs

@@ -7,8 +7,8 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers
-{
+namespace Bit.Admin.Controllers;
+
 [Authorize]
 public class UsersController : Controller
 {
@@ -108,4 +108,3 @@ namespace Bit.Admin.Controllers
         return RedirectToAction("Index");
     }
 }
-}

src/Admin/HostedServices/AmazonSqsBlockIpHostedService.cs

@@ -4,8 +4,8 @@ using Amazon.SQS.Model;
 using Bit.Core.Settings;
 using Microsoft.Extensions.Options;
 
-namespace Bit.Admin.HostedServices
-{
+namespace Bit.Admin.HostedServices;
+
 public class AmazonSqsBlockIpHostedService : BlockIpHostedService
 {
     private AmazonSQSClient _client;
@@ -81,4 +81,3 @@ namespace Bit.Admin.HostedServices
         }
     }
 }
-}

src/Admin/HostedServices/AzureQueueBlockIpHostedService.cs

@@ -2,8 +2,8 @@
 using Bit.Core.Settings;
 using Microsoft.Extensions.Options;
 
-namespace Bit.Admin.HostedServices
-{
+namespace Bit.Admin.HostedServices;
+
 public class AzureQueueBlockIpHostedService : BlockIpHostedService
 {
     private QueueClient _blockIpQueueClient;
@@ -61,4 +61,3 @@ namespace Bit.Admin.HostedServices
         }
     }
 }
-}

src/Admin/HostedServices/AzureQueueMailHostedService.cs

@@ -6,8 +6,8 @@ using Bit.Core.Services;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 
-namespace Bit.Admin.HostedServices
-{
+namespace Bit.Admin.HostedServices;
+
 public class AzureQueueMailHostedService : IHostedService
 {
     private readonly ILogger<AzureQueueMailHostedService> _logger;
@@ -99,4 +99,3 @@ namespace Bit.Admin.HostedServices
         return (await _mailQueueClient.ReceiveMessagesAsync(maxMessages: 32))?.Value ?? new QueueMessage[] { };
     }
 }
-}

src/Admin/HostedServices/BlockIpHostedService.cs

@@ -1,8 +1,8 @@
 using Bit.Core.Settings;
 using Microsoft.Extensions.Options;
 
-namespace Bit.Admin.HostedServices
-{
+namespace Bit.Admin.HostedServices;
+
 public abstract class BlockIpHostedService : IHostedService, IDisposable
 {
     protected readonly ILogger<BlockIpHostedService> _logger;
@@ -162,4 +162,3 @@ namespace Bit.Admin.HostedServices
         }
     }
 }
-}

src/Admin/HostedServices/DatabaseMigrationHostedService.cs

@@ -3,8 +3,8 @@ using Bit.Core.Jobs;
 using Bit.Core.Settings;
 using Bit.Migrator;
 
-namespace Bit.Admin.HostedServices
-{
+namespace Bit.Admin.HostedServices;
+
 public class DatabaseMigrationHostedService : IHostedService, IDisposable
 {
     private readonly GlobalSettings _globalSettings;
@@ -61,4 +61,3 @@ namespace Bit.Admin.HostedServices
     public virtual void Dispose()
     { }
 }
-}

src/Admin/Jobs/AliveJob.cs

@@ -3,8 +3,8 @@ using Bit.Core.Jobs;
 using Bit.Core.Settings;
 using Quartz;
 
-namespace Bit.Admin.Jobs
-{
+namespace Bit.Admin.Jobs;
+
 public class AliveJob : BaseJob
 {
     private readonly GlobalSettings _globalSettings;
@@ -26,4 +26,3 @@ namespace Bit.Admin.Jobs
             response.StatusCode);
     }
 }
-}

src/Admin/Jobs/DatabaseExpiredGrantsJob.cs

@@ -3,8 +3,8 @@ using Bit.Core.Jobs;
 using Bit.Core.Repositories;
 using Quartz;
 
-namespace Bit.Admin.Jobs
-{
+namespace Bit.Admin.Jobs;
+
 public class DatabaseExpiredGrantsJob : BaseJob
 {
     private readonly IMaintenanceRepository _maintenanceRepository;
@@ -24,4 +24,3 @@ namespace Bit.Admin.Jobs
         _logger.LogInformation(Constants.BypassFiltersEventId, "Finished job task: DeleteExpiredGrantsAsync");
     }
 }
-}

src/Admin/Jobs/DatabaseExpiredSponsorshipsJob.cs

@@ -4,8 +4,8 @@ using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Quartz;
 
-namespace Bit.Admin.Jobs
-{
+namespace Bit.Admin.Jobs;
+
 public class DatabaseExpiredSponsorshipsJob : BaseJob
 {
     private GlobalSettings _globalSettings;
@@ -36,4 +36,3 @@ namespace Bit.Admin.Jobs
         _logger.LogInformation(Constants.BypassFiltersEventId, "Finished job task: DeleteExpiredSponsorshipsAsync");
     }
 }
-}

src/Admin/Jobs/DatabaseRebuildlIndexesJob.cs

@@ -3,8 +3,8 @@ using Bit.Core.Jobs;
 using Bit.Core.Repositories;
 using Quartz;
 
-namespace Bit.Admin.Jobs
-{
+namespace Bit.Admin.Jobs;
+
 public class DatabaseRebuildlIndexesJob : BaseJob
 {
     private readonly IMaintenanceRepository _maintenanceRepository;
@@ -24,4 +24,3 @@ namespace Bit.Admin.Jobs
         _logger.LogInformation(Constants.BypassFiltersEventId, "Finished job task: RebuildIndexesAsync");
     }
 }
-}

src/Admin/Jobs/DatabaseUpdateStatisticsJob.cs

@@ -3,8 +3,8 @@ using Bit.Core.Jobs;
 using Bit.Core.Repositories;
 using Quartz;
 
-namespace Bit.Admin.Jobs
-{
+namespace Bit.Admin.Jobs;
+
 public class DatabaseUpdateStatisticsJob : BaseJob
 {
     private readonly IMaintenanceRepository _maintenanceRepository;
@@ -27,4 +27,3 @@ namespace Bit.Admin.Jobs
         _logger.LogInformation(Constants.BypassFiltersEventId, "Finished job task: DisableCipherAutoStatsAsync");
     }
 }
-}

src/Admin/Jobs/DeleteCiphersJob.cs

@@ -4,8 +4,8 @@ using Bit.Core.Repositories;
 using Microsoft.Extensions.Options;
 using Quartz;
 
-namespace Bit.Admin.Jobs
-{
+namespace Bit.Admin.Jobs;
+
 public class DeleteCiphersJob : BaseJob
 {
     private readonly ICipherRepository _cipherRepository;
@@ -34,4 +34,3 @@ namespace Bit.Admin.Jobs
         _logger.LogInformation(Constants.BypassFiltersEventId, "Finished job task: DeleteDeletedAsync");
     }
 }
-}

src/Admin/Jobs/DeleteSendsJob.cs

@@ -4,8 +4,8 @@ using Bit.Core.Repositories;
 using Bit.Core.Services;
 using Quartz;
 
-namespace Bit.Admin.Jobs
-{
+namespace Bit.Admin.Jobs;
+
 public class DeleteSendsJob : BaseJob
 {
     private readonly ISendRepository _sendRepository;
@@ -39,4 +39,3 @@ namespace Bit.Admin.Jobs
         }
     }
 }
-}

src/Admin/Jobs/JobsHostedService.cs

@@ -3,8 +3,8 @@ using Bit.Core.Jobs;
 using Bit.Core.Settings;
 using Quartz;
 
-namespace Bit.Admin.Jobs
-{
+namespace Bit.Admin.Jobs;
+
 public class JobsHostedService : BaseJobsHostedService
 {
     public JobsHostedService(
@@ -93,4 +93,3 @@ namespace Bit.Admin.Jobs
         services.AddTransient<DeleteCiphersJob>();
     }
 }
-}

src/Admin/Models/BillingInformationModel.cs

@@ -1,11 +1,10 @@
 using Bit.Core.Models.Business;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class BillingInformationModel
 {
     public BillingInfo BillingInfo { get; set; }
     public Guid? UserId { get; set; }
     public Guid? OrganizationId { get; set; }
 }
-}

src/Admin/Models/ChargeBraintreeModel.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class ChargeBraintreeModel : IValidatableObject
 {
     [Required]
@@ -25,4 +25,3 @@ namespace Bit.Admin.Models
         }
     }
 }
-}

src/Admin/Models/CreateProviderModel.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class CreateProviderModel
 {
     public CreateProviderModel() { }
@@ -10,4 +10,3 @@ namespace Bit.Admin.Models
     [Required]
     public string OwnerEmail { get; set; }
 }
-}

src/Admin/Models/CreateUpdateTransactionModel.cs

@@ -2,8 +2,8 @@
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class CreateUpdateTransactionModel : IValidatableObject
 {
     public CreateUpdateTransactionModel() { }
@@ -75,4 +75,3 @@ namespace Bit.Admin.Models
         };
     }
 }
-}

src/Admin/Models/CursorPagedModel.cs

@@ -1,5 +1,5 @@
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class CursorPagedModel<T>
 {
     public List<T> Items { get; set; }
@@ -7,4 +7,3 @@
     public string Cursor { get; set; }
     public string NextCursor { get; set; }
 }
-}

src/Admin/Models/ErrorViewModel.cs

@@ -1,9 +1,8 @@
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class ErrorViewModel
 {
     public string RequestId { get; set; }
 
     public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
 }
-}

src/Admin/Models/HomeModel.cs

@@ -1,10 +1,9 @@
 using Bit.Core.Settings;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class HomeModel
 {
     public string CurrentVersion { get; set; }
     public GlobalSettings GlobalSettings { get; set; }
 }
-}

src/Admin/Models/LicenseModel.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class LicenseModel : IValidatableObject
 {
     [Display(Name = "User Id")]
@@ -32,4 +32,3 @@ namespace Bit.Admin.Models
         }
     }
 }
-}

src/Admin/Models/LogModel.cs

@@ -1,8 +1,8 @@
 using Microsoft.Azure.Documents;
 using Newtonsoft.Json.Linq;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class LogModel : Resource
 {
     public long EventIdHash { get; set; }
@@ -52,4 +52,3 @@ namespace Bit.Admin.Models
         return val;
     }
 }
-}

src/Admin/Models/LoginModel.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class LoginModel
 {
     [Required]
@@ -11,4 +11,3 @@ namespace Bit.Admin.Models
     public string Error { get; set; }
     public string Success { get; set; }
 }
-}

src/Admin/Models/LogsModel.cs

@@ -1,7 +1,7 @@
 using Serilog.Events;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class LogsModel : CursorPagedModel<LogModel>
 {
     public LogEventLevel? Level { get; set; }
@@ -9,4 +9,3 @@ namespace Bit.Admin.Models
     public DateTime? Start { get; set; }
     public DateTime? End { get; set; }
 }
-}

src/Admin/Models/OrganizationEditModel.cs

@@ -6,8 +6,8 @@ using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class OrganizationEditModel : OrganizationViewModel
 {
     public OrganizationEditModel() { }
@@ -150,4 +150,3 @@ namespace Bit.Admin.Models
         return existingOrganization;
     }
 }
-}

src/Admin/Models/OrganizationViewModel.cs

@@ -2,8 +2,8 @@
 using Bit.Core.Enums;
 using Bit.Core.Models.Data.Organizations.OrganizationUsers;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class OrganizationViewModel
 {
     public OrganizationViewModel() { }
@@ -47,4 +47,3 @@ namespace Bit.Admin.Models
     public int PolicyCount { get; set; }
     public bool HasPublicPrivateKeys { get; set; }
 }
-}

src/Admin/Models/OrganizationsModel.cs

@@ -1,7 +1,7 @@
 using Bit.Core.Entities;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class OrganizationsModel : PagedModel<Organization>
 {
     public string Name { get; set; }
@@ -10,4 +10,3 @@ namespace Bit.Admin.Models
     public string Action { get; set; }
     public bool SelfHosted { get; set; }
 }
-}

src/Admin/Models/PagedModel.cs

@@ -1,5 +1,5 @@
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public abstract class PagedModel<T>
 {
     public List<T> Items { get; set; }
@@ -8,4 +8,3 @@
     public int? PreviousPage => Page < 2 ? (int?)null : Page - 1;
     public int? NextPage => Items.Count < Count ? (int?)null : Page + 1;
 }
-}

src/Admin/Models/PromoteAdminModel.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class PromoteAdminModel
 {
     [Required]
@@ -11,4 +11,3 @@ namespace Bit.Admin.Models
     [Display(Name = "Organization Id")]
     public Guid? OrganizationId { get; set; }
 }
-}

src/Admin/Models/ProviderEditModel.cs

@@ -2,8 +2,8 @@
 using Bit.Core.Entities.Provider;
 using Bit.Core.Models.Data;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class ProviderEditModel : ProviderViewModel
 {
     public ProviderEditModel() { }
@@ -31,4 +31,3 @@ namespace Bit.Admin.Models
         return existingProvider;
     }
 }
-}

src/Admin/Models/ProviderViewModel.cs

@@ -2,8 +2,8 @@
 using Bit.Core.Enums.Provider;
 using Bit.Core.Models.Data;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class ProviderViewModel
 {
     public ProviderViewModel() { }
@@ -22,4 +22,3 @@ namespace Bit.Admin.Models
     public IEnumerable<ProviderUserUserDetails> ProviderAdmins { get; set; }
     public IEnumerable<ProviderOrganizationOrganizationDetails> ProviderOrganizations { get; set; }
 }
-}

src/Admin/Models/ProvidersModel.cs

@@ -1,7 +1,7 @@
 using Bit.Core.Entities.Provider;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class ProvidersModel : PagedModel<Provider>
 {
     public string Name { get; set; }
@@ -10,4 +10,3 @@ namespace Bit.Admin.Models
     public string Action { get; set; }
     public bool SelfHosted { get; set; }
 }
-}

src/Admin/Models/StripeSubscriptionsModel.cs

@@ -1,8 +1,8 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Models.BitStripe;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class StripeSubscriptionRowModel
 {
     public Stripe.Subscription Subscription { get; set; }
@@ -40,4 +40,3 @@ namespace Bit.Admin.Models
         }
     }
 }
-}

src/Admin/Models/TaxRateAddEditModel.cs

@@ -1,5 +1,5 @@
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class TaxRateAddEditModel
 {
     public string StripeTaxRateId { get; set; }
@@ -8,4 +8,3 @@
     public string PostalCode { get; set; }
     public decimal Rate { get; set; }
 }
-}

src/Admin/Models/TaxRatesModel.cs

@@ -1,9 +1,8 @@
 using Bit.Core.Entities;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class TaxRatesModel : PagedModel<TaxRate>
 {
     public string Message { get; set; }
 }
-}

src/Admin/Models/UserEditModel.cs

@@ -4,8 +4,8 @@ using Bit.Core.Models.Business;
 using Bit.Core.Settings;
 using Bit.Core.Utilities;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class UserEditModel : UserViewModel
 {
     public UserEditModel() { }
@@ -71,4 +71,3 @@ namespace Bit.Admin.Models
         return existingUser;
     }
 }
-}

src/Admin/Models/UserViewModel.cs

@@ -1,7 +1,7 @@
 using Bit.Core.Entities;
 
-namespace Bit.Admin.Models
-{
+namespace Bit.Admin.Models;
+
 public class UserViewModel
 {
     public UserViewModel() { }
@@ -15,4 +15,3 @@ namespace Bit.Admin.Models
     public User User { get; set; }
     public int CipherCount { get; set; }
 }
-}