Update validation when removing a user that does not have the specified role

Author: didiermis

pallets/proxy/src/functions.rs

@@ -375,10 +375,8 @@ impl<T: Config> Pallet<T> {
         ensure!(<UsersByProject<T>>::get(project_id).contains(&user.clone()), Error::<T>::UserNotAssignedToProject);
         ensure!(<ProjectsByUser<T>>::get(user.clone()).contains(&project_id), Error::<T>::UserNotAssignedToProject);
 
-        // Ensure user has roles assigned to the project
-        // TODO: catch error and return custom error
-        //ensure!(T::Rbac::has_role(user.clone(), Self::pallet_id(), &project_id, [role.id()].to_vec()).is_ok(), Error::<T>::UserDoesNotHaveRole);
-        T::Rbac::has_role(user.clone(), Self::pallet_id(), &project_id, [role.id()].to_vec())?;
+        // Ensure user has the specified role assigned in the selected project
+        ensure!(T::Rbac::has_role(user.clone(), Self::pallet_id(), &project_id, [role.id()].to_vec()).is_ok(), Error::<T>::UserDoesNotHaveRole);
 
         // Update project data depending on the role unassigned
         Self::remove_project_role(project_id, user.clone(), role)?;

pallets/proxy/src/lib.rs

@@ -431,6 +431,8 @@ pub mod pallet {
 		TransactionIsAlreadyCompleted,
 		/// Expenditure type does not match project type
 		InvalidExpenditureType,
+		/// User does not have the specified role
+		UserDoesNotHaveRole,
 
 	}