Merge remote-tracking branch 'api/MAGETWO-54231-Broken-Integration' into pull-request

Author: Cari Spruiell

app/code/Magento/User/Model/ResourceModel/User.php

@@ -186,7 +186,7 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $user)
      */
     public function _clearUserRoles(ModelUser $user)
     {
-        $conditions = ['user_id = ?' => (int)$user->getId()];
+        $conditions = ['user_id = ?' => (int)$user->getId(), 'user_type = ?' => UserContextInterface::USER_TYPE_ADMIN];
         $this->getConnection()->delete($this->getTable('authorization_role'), $conditions);
     }
 
@@ -255,13 +255,13 @@ public function delete(\Magento\Framework\Model\AbstractModel $user)
         $uid = $user->getId();
         $connection->beginTransaction();
         try {
-            $conditions = ['user_id = ?' => $uid];
-
-            $connection->delete($this->getMainTable(), $conditions);
-            $connection->delete($this->getTable('authorization_role'), $conditions);
+            $connection->delete($this->getMainTable(), ['user_id = ?' => $uid]);
+            $connection->delete(
+                $this->getTable('authorization_role'),
+                ['user_id = ?' => $uid, 'user_type = ?' => UserContextInterface::USER_TYPE_ADMIN]
+            );
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             throw $e;
-            return false;
         } catch (\Exception $e) {
             $connection->rollBack();
             return false;
@@ -329,7 +329,11 @@ public function deleteFromRole(\Magento\Framework\Model\AbstractModel $user)
 
         $dbh = $this->getConnection();
 
-        $condition = ['user_id = ?' => (int)$user->getId(), 'parent_id = ?' => (int)$user->getRoleId()];
+        $condition = [
+            'user_id = ?' => (int)$user->getId(),
+            'parent_id = ?' => (int)$user->getRoleId(),
+            'user_type = ?' => UserContextInterface::USER_TYPE_ADMIN
+        ];
 
         $dbh->delete($this->getTable('authorization_role'), $condition);
         return $this;
@@ -348,9 +352,16 @@ public function roleUserExists(\Magento\Framework\Model\AbstractModel $user)
 
             $dbh = $this->getConnection();
 
-            $binds = ['parent_id' => $user->getRoleId(), 'user_id' => $user->getUserId()];
+            $binds = [
+                'parent_id' => $user->getRoleId(),
+                'user_id' => $user->getUserId(),
+                'user_type' => UserContextInterface::USER_TYPE_ADMIN
+            ];
 
-            $select = $dbh->select()->from($roleTable)->where('parent_id = :parent_id')->where('user_id = :user_id');
+            $select = $dbh->select()->from($roleTable)
+                ->where('parent_id = :parent_id')
+                ->where('user_type = :user_type')
+                ->where('user_id = :user_id');
 
             return $dbh->fetchCol($select, $binds);
         } else {