remove auth handler

src/Api/AdminConsole/Controllers/OrganizationUsersController.cs

@@ -6,7 +6,6 @@ using Bit.Api.Vault.AuthorizationHandlers.Collections;
 using Bit.Core;
 using Bit.Core.AdminConsole.Enums;
 using Bit.Core.AdminConsole.Models.Data.Organizations.Policies;
-using Bit.Core.AdminConsole.OrganizationFeatures.Organizations.Authorization;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Authorization;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.RestoreUser.v1;
@@ -91,7 +90,8 @@ public class OrganizationUsersController : Controller
         IFeatureService featureService,
         IPricingClient pricingClient,
         IConfirmOrganizationUserCommand confirmOrganizationUserCommand,
-        IRestoreOrganizationUserCommand restoreOrganizationUserCommand)
+        IRestoreOrganizationUserCommand restoreOrganizationUserCommand,
+        IInitPendingOrganizationCommand initPendingOrganizationCommand)
     {
         _organizationRepository = organizationRepository;
         _organizationUserRepository = organizationUserRepository;
@@ -118,6 +118,7 @@ public class OrganizationUsersController : Controller
         _pricingClient = pricingClient;
         _confirmOrganizationUserCommand = confirmOrganizationUserCommand;
         _restoreOrganizationUserCommand = restoreOrganizationUserCommand;
+        _initPendingOrganizationCommand = initPendingOrganizationCommand;
     }
 
     [HttpGet("{id}")]
@@ -315,18 +316,7 @@ public class OrganizationUsersController : Controller
             throw new UnauthorizedAccessException();
         }
 
-        var authorizationResult = await _authorizationService.AuthorizeAsync(User, new OrganizationScope(orgId), OrganizationOperations.Update);
+        await _initPendingOrganizationCommand.InitPendingOrganizationAsync(user.Id, orgId, organizationUserId, model.Keys.PublicKey, model.Keys.EncryptedPrivateKey, model.CollectionName);
-        if (!authorizationResult.Succeeded)
-        {
-            throw new NotFoundException();
-        }
-
-        var commandResult = await _initPendingOrganizationCommand.InitPendingOrganizationAsync(user.Id, orgId, organizationUserId, model.Keys.PublicKey, model.Keys.EncryptedPrivateKey, model.CollectionName);
-        if (commandResult.HasErrors)
-        {
-            throw new BadRequestException(string.Join(", ", commandResult.ErrorMessages));
-        }
-
         await _acceptOrgUserCommand.AcceptOrgUserByEmailTokenAsync(organizationUserId, user, model.Token, _userService);
         await _confirmOrganizationUserCommand.ConfirmUserAsync(orgId, organizationUserId, model.Key, user.Id);
     }

src/Core/AdminConsole/OrganizationFeatures/Organizations/Authorization/OrganizationAuthorizationHandler.cs

@@ -1,47 +0,0 @@
-#nullable enable
-using Bit.Core.AdminConsole.OrganizationFeatures.Shared.Authorization;
-using Bit.Core.Context;
-using Microsoft.AspNetCore.Authorization;
-
-namespace Bit.Core.AdminConsole.OrganizationFeatures.Organizations.Authorization;
-
-public class OrganizationAuthorizationHandler
-    : AuthorizationHandler<OrganizationOperationRequirement, OrganizationScope>
-{
-    private readonly ICurrentContext _currentContext;
-
-    public OrganizationAuthorizationHandler(ICurrentContext currentContext)
-    {
-        _currentContext = currentContext;
-    }
-
-    protected override async Task HandleRequirementAsync(AuthorizationHandlerContext context,
-        OrganizationOperationRequirement requirement, OrganizationScope organizationScope)
-    {
-        var authorized = false;
-
-        switch (requirement)
-        {
-            case not null when requirement.Name == nameof(OrganizationOperations.Update):
-                authorized = await CanUpdateAsync(organizationScope);
-                break;
-        }
-
-        if (authorized)
-        {
-            context.Succeed(requirement!);
-        }
-    }
-
-    private async Task<bool> CanUpdateAsync(Guid organizationId)
-    {
-        var organization = _currentContext.GetOrganization(organizationId);
-        if (organization != null)
-        {
-            return true;
-        }
-
-        // Allow provider users to update organization data if they are a provider for the target organization
-        return await _currentContext.ProviderUserForOrgAsync(organizationId);
-    }
-}

src/Core/AdminConsole/OrganizationFeatures/Organizations/Authorization/OrganizationOperation.cs

@@ -1,10 +0,0 @@
-using Microsoft.AspNetCore.Authorization.Infrastructure;
-
-namespace Bit.Core.AdminConsole.OrganizationFeatures.Organizations.Authorization;
-
-public class OrganizationOperationRequirement : OperationAuthorizationRequirement;
-
-public static class OrganizationOperations
-{
-    public static OrganizationOperationRequirement Update = new() { Name = nameof(Update) };
-}

src/Core/AdminConsole/OrganizationFeatures/Organizations/InitPendingOrganizationCommand.cs

@@ -2,7 +2,6 @@
 using Bit.Core.Enums;
 using Bit.Core.Models.Commands;
 using Bit.Core.Models.Data;
-using Bit.Core.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.Repositories;
 using Bit.Core.Services;
 

src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs

@@ -9,7 +9,6 @@ using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationConnections.Interfa
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationDomains.Interfaces;
 using Bit.Core.AdminConsole.OrganizationFeatures.Organizations;
-using Bit.Core.AdminConsole.OrganizationFeatures.Organizations.Authorization;
 using Bit.Core.AdminConsole.OrganizationFeatures.Organizations.Interfaces;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers;
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Authorization;
@@ -174,7 +173,6 @@ public static class OrganizationServiceCollectionExtensions
 
         services.AddScoped<IAuthorizationHandler, OrganizationUserUserMiniDetailsAuthorizationHandler>();
         services.AddScoped<IAuthorizationHandler, OrganizationUserUserDetailsAuthorizationHandler>();
-        services.AddScoped<IAuthorizationHandler, OrganizationAuthorizationHandler>();
         services.AddScoped<IHasConfirmedOwnersExceptQuery, HasConfirmedOwnersExceptQuery>();
     }