From 4fee17fdde8b31f9e3e5fbab170b489c7232414b Mon Sep 17 00:00:00 2001
From: Oscar Hinton <oscar@oscarhinton.com>
Date: Thu, 14 Oct 2021 17:44:20 +0200
Subject: [PATCH] Add logic to handle providers password reseting users (#1632)

---
 src/Api/Controllers/OrganizationUsersController.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Api/Controllers/OrganizationUsersController.cs b/src/Api/Controllers/OrganizationUsersController.cs
index 97d6123b86..0ff3fe105c 100644
--- a/src/Api/Controllers/OrganizationUsersController.cs
+++ b/src/Api/Controllers/OrganizationUsersController.cs
@@ -284,14 +284,16 @@ namespace Bit.Api.Controllers
                 throw new NotFoundException();
             }
             
-            // Get the calling user's Type for this organization and pass it along
-            var orgType = _currentContext.Organizations?.FirstOrDefault(o => o.Id == orgGuidId)?.Type;
-            if (orgType == null)
+            // Get the users role, since provider users aren't a member of the organization we use the owner check
+            var orgUserType = await _currentContext.OrganizationOwner(orgGuidId)
+                ? OrganizationUserType.Owner
+                : _currentContext.Organizations?.FirstOrDefault(o => o.Id == orgGuidId)?.Type;
+            if (orgUserType == null)
             {
                 throw new NotFoundException();
             }
 
-            var result = await _userService.AdminResetPasswordAsync(orgType.Value, orgGuidId, new Guid(id), model.NewMasterPasswordHash, model.Key);
+            var result = await _userService.AdminResetPasswordAsync(orgUserType.Value, orgGuidId, new Guid(id), model.NewMasterPasswordHash, model.Key);
             if (result.Succeeded)
             {
                 return;