check if user has role from userToUpdate

back/methods/account/privileges.js

@@ -41,9 +41,6 @@ module.exports = Self => {
 
         const user = await models.Account.findById(userId, {fields: ['hasGrant']}, myOptions);
 
-        if (!user.hasGrant)
-            throw new UserError(`You don't have grant privilege`);
-
         const userToUpdate = await models.Account.findById(id, {
             fields: ['id', 'name', 'hasGrant', 'roleFk', 'password'],
             include: {
@@ -54,15 +51,22 @@ module.exports = Self => {
             }
         }, myOptions);
 
+        if (!user.hasGrant)
+            throw new UserError(`You don't have grant privilege`);
+
+        const hasRoleFromUser = await models.Account.hasRole(userId, userToUpdate.role().name, myOptions);
+
+        if (!hasRoleFromUser)
+            throw new UserError(`You don't own the role and you can't assign it to another user`);
+
         if (hasGrant != null)
             userToUpdate.hasGrant = hasGrant;
 
         if (roleFk) {
             const role = await models.Role.findById(roleFk, {fields: ['name']}, myOptions);
             const hasRole = await models.Account.hasRole(userId, role.name, myOptions);
-            const hasRoleFromUser = await models.Account.hasRole(userId, userToUpdate.role().name, myOptions);
 
-            if (!hasRole || !hasRoleFromUser)
+            if (!hasRole)
                 throw new UserError(`You don't own the role and you can't assign it to another user`);
 
             userToUpdate.roleFk = roleFk;

back/methods/account/specs/privileges.spec.js

@@ -4,6 +4,8 @@ describe('account privileges()', () => {
     const employeeId = 1;
     const developerId = 9;
     const sysadminId = 66;
+    const itBossId = 104;
+    const rootId = 100;
     const clarkKent = 1103;
 
     it('should throw an error when user not has privileges', async() => {
@@ -33,12 +35,26 @@ describe('account privileges()', () => {
         try {
             const options = {transaction: tx};
 
-            const root = await models.Role.findOne({
+            await models.Account.privileges(ctx, employeeId, rootId, null, options);
-                where: {
+
-                    name: 'root'
+            await tx.rollback();
+        } catch (e) {
+            error = e;
+            await tx.rollback();
         }
-            }, options);
+
-            await models.Account.privileges(ctx, employeeId, root.id, null, options);
+        expect(error.message).toContain(`You don't own the role and you can't assign it to another user`);
+    });
+
+    it('should throw an error when user has privileges but not has the role from user', async() => {
+        const ctx = {req: {accessToken: {userId: sysadminId}}};
+        const tx = await models.Account.beginTransaction({});
+
+        let error;
+        try {
+            const options = {transaction: tx};
+
+            await models.Account.privileges(ctx, itBossId, developerId, null, options);
 
             await tx.rollback();
         } catch (e) {