Revert filescoped (#2227)

* Revert "Add git blame entry (#2226)"

This reverts commit 239286737d.

* Revert "Turn on file scoped namespaces (#2225)"

This reverts commit 34fb4cca2a.

src/Admin/Controllers/ErrorController.cs

@@ -1,23 +1,24 @@
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers;
-
-public class ErrorController : Controller
+namespace Bit.Admin.Controllers
 {
-    [Route("/error")]
-    public IActionResult Error(int? statusCode = null)
+    public class ErrorController : Controller
     {
-        var exceptionHandlerPathFeature = HttpContext.Features.Get<IExceptionHandlerPathFeature>();
-        TempData["Error"] = HttpContext.Features.Get<IExceptionHandlerFeature>()?.Error.Message;
+        [Route("/error")]
+        public IActionResult Error(int? statusCode = null)
+        {
+            var exceptionHandlerPathFeature = HttpContext.Features.Get<IExceptionHandlerPathFeature>();
+            TempData["Error"] = HttpContext.Features.Get<IExceptionHandlerFeature>()?.Error.Message;
 
-        if (exceptionHandlerPathFeature != null)
-        {
-            return Redirect(exceptionHandlerPathFeature.Path);
-        }
-        else
-        {
-            return Redirect("/Home");
+            if (exceptionHandlerPathFeature != null)
+            {
+                return Redirect(exceptionHandlerPathFeature.Path);
+            }
+            else
+            {
+                return Redirect("/Home");
+            }
         }
     }
 }

src/Admin/Controllers/HomeController.cs

@@ -6,108 +6,109 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 
-namespace Bit.Admin.Controllers;
-
-public class HomeController : Controller
+namespace Bit.Admin.Controllers
 {
-    private readonly GlobalSettings _globalSettings;
-    private readonly HttpClient _httpClient = new HttpClient();
-    private readonly ILogger<HomeController> _logger;
-
-    public HomeController(GlobalSettings globalSettings, ILogger<HomeController> logger)
+    public class HomeController : Controller
     {
-        _globalSettings = globalSettings;
-        _logger = logger;
-    }
+        private readonly GlobalSettings _globalSettings;
+        private readonly HttpClient _httpClient = new HttpClient();
+        private readonly ILogger<HomeController> _logger;
 
-    [Authorize]
-    public IActionResult Index()
-    {
-        return View(new HomeModel
+        public HomeController(GlobalSettings globalSettings, ILogger<HomeController> logger)
         {
-            GlobalSettings = _globalSettings,
-            CurrentVersion = Core.Utilities.CoreHelpers.GetVersion()
-        });
-    }
+            _globalSettings = globalSettings;
+            _logger = logger;
+        }
 
-    public IActionResult Error()
-    {
-        return View(new ErrorViewModel
+        [Authorize]
+        public IActionResult Index()
         {
-            RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier
-        });
-    }
-
-
-    public async Task<IActionResult> GetLatestVersion(ProjectType project, CancellationToken cancellationToken)
-    {
-        var requestUri = $"https://selfhost.bitwarden.com/version.json";
-        try
-        {
-            var response = await _httpClient.GetAsync(requestUri, cancellationToken);
-            if (response.IsSuccessStatusCode)
+            return View(new HomeModel
             {
-                var latestVersions = JsonConvert.DeserializeObject<LatestVersions>(await response.Content.ReadAsStringAsync());
-                return project switch
+                GlobalSettings = _globalSettings,
+                CurrentVersion = Core.Utilities.CoreHelpers.GetVersion()
+            });
+        }
+
+        public IActionResult Error()
+        {
+            return View(new ErrorViewModel
+            {
+                RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier
+            });
+        }
+
+
+        public async Task<IActionResult> GetLatestVersion(ProjectType project, CancellationToken cancellationToken)
+        {
+            var requestUri = $"https://selfhost.bitwarden.com/version.json";
+            try
+            {
+                var response = await _httpClient.GetAsync(requestUri, cancellationToken);
+                if (response.IsSuccessStatusCode)
                 {
-                    ProjectType.Core => new JsonResult(latestVersions.Versions.CoreVersion),
-                    ProjectType.Web => new JsonResult(latestVersions.Versions.WebVersion),
-                    _ => throw new System.NotImplementedException(),
-                };
+                    var latestVersions = JsonConvert.DeserializeObject<LatestVersions>(await response.Content.ReadAsStringAsync());
+                    return project switch
+                    {
+                        ProjectType.Core => new JsonResult(latestVersions.Versions.CoreVersion),
+                        ProjectType.Web => new JsonResult(latestVersions.Versions.WebVersion),
+                        _ => throw new System.NotImplementedException(),
+                    };
+                }
             }
-        }
-        catch (HttpRequestException e)
-        {
-            _logger.LogError(e, $"Error encountered while sending GET request to {requestUri}");
-            return new JsonResult("Unable to fetch latest version") { StatusCode = StatusCodes.Status500InternalServerError };
-        }
-
-        return new JsonResult("-");
-    }
-
-    public async Task<IActionResult> GetInstalledWebVersion(CancellationToken cancellationToken)
-    {
-        var requestUri = $"{_globalSettings.BaseServiceUri.InternalVault}/version.json";
-        try
-        {
-            var response = await _httpClient.GetAsync(requestUri, cancellationToken);
-            if (response.IsSuccessStatusCode)
+            catch (HttpRequestException e)
             {
-                using var jsonDocument = await JsonDocument.ParseAsync(await response.Content.ReadAsStreamAsync(cancellationToken), cancellationToken: cancellationToken);
-                var root = jsonDocument.RootElement;
-                return new JsonResult(root.GetProperty("version").GetString());
+                _logger.LogError(e, $"Error encountered while sending GET request to {requestUri}");
+                return new JsonResult("Unable to fetch latest version") { StatusCode = StatusCodes.Status500InternalServerError };
             }
+
+            return new JsonResult("-");
         }
-        catch (HttpRequestException e)
+
+        public async Task<IActionResult> GetInstalledWebVersion(CancellationToken cancellationToken)
         {
-            _logger.LogError(e, $"Error encountered while sending GET request to {requestUri}");
-            return new JsonResult("Unable to fetch installed version") { StatusCode = StatusCodes.Status500InternalServerError };
+            var requestUri = $"{_globalSettings.BaseServiceUri.InternalVault}/version.json";
+            try
+            {
+                var response = await _httpClient.GetAsync(requestUri, cancellationToken);
+                if (response.IsSuccessStatusCode)
+                {
+                    using var jsonDocument = await JsonDocument.ParseAsync(await response.Content.ReadAsStreamAsync(cancellationToken), cancellationToken: cancellationToken);
+                    var root = jsonDocument.RootElement;
+                    return new JsonResult(root.GetProperty("version").GetString());
+                }
+            }
+            catch (HttpRequestException e)
+            {
+                _logger.LogError(e, $"Error encountered while sending GET request to {requestUri}");
+                return new JsonResult("Unable to fetch installed version") { StatusCode = StatusCodes.Status500InternalServerError };
+            }
+
+            return new JsonResult("-");
         }
 
-        return new JsonResult("-");
+        private class LatestVersions
+        {
+            [JsonProperty("versions")]
+            public Versions Versions { get; set; }
+        }
+
+        private class Versions
+        {
+            [JsonProperty("coreVersion")]
+            public string CoreVersion { get; set; }
+
+            [JsonProperty("webVersion")]
+            public string WebVersion { get; set; }
+
+            [JsonProperty("keyConnectorVersion")]
+            public string KeyConnectorVersion { get; set; }
+        }
     }
 
-    private class LatestVersions
+    public enum ProjectType
     {
-        [JsonProperty("versions")]
-        public Versions Versions { get; set; }
-    }
-
-    private class Versions
-    {
-        [JsonProperty("coreVersion")]
-        public string CoreVersion { get; set; }
-
-        [JsonProperty("webVersion")]
-        public string WebVersion { get; set; }
-
-        [JsonProperty("keyConnectorVersion")]
-        public string KeyConnectorVersion { get; set; }
+        Core,
+        Web,
     }
 }
-
-public enum ProjectType
-{
-    Core,
-    Web,
-}

src/Admin/Controllers/InfoController.cs

@@ -1,20 +1,21 @@
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers;
-
-public class InfoController : Controller
+namespace Bit.Admin.Controllers
 {
-    [HttpGet("~/alive")]
-    [HttpGet("~/now")]
-    public DateTime GetAlive()
+    public class InfoController : Controller
     {
-        return DateTime.UtcNow;
-    }
+        [HttpGet("~/alive")]
+        [HttpGet("~/now")]
+        public DateTime GetAlive()
+        {
+            return DateTime.UtcNow;
+        }
 
-    [HttpGet("~/version")]
-    public JsonResult GetVersion()
-    {
-        return Json(CoreHelpers.GetVersion());
+        [HttpGet("~/version")]
+        public JsonResult GetVersion()
+        {
+            return Json(CoreHelpers.GetVersion());
+        }
     }
 }

src/Admin/Controllers/LoginController.cs

@@ -3,90 +3,91 @@ using Bit.Core.Identity;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers;
-
-public class LoginController : Controller
+namespace Bit.Admin.Controllers
 {
-    private readonly PasswordlessSignInManager<IdentityUser> _signInManager;
-
-    public LoginController(
-        PasswordlessSignInManager<IdentityUser> signInManager)
+    public class LoginController : Controller
     {
-        _signInManager = signInManager;
-    }
+        private readonly PasswordlessSignInManager<IdentityUser> _signInManager;
 
-    public IActionResult Index(string returnUrl = null, int? error = null, int? success = null,
-        bool accessDenied = false)
-    {
-        if (!error.HasValue && accessDenied)
+        public LoginController(
+            PasswordlessSignInManager<IdentityUser> signInManager)
         {
-            error = 4;
+            _signInManager = signInManager;
         }
 
-        return View(new LoginModel
+        public IActionResult Index(string returnUrl = null, int? error = null, int? success = null,
+            bool accessDenied = false)
         {
-            ReturnUrl = returnUrl,
-            Error = GetMessage(error),
-            Success = GetMessage(success)
-        });
-    }
-
-    [HttpPost]
-    [ValidateAntiForgeryToken]
-    public async Task<IActionResult> Index(LoginModel model)
-    {
-        if (ModelState.IsValid)
-        {
-            await _signInManager.PasswordlessSignInAsync(model.Email, model.ReturnUrl);
-            return RedirectToAction("Index", new
+            if (!error.HasValue && accessDenied)
             {
-                success = 3
+                error = 4;
+            }
+
+            return View(new LoginModel
+            {
+                ReturnUrl = returnUrl,
+                Error = GetMessage(error),
+                Success = GetMessage(success)
             });
         }
 
-        return View(model);
-    }
-
-    public async Task<IActionResult> Confirm(string email, string token, string returnUrl)
-    {
-        var result = await _signInManager.PasswordlessSignInAsync(email, token, true);
-        if (!result.Succeeded)
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> Index(LoginModel model)
         {
+            if (ModelState.IsValid)
+            {
+                await _signInManager.PasswordlessSignInAsync(model.Email, model.ReturnUrl);
+                return RedirectToAction("Index", new
+                {
+                    success = 3
+                });
+            }
+
+            return View(model);
+        }
+
+        public async Task<IActionResult> Confirm(string email, string token, string returnUrl)
+        {
+            var result = await _signInManager.PasswordlessSignInAsync(email, token, true);
+            if (!result.Succeeded)
+            {
+                return RedirectToAction("Index", new
+                {
+                    error = 2
+                });
+            }
+
+            if (!string.IsNullOrWhiteSpace(returnUrl) && Url.IsLocalUrl(returnUrl))
+            {
+                return Redirect(returnUrl);
+            }
+
+            return RedirectToAction("Index", "Home");
+        }
+
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> Logout()
+        {
+            await _signInManager.SignOutAsync();
             return RedirectToAction("Index", new
             {
-                error = 2
+                success = 1
             });
         }
 
-        if (!string.IsNullOrWhiteSpace(returnUrl) && Url.IsLocalUrl(returnUrl))
+        private string GetMessage(int? messageCode)
         {
-            return Redirect(returnUrl);
+            return messageCode switch
+            {
+                1 => "You have been logged out.",
+                2 => "This login confirmation link is invalid. Try logging in again.",
+                3 => "If a valid admin user with this email address exists, " +
+                    "we've sent you an email with a secure link to log in.",
+                4 => "Access denied. Please log in.",
+                _ => null,
+            };
         }
-
-        return RedirectToAction("Index", "Home");
-    }
-
-    [HttpPost]
-    [ValidateAntiForgeryToken]
-    public async Task<IActionResult> Logout()
-    {
-        await _signInManager.SignOutAsync();
-        return RedirectToAction("Index", new
-        {
-            success = 1
-        });
-    }
-
-    private string GetMessage(int? messageCode)
-    {
-        return messageCode switch
-        {
-            1 => "You have been logged out.",
-            2 => "This login confirmation link is invalid. Try logging in again.",
-            3 => "If a valid admin user with this email address exists, " +
-                "we've sent you an email with a secure link to log in.",
-            4 => "Access denied. Please log in.",
-            _ => null,
-        };
     }
 }

src/Admin/Controllers/LogsController.cs

@@ -7,86 +7,87 @@ using Microsoft.Azure.Cosmos;
 using Microsoft.Azure.Cosmos.Linq;
 using Serilog.Events;
 
-namespace Bit.Admin.Controllers;
-
-[Authorize]
-[SelfHosted(NotSelfHostedOnly = true)]
-public class LogsController : Controller
+namespace Bit.Admin.Controllers
 {
-    private const string Database = "Diagnostics";
-    private const string Container = "Logs";
-
-    private readonly GlobalSettings _globalSettings;
-
-    public LogsController(GlobalSettings globalSettings)
+    [Authorize]
+    [SelfHosted(NotSelfHostedOnly = true)]
+    public class LogsController : Controller
     {
-        _globalSettings = globalSettings;
-    }
+        private const string Database = "Diagnostics";
+        private const string Container = "Logs";
 
-    public async Task<IActionResult> Index(string cursor = null, int count = 50,
-        LogEventLevel? level = null, string project = null, DateTime? start = null, DateTime? end = null)
-    {
-        using (var client = new CosmosClient(_globalSettings.DocumentDb.Uri,
-            _globalSettings.DocumentDb.Key))
+        private readonly GlobalSettings _globalSettings;
+
+        public LogsController(GlobalSettings globalSettings)
         {
-            var cosmosContainer = client.GetContainer(Database, Container);
-            var query = cosmosContainer.GetItemLinqQueryable<LogModel>(
-                requestOptions: new QueryRequestOptions()
-                {
-                    MaxItemCount = count
-                },
-                continuationToken: cursor
-            ).AsQueryable();
-
-            if (level.HasValue)
-            {
-                query = query.Where(l => l.Level == level.Value.ToString());
-            }
-            if (!string.IsNullOrWhiteSpace(project))
-            {
-                query = query.Where(l => l.Properties != null && l.Properties["Project"] == (object)project);
-            }
-            if (start.HasValue)
-            {
-                query = query.Where(l => l.Timestamp >= start.Value);
-            }
-            if (end.HasValue)
-            {
-                query = query.Where(l => l.Timestamp <= end.Value);
-            }
-            var feedIterator = query.OrderByDescending(l => l.Timestamp).ToFeedIterator();
-            var response = await feedIterator.ReadNextAsync();
-
-            return View(new LogsModel
-            {
-                Level = level,
-                Project = project,
-                Start = start,
-                End = end,
-                Items = response.ToList(),
-                Count = count,
-                Cursor = cursor,
-                NextCursor = response.ContinuationToken
-            });
+            _globalSettings = globalSettings;
         }
-    }
 
-    public async Task<IActionResult> View(Guid id)
-    {
-        using (var client = new CosmosClient(_globalSettings.DocumentDb.Uri,
-            _globalSettings.DocumentDb.Key))
+        public async Task<IActionResult> Index(string cursor = null, int count = 50,
+            LogEventLevel? level = null, string project = null, DateTime? start = null, DateTime? end = null)
         {
-            var cosmosContainer = client.GetContainer(Database, Container);
-            var query = cosmosContainer.GetItemLinqQueryable<LogDetailsModel>()
-                .AsQueryable()
-                .Where(l => l.Id == id.ToString());
-
-            var response = await query.ToFeedIterator().ReadNextAsync();
-            if (response == null || response.Count == 0)
+            using (var client = new CosmosClient(_globalSettings.DocumentDb.Uri,
+                _globalSettings.DocumentDb.Key))
             {
-                return RedirectToAction("Index");
+                var cosmosContainer = client.GetContainer(Database, Container);
+                var query = cosmosContainer.GetItemLinqQueryable<LogModel>(
+                    requestOptions: new QueryRequestOptions()
+                    {
+                        MaxItemCount = count
+                    },
+                    continuationToken: cursor
+                ).AsQueryable();
+
+                if (level.HasValue)
+                {
+                    query = query.Where(l => l.Level == level.Value.ToString());
+                }
+                if (!string.IsNullOrWhiteSpace(project))
+                {
+                    query = query.Where(l => l.Properties != null && l.Properties["Project"] == (object)project);
+                }
+                if (start.HasValue)
+                {
+                    query = query.Where(l => l.Timestamp >= start.Value);
+                }
+                if (end.HasValue)
+                {
+                    query = query.Where(l => l.Timestamp <= end.Value);
+                }
+                var feedIterator = query.OrderByDescending(l => l.Timestamp).ToFeedIterator();
+                var response = await feedIterator.ReadNextAsync();
+
+                return View(new LogsModel
+                {
+                    Level = level,
+                    Project = project,
+                    Start = start,
+                    End = end,
+                    Items = response.ToList(),
+                    Count = count,
+                    Cursor = cursor,
+                    NextCursor = response.ContinuationToken
+                });
+            }
+        }
+
+        public async Task<IActionResult> View(Guid id)
+        {
+            using (var client = new CosmosClient(_globalSettings.DocumentDb.Uri,
+                _globalSettings.DocumentDb.Key))
+            {
+                var cosmosContainer = client.GetContainer(Database, Container);
+                var query = cosmosContainer.GetItemLinqQueryable<LogDetailsModel>()
+                    .AsQueryable()
+                    .Where(l => l.Id == id.ToString());
+
+                var response = await query.ToFeedIterator().ReadNextAsync();
+                if (response == null || response.Count == 0)
+                {
+                    return RedirectToAction("Index");
+                }
+                return View(response.First());
             }
-            return View(response.First());
         }
     }
 }

src/Admin/Controllers/OrganizationsController.cs

@@ -11,206 +11,207 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers;
-
-[Authorize]
-public class OrganizationsController : Controller
+namespace Bit.Admin.Controllers
 {
-    private readonly IOrganizationRepository _organizationRepository;
-    private readonly IOrganizationUserRepository _organizationUserRepository;
-    private readonly IOrganizationConnectionRepository _organizationConnectionRepository;
-    private readonly ISelfHostedSyncSponsorshipsCommand _syncSponsorshipsCommand;
-    private readonly ICipherRepository _cipherRepository;
-    private readonly ICollectionRepository _collectionRepository;
-    private readonly IGroupRepository _groupRepository;
-    private readonly IPolicyRepository _policyRepository;
-    private readonly IPaymentService _paymentService;
-    private readonly ILicensingService _licensingService;
-    private readonly IApplicationCacheService _applicationCacheService;
-    private readonly GlobalSettings _globalSettings;
-    private readonly IReferenceEventService _referenceEventService;
-    private readonly IUserService _userService;
-    private readonly ILogger<OrganizationsController> _logger;
-
-    public OrganizationsController(
-        IOrganizationRepository organizationRepository,
-        IOrganizationUserRepository organizationUserRepository,
-        IOrganizationConnectionRepository organizationConnectionRepository,
-        ISelfHostedSyncSponsorshipsCommand syncSponsorshipsCommand,
-        ICipherRepository cipherRepository,
-        ICollectionRepository collectionRepository,
-        IGroupRepository groupRepository,
-        IPolicyRepository policyRepository,
-        IPaymentService paymentService,
-        ILicensingService licensingService,
-        IApplicationCacheService applicationCacheService,
-        GlobalSettings globalSettings,
-        IReferenceEventService referenceEventService,
-        IUserService userService,
-        ILogger<OrganizationsController> logger)
+    [Authorize]
+    public class OrganizationsController : Controller
     {
-        _organizationRepository = organizationRepository;
-        _organizationUserRepository = organizationUserRepository;
-        _organizationConnectionRepository = organizationConnectionRepository;
-        _syncSponsorshipsCommand = syncSponsorshipsCommand;
-        _cipherRepository = cipherRepository;
-        _collectionRepository = collectionRepository;
-        _groupRepository = groupRepository;
-        _policyRepository = policyRepository;
-        _paymentService = paymentService;
-        _licensingService = licensingService;
-        _applicationCacheService = applicationCacheService;
-        _globalSettings = globalSettings;
-        _referenceEventService = referenceEventService;
-        _userService = userService;
-        _logger = logger;
-    }
+        private readonly IOrganizationRepository _organizationRepository;
+        private readonly IOrganizationUserRepository _organizationUserRepository;
+        private readonly IOrganizationConnectionRepository _organizationConnectionRepository;
+        private readonly ISelfHostedSyncSponsorshipsCommand _syncSponsorshipsCommand;
+        private readonly ICipherRepository _cipherRepository;
+        private readonly ICollectionRepository _collectionRepository;
+        private readonly IGroupRepository _groupRepository;
+        private readonly IPolicyRepository _policyRepository;
+        private readonly IPaymentService _paymentService;
+        private readonly ILicensingService _licensingService;
+        private readonly IApplicationCacheService _applicationCacheService;
+        private readonly GlobalSettings _globalSettings;
+        private readonly IReferenceEventService _referenceEventService;
+        private readonly IUserService _userService;
+        private readonly ILogger<OrganizationsController> _logger;
 
-    public async Task<IActionResult> Index(string name = null, string userEmail = null, bool? paid = null,
-        int page = 1, int count = 25)
-    {
-        if (page < 1)
+        public OrganizationsController(
+            IOrganizationRepository organizationRepository,
+            IOrganizationUserRepository organizationUserRepository,
+            IOrganizationConnectionRepository organizationConnectionRepository,
+            ISelfHostedSyncSponsorshipsCommand syncSponsorshipsCommand,
+            ICipherRepository cipherRepository,
+            ICollectionRepository collectionRepository,
+            IGroupRepository groupRepository,
+            IPolicyRepository policyRepository,
+            IPaymentService paymentService,
+            ILicensingService licensingService,
+            IApplicationCacheService applicationCacheService,
+            GlobalSettings globalSettings,
+            IReferenceEventService referenceEventService,
+            IUserService userService,
+            ILogger<OrganizationsController> logger)
         {
-            page = 1;
+            _organizationRepository = organizationRepository;
+            _organizationUserRepository = organizationUserRepository;
+            _organizationConnectionRepository = organizationConnectionRepository;
+            _syncSponsorshipsCommand = syncSponsorshipsCommand;
+            _cipherRepository = cipherRepository;
+            _collectionRepository = collectionRepository;
+            _groupRepository = groupRepository;
+            _policyRepository = policyRepository;
+            _paymentService = paymentService;
+            _licensingService = licensingService;
+            _applicationCacheService = applicationCacheService;
+            _globalSettings = globalSettings;
+            _referenceEventService = referenceEventService;
+            _userService = userService;
+            _logger = logger;
         }
 
-        if (count < 1)
+        public async Task<IActionResult> Index(string name = null, string userEmail = null, bool? paid = null,
+            int page = 1, int count = 25)
         {
-            count = 1;
+            if (page < 1)
+            {
+                page = 1;
+            }
+
+            if (count < 1)
+            {
+                count = 1;
+            }
+
+            var skip = (page - 1) * count;
+            var organizations = await _organizationRepository.SearchAsync(name, userEmail, paid, skip, count);
+            return View(new OrganizationsModel
+            {
+                Items = organizations as List<Organization>,
+                Name = string.IsNullOrWhiteSpace(name) ? null : name,
+                UserEmail = string.IsNullOrWhiteSpace(userEmail) ? null : userEmail,
+                Paid = paid,
+                Page = page,
+                Count = count,
+                Action = _globalSettings.SelfHosted ? "View" : "Edit",
+                SelfHosted = _globalSettings.SelfHosted
+            });
         }
 
-        var skip = (page - 1) * count;
-        var organizations = await _organizationRepository.SearchAsync(name, userEmail, paid, skip, count);
-        return View(new OrganizationsModel
+        public async Task<IActionResult> View(Guid id)
         {
-            Items = organizations as List<Organization>,
-            Name = string.IsNullOrWhiteSpace(name) ? null : name,
-            UserEmail = string.IsNullOrWhiteSpace(userEmail) ? null : userEmail,
-            Paid = paid,
-            Page = page,
-            Count = count,
-            Action = _globalSettings.SelfHosted ? "View" : "Edit",
-            SelfHosted = _globalSettings.SelfHosted
-        });
-    }
+            var organization = await _organizationRepository.GetByIdAsync(id);
+            if (organization == null)
+            {
+                return RedirectToAction("Index");
+            }
 
-    public async Task<IActionResult> View(Guid id)
-    {
-        var organization = await _organizationRepository.GetByIdAsync(id);
-        if (organization == null)
+            var ciphers = await _cipherRepository.GetManyByOrganizationIdAsync(id);
+            var collections = await _collectionRepository.GetManyByOrganizationIdAsync(id);
+            IEnumerable<Group> groups = null;
+            if (organization.UseGroups)
+            {
+                groups = await _groupRepository.GetManyByOrganizationIdAsync(id);
+            }
+            IEnumerable<Policy> policies = null;
+            if (organization.UsePolicies)
+            {
+                policies = await _policyRepository.GetManyByOrganizationIdAsync(id);
+            }
+            var users = await _organizationUserRepository.GetManyDetailsByOrganizationAsync(id);
+            var billingSyncConnection = _globalSettings.EnableCloudCommunication ? await _organizationConnectionRepository.GetByOrganizationIdTypeAsync(id, OrganizationConnectionType.CloudBillingSync) : null;
+            return View(new OrganizationViewModel(organization, billingSyncConnection, users, ciphers, collections, groups, policies));
+        }
+
+        [SelfHosted(NotSelfHostedOnly = true)]
+        public async Task<IActionResult> Edit(Guid id)
         {
+            var organization = await _organizationRepository.GetByIdAsync(id);
+            if (organization == null)
+            {
+                return RedirectToAction("Index");
+            }
+
+            var ciphers = await _cipherRepository.GetManyByOrganizationIdAsync(id);
+            var collections = await _collectionRepository.GetManyByOrganizationIdAsync(id);
+            IEnumerable<Group> groups = null;
+            if (organization.UseGroups)
+            {
+                groups = await _groupRepository.GetManyByOrganizationIdAsync(id);
+            }
+            IEnumerable<Policy> policies = null;
+            if (organization.UsePolicies)
+            {
+                policies = await _policyRepository.GetManyByOrganizationIdAsync(id);
+            }
+            var users = await _organizationUserRepository.GetManyDetailsByOrganizationAsync(id);
+            var billingInfo = await _paymentService.GetBillingAsync(organization);
+            var billingSyncConnection = _globalSettings.EnableCloudCommunication ? await _organizationConnectionRepository.GetByOrganizationIdTypeAsync(id, OrganizationConnectionType.CloudBillingSync) : null;
+            return View(new OrganizationEditModel(organization, users, ciphers, collections, groups, policies,
+                billingInfo, billingSyncConnection, _globalSettings));
+        }
+
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [SelfHosted(NotSelfHostedOnly = true)]
+        public async Task<IActionResult> Edit(Guid id, OrganizationEditModel model)
+        {
+            var organization = await _organizationRepository.GetByIdAsync(id);
+            model.ToOrganization(organization);
+            await _organizationRepository.ReplaceAsync(organization);
+            await _applicationCacheService.UpsertOrganizationAbilityAsync(organization);
+            await _referenceEventService.RaiseEventAsync(new ReferenceEvent(ReferenceEventType.OrganizationEditedByAdmin, organization)
+            {
+                EventRaisedByUser = _userService.GetUserName(User),
+                SalesAssistedTrialStarted = model.SalesAssistedTrialStarted,
+            });
+            return RedirectToAction("Edit", new { id });
+        }
+
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> Delete(Guid id)
+        {
+            var organization = await _organizationRepository.GetByIdAsync(id);
+            if (organization != null)
+            {
+                await _organizationRepository.DeleteAsync(organization);
+                await _applicationCacheService.DeleteOrganizationAbilityAsync(organization.Id);
+            }
+
             return RedirectToAction("Index");
         }
 
-        var ciphers = await _cipherRepository.GetManyByOrganizationIdAsync(id);
-        var collections = await _collectionRepository.GetManyByOrganizationIdAsync(id);
-        IEnumerable<Group> groups = null;
-        if (organization.UseGroups)
+        public async Task<IActionResult> TriggerBillingSync(Guid id)
         {
-            groups = await _groupRepository.GetManyByOrganizationIdAsync(id);
-        }
-        IEnumerable<Policy> policies = null;
-        if (organization.UsePolicies)
-        {
-            policies = await _policyRepository.GetManyByOrganizationIdAsync(id);
-        }
-        var users = await _organizationUserRepository.GetManyDetailsByOrganizationAsync(id);
-        var billingSyncConnection = _globalSettings.EnableCloudCommunication ? await _organizationConnectionRepository.GetByOrganizationIdTypeAsync(id, OrganizationConnectionType.CloudBillingSync) : null;
-        return View(new OrganizationViewModel(organization, billingSyncConnection, users, ciphers, collections, groups, policies));
-    }
+            var organization = await _organizationRepository.GetByIdAsync(id);
+            if (organization == null)
+            {
+                return RedirectToAction("Index");
+            }
+            var connection = (await _organizationConnectionRepository.GetEnabledByOrganizationIdTypeAsync(id, OrganizationConnectionType.CloudBillingSync)).FirstOrDefault();
+            if (connection != null)
+            {
+                try
+                {
+                    var config = connection.GetConfig<BillingSyncConfig>();
+                    await _syncSponsorshipsCommand.SyncOrganization(id, config.CloudOrganizationId, connection);
+                    TempData["ConnectionActivated"] = id;
+                    TempData["ConnectionError"] = null;
+                }
+                catch (Exception ex)
+                {
+                    TempData["ConnectionError"] = ex.Message;
+                    _logger.LogWarning(ex, "Error while attempting to do billing sync for organization with id '{OrganizationId}'", id);
+                }
 
-    [SelfHosted(NotSelfHostedOnly = true)]
-    public async Task<IActionResult> Edit(Guid id)
-    {
-        var organization = await _organizationRepository.GetByIdAsync(id);
-        if (organization == null)
-        {
+                if (_globalSettings.SelfHosted)
+                {
+                    return RedirectToAction("View", new { id });
+                }
+                else
+                {
+                    return RedirectToAction("Edit", new { id });
+                }
+            }
             return RedirectToAction("Index");
         }
 
-        var ciphers = await _cipherRepository.GetManyByOrganizationIdAsync(id);
-        var collections = await _collectionRepository.GetManyByOrganizationIdAsync(id);
-        IEnumerable<Group> groups = null;
-        if (organization.UseGroups)
-        {
-            groups = await _groupRepository.GetManyByOrganizationIdAsync(id);
-        }
-        IEnumerable<Policy> policies = null;
-        if (organization.UsePolicies)
-        {
-            policies = await _policyRepository.GetManyByOrganizationIdAsync(id);
-        }
-        var users = await _organizationUserRepository.GetManyDetailsByOrganizationAsync(id);
-        var billingInfo = await _paymentService.GetBillingAsync(organization);
-        var billingSyncConnection = _globalSettings.EnableCloudCommunication ? await _organizationConnectionRepository.GetByOrganizationIdTypeAsync(id, OrganizationConnectionType.CloudBillingSync) : null;
-        return View(new OrganizationEditModel(organization, users, ciphers, collections, groups, policies,
-            billingInfo, billingSyncConnection, _globalSettings));
     }
-
-    [HttpPost]
-    [ValidateAntiForgeryToken]
-    [SelfHosted(NotSelfHostedOnly = true)]
-    public async Task<IActionResult> Edit(Guid id, OrganizationEditModel model)
-    {
-        var organization = await _organizationRepository.GetByIdAsync(id);
-        model.ToOrganization(organization);
-        await _organizationRepository.ReplaceAsync(organization);
-        await _applicationCacheService.UpsertOrganizationAbilityAsync(organization);
-        await _referenceEventService.RaiseEventAsync(new ReferenceEvent(ReferenceEventType.OrganizationEditedByAdmin, organization)
-        {
-            EventRaisedByUser = _userService.GetUserName(User),
-            SalesAssistedTrialStarted = model.SalesAssistedTrialStarted,
-        });
-        return RedirectToAction("Edit", new { id });
-    }
-
-    [HttpPost]
-    [ValidateAntiForgeryToken]
-    public async Task<IActionResult> Delete(Guid id)
-    {
-        var organization = await _organizationRepository.GetByIdAsync(id);
-        if (organization != null)
-        {
-            await _organizationRepository.DeleteAsync(organization);
-            await _applicationCacheService.DeleteOrganizationAbilityAsync(organization.Id);
-        }
-
-        return RedirectToAction("Index");
-    }
-
-    public async Task<IActionResult> TriggerBillingSync(Guid id)
-    {
-        var organization = await _organizationRepository.GetByIdAsync(id);
-        if (organization == null)
-        {
-            return RedirectToAction("Index");
-        }
-        var connection = (await _organizationConnectionRepository.GetEnabledByOrganizationIdTypeAsync(id, OrganizationConnectionType.CloudBillingSync)).FirstOrDefault();
-        if (connection != null)
-        {
-            try
-            {
-                var config = connection.GetConfig<BillingSyncConfig>();
-                await _syncSponsorshipsCommand.SyncOrganization(id, config.CloudOrganizationId, connection);
-                TempData["ConnectionActivated"] = id;
-                TempData["ConnectionError"] = null;
-            }
-            catch (Exception ex)
-            {
-                TempData["ConnectionError"] = ex.Message;
-                _logger.LogWarning(ex, "Error while attempting to do billing sync for organization with id '{OrganizationId}'", id);
-            }
-
-            if (_globalSettings.SelfHosted)
-            {
-                return RedirectToAction("View", new { id });
-            }
-            else
-            {
-                return RedirectToAction("Edit", new { id });
-            }
-        }
-        return RedirectToAction("Index");
-    }
-
 }

src/Admin/Controllers/ProvidersController.cs

@@ -7,127 +7,128 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers;
-
-[Authorize]
-[SelfHosted(NotSelfHostedOnly = true)]
-public class ProvidersController : Controller
+namespace Bit.Admin.Controllers
 {
-    private readonly IProviderRepository _providerRepository;
-    private readonly IProviderUserRepository _providerUserRepository;
-    private readonly IProviderOrganizationRepository _providerOrganizationRepository;
-    private readonly GlobalSettings _globalSettings;
-    private readonly IApplicationCacheService _applicationCacheService;
-    private readonly IProviderService _providerService;
-
-    public ProvidersController(IProviderRepository providerRepository, IProviderUserRepository providerUserRepository,
-        IProviderOrganizationRepository providerOrganizationRepository, IProviderService providerService,
-        GlobalSettings globalSettings, IApplicationCacheService applicationCacheService)
-    {
-        _providerRepository = providerRepository;
-        _providerUserRepository = providerUserRepository;
-        _providerOrganizationRepository = providerOrganizationRepository;
-        _providerService = providerService;
-        _globalSettings = globalSettings;
-        _applicationCacheService = applicationCacheService;
-    }
-
-    public async Task<IActionResult> Index(string name = null, string userEmail = null, int page = 1, int count = 25)
-    {
-        if (page < 1)
-        {
-            page = 1;
-        }
-
-        if (count < 1)
-        {
-            count = 1;
-        }
-
-        var skip = (page - 1) * count;
-        var providers = await _providerRepository.SearchAsync(name, userEmail, skip, count);
-        return View(new ProvidersModel
-        {
-            Items = providers as List<Provider>,
-            Name = string.IsNullOrWhiteSpace(name) ? null : name,
-            UserEmail = string.IsNullOrWhiteSpace(userEmail) ? null : userEmail,
-            Page = page,
-            Count = count,
-            Action = _globalSettings.SelfHosted ? "View" : "Edit",
-            SelfHosted = _globalSettings.SelfHosted
-        });
-    }
-
-    public IActionResult Create(string ownerEmail = null)
-    {
-        return View(new CreateProviderModel
-        {
-            OwnerEmail = ownerEmail
-        });
-    }
-
-    [HttpPost]
-    [ValidateAntiForgeryToken]
-    public async Task<IActionResult> Create(CreateProviderModel model)
-    {
-        if (!ModelState.IsValid)
-        {
-            return View(model);
-        }
-
-        await _providerService.CreateAsync(model.OwnerEmail);
-
-        return RedirectToAction("Index");
-    }
-
-    public async Task<IActionResult> View(Guid id)
-    {
-        var provider = await _providerRepository.GetByIdAsync(id);
-        if (provider == null)
-        {
-            return RedirectToAction("Index");
-        }
-
-        var users = await _providerUserRepository.GetManyDetailsByProviderAsync(id);
-        var providerOrganizations = await _providerOrganizationRepository.GetManyDetailsByProviderAsync(id);
-        return View(new ProviderViewModel(provider, users, providerOrganizations));
-    }
-
+    [Authorize]
     [SelfHosted(NotSelfHostedOnly = true)]
-    public async Task<IActionResult> Edit(Guid id)
+    public class ProvidersController : Controller
     {
-        var provider = await _providerRepository.GetByIdAsync(id);
-        if (provider == null)
+        private readonly IProviderRepository _providerRepository;
+        private readonly IProviderUserRepository _providerUserRepository;
+        private readonly IProviderOrganizationRepository _providerOrganizationRepository;
+        private readonly GlobalSettings _globalSettings;
+        private readonly IApplicationCacheService _applicationCacheService;
+        private readonly IProviderService _providerService;
+
+        public ProvidersController(IProviderRepository providerRepository, IProviderUserRepository providerUserRepository,
+            IProviderOrganizationRepository providerOrganizationRepository, IProviderService providerService,
+            GlobalSettings globalSettings, IApplicationCacheService applicationCacheService)
         {
+            _providerRepository = providerRepository;
+            _providerUserRepository = providerUserRepository;
+            _providerOrganizationRepository = providerOrganizationRepository;
+            _providerService = providerService;
+            _globalSettings = globalSettings;
+            _applicationCacheService = applicationCacheService;
+        }
+
+        public async Task<IActionResult> Index(string name = null, string userEmail = null, int page = 1, int count = 25)
+        {
+            if (page < 1)
+            {
+                page = 1;
+            }
+
+            if (count < 1)
+            {
+                count = 1;
+            }
+
+            var skip = (page - 1) * count;
+            var providers = await _providerRepository.SearchAsync(name, userEmail, skip, count);
+            return View(new ProvidersModel
+            {
+                Items = providers as List<Provider>,
+                Name = string.IsNullOrWhiteSpace(name) ? null : name,
+                UserEmail = string.IsNullOrWhiteSpace(userEmail) ? null : userEmail,
+                Page = page,
+                Count = count,
+                Action = _globalSettings.SelfHosted ? "View" : "Edit",
+                SelfHosted = _globalSettings.SelfHosted
+            });
+        }
+
+        public IActionResult Create(string ownerEmail = null)
+        {
+            return View(new CreateProviderModel
+            {
+                OwnerEmail = ownerEmail
+            });
+        }
+
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> Create(CreateProviderModel model)
+        {
+            if (!ModelState.IsValid)
+            {
+                return View(model);
+            }
+
+            await _providerService.CreateAsync(model.OwnerEmail);
+
             return RedirectToAction("Index");
         }
 
-        var users = await _providerUserRepository.GetManyDetailsByProviderAsync(id);
-        var providerOrganizations = await _providerOrganizationRepository.GetManyDetailsByProviderAsync(id);
-        return View(new ProviderEditModel(provider, users, providerOrganizations));
-    }
-
-    [HttpPost]
-    [ValidateAntiForgeryToken]
-    [SelfHosted(NotSelfHostedOnly = true)]
-    public async Task<IActionResult> Edit(Guid id, ProviderEditModel model)
-    {
-        var provider = await _providerRepository.GetByIdAsync(id);
-        if (provider == null)
+        public async Task<IActionResult> View(Guid id)
         {
-            return RedirectToAction("Index");
+            var provider = await _providerRepository.GetByIdAsync(id);
+            if (provider == null)
+            {
+                return RedirectToAction("Index");
+            }
+
+            var users = await _providerUserRepository.GetManyDetailsByProviderAsync(id);
+            var providerOrganizations = await _providerOrganizationRepository.GetManyDetailsByProviderAsync(id);
+            return View(new ProviderViewModel(provider, users, providerOrganizations));
         }
 
-        model.ToProvider(provider);
-        await _providerRepository.ReplaceAsync(provider);
-        await _applicationCacheService.UpsertProviderAbilityAsync(provider);
-        return RedirectToAction("Edit", new { id });
-    }
+        [SelfHosted(NotSelfHostedOnly = true)]
+        public async Task<IActionResult> Edit(Guid id)
+        {
+            var provider = await _providerRepository.GetByIdAsync(id);
+            if (provider == null)
+            {
+                return RedirectToAction("Index");
+            }
 
-    public async Task<IActionResult> ResendInvite(Guid ownerId, Guid providerId)
-    {
-        await _providerService.ResendProviderSetupInviteEmailAsync(providerId, ownerId);
-        TempData["InviteResentTo"] = ownerId;
-        return RedirectToAction("Edit", new { id = providerId });
+            var users = await _providerUserRepository.GetManyDetailsByProviderAsync(id);
+            var providerOrganizations = await _providerOrganizationRepository.GetManyDetailsByProviderAsync(id);
+            return View(new ProviderEditModel(provider, users, providerOrganizations));
+        }
+
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [SelfHosted(NotSelfHostedOnly = true)]
+        public async Task<IActionResult> Edit(Guid id, ProviderEditModel model)
+        {
+            var provider = await _providerRepository.GetByIdAsync(id);
+            if (provider == null)
+            {
+                return RedirectToAction("Index");
+            }
+
+            model.ToProvider(provider);
+            await _providerRepository.ReplaceAsync(provider);
+            await _applicationCacheService.UpsertProviderAbilityAsync(provider);
+            return RedirectToAction("Edit", new { id });
+        }
+
+        public async Task<IActionResult> ResendInvite(Guid ownerId, Guid providerId)
+        {
+            await _providerService.ResendProviderSetupInviteEmailAsync(providerId, ownerId);
+            TempData["InviteResentTo"] = ownerId;
+            return RedirectToAction("Edit", new { id = providerId });
+        }
     }
 }

src/Admin/Controllers/UsersController.cs

@@ -7,104 +7,105 @@ using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Bit.Admin.Controllers;
-
-[Authorize]
-public class UsersController : Controller
+namespace Bit.Admin.Controllers
 {
-    private readonly IUserRepository _userRepository;
-    private readonly ICipherRepository _cipherRepository;
-    private readonly IPaymentService _paymentService;
-    private readonly GlobalSettings _globalSettings;
-
-    public UsersController(
-        IUserRepository userRepository,
-        ICipherRepository cipherRepository,
-        IPaymentService paymentService,
-        GlobalSettings globalSettings)
+    [Authorize]
+    public class UsersController : Controller
     {
-        _userRepository = userRepository;
-        _cipherRepository = cipherRepository;
-        _paymentService = paymentService;
-        _globalSettings = globalSettings;
-    }
+        private readonly IUserRepository _userRepository;
+        private readonly ICipherRepository _cipherRepository;
+        private readonly IPaymentService _paymentService;
+        private readonly GlobalSettings _globalSettings;
 
-    public async Task<IActionResult> Index(string email, int page = 1, int count = 25)
-    {
-        if (page < 1)
+        public UsersController(
+            IUserRepository userRepository,
+            ICipherRepository cipherRepository,
+            IPaymentService paymentService,
+            GlobalSettings globalSettings)
         {
-            page = 1;
+            _userRepository = userRepository;
+            _cipherRepository = cipherRepository;
+            _paymentService = paymentService;
+            _globalSettings = globalSettings;
         }
 
-        if (count < 1)
+        public async Task<IActionResult> Index(string email, int page = 1, int count = 25)
         {
-            count = 1;
+            if (page < 1)
+            {
+                page = 1;
+            }
+
+            if (count < 1)
+            {
+                count = 1;
+            }
+
+            var skip = (page - 1) * count;
+            var users = await _userRepository.SearchAsync(email, skip, count);
+            return View(new UsersModel
+            {
+                Items = users as List<User>,
+                Email = string.IsNullOrWhiteSpace(email) ? null : email,
+                Page = page,
+                Count = count,
+                Action = _globalSettings.SelfHosted ? "View" : "Edit"
+            });
         }
 
-        var skip = (page - 1) * count;
-        var users = await _userRepository.SearchAsync(email, skip, count);
-        return View(new UsersModel
+        public async Task<IActionResult> View(Guid id)
         {
-            Items = users as List<User>,
-            Email = string.IsNullOrWhiteSpace(email) ? null : email,
-            Page = page,
-            Count = count,
-            Action = _globalSettings.SelfHosted ? "View" : "Edit"
-        });
-    }
+            var user = await _userRepository.GetByIdAsync(id);
+            if (user == null)
+            {
+                return RedirectToAction("Index");
+            }
 
-    public async Task<IActionResult> View(Guid id)
-    {
-        var user = await _userRepository.GetByIdAsync(id);
-        if (user == null)
+            var ciphers = await _cipherRepository.GetManyByUserIdAsync(id);
+            return View(new UserViewModel(user, ciphers));
+        }
+
+        [SelfHosted(NotSelfHostedOnly = true)]
+        public async Task<IActionResult> Edit(Guid id)
         {
+            var user = await _userRepository.GetByIdAsync(id);
+            if (user == null)
+            {
+                return RedirectToAction("Index");
+            }
+
+            var ciphers = await _cipherRepository.GetManyByUserIdAsync(id);
+            var billingInfo = await _paymentService.GetBillingAsync(user);
+            return View(new UserEditModel(user, ciphers, billingInfo, _globalSettings));
+        }
+
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        [SelfHosted(NotSelfHostedOnly = true)]
+        public async Task<IActionResult> Edit(Guid id, UserEditModel model)
+        {
+            var user = await _userRepository.GetByIdAsync(id);
+            if (user == null)
+            {
+                return RedirectToAction("Index");
+            }
+
+            model.ToUser(user);
+            await _userRepository.ReplaceAsync(user);
+            return RedirectToAction("Edit", new { id });
+        }
+
+        [HttpPost]
+        [ValidateAntiForgeryToken]
+        public async Task<IActionResult> Delete(Guid id)
+        {
+            var user = await _userRepository.GetByIdAsync(id);
+            if (user != null)
+            {
+                await _userRepository.DeleteAsync(user);
+            }
+
             return RedirectToAction("Index");
         }
-
-        var ciphers = await _cipherRepository.GetManyByUserIdAsync(id);
-        return View(new UserViewModel(user, ciphers));
-    }
-
-    [SelfHosted(NotSelfHostedOnly = true)]
-    public async Task<IActionResult> Edit(Guid id)
-    {
-        var user = await _userRepository.GetByIdAsync(id);
-        if (user == null)
-        {
-            return RedirectToAction("Index");
-        }
-
-        var ciphers = await _cipherRepository.GetManyByUserIdAsync(id);
-        var billingInfo = await _paymentService.GetBillingAsync(user);
-        return View(new UserEditModel(user, ciphers, billingInfo, _globalSettings));
-    }
-
-    [HttpPost]
-    [ValidateAntiForgeryToken]
-    [SelfHosted(NotSelfHostedOnly = true)]
-    public async Task<IActionResult> Edit(Guid id, UserEditModel model)
-    {
-        var user = await _userRepository.GetByIdAsync(id);
-        if (user == null)
-        {
-            return RedirectToAction("Index");
-        }
-
-        model.ToUser(user);
-        await _userRepository.ReplaceAsync(user);
-        return RedirectToAction("Edit", new { id });
-    }
-
-    [HttpPost]
-    [ValidateAntiForgeryToken]
-    public async Task<IActionResult> Delete(Guid id)
-    {
-        var user = await _userRepository.GetByIdAsync(id);
-        if (user != null)
-        {
-            await _userRepository.DeleteAsync(user);
-        }
-
-        return RedirectToAction("Index");
     }
 }