Issue 106: Removing a Role throws an exception

.gitignore

@@ -12,3 +12,4 @@ classes
 cobertura.ser
 kindlegen
 /plugin/src/main/templates/views
+.java-version

examples/simple/src/integration-test/groovy/module/RolesTab.groovy

@@ -33,6 +33,10 @@ class RolesTab extends Module {
         $("input", type: "checkbox", id: roleName).value(true)
     }
 
+    void disableRole(String roleName) {
+        $("input", type: "checkbox", id: roleName).value(false)
+    }
+
     boolean hasEnabledRole(String roleName) {
         return hasEnabledRoles([roleName])
     }

examples/simple/src/integration-test/groovy/spec/UserSpec.groovy → examples/simple/src/integration-test/groovy/spec/UserSimpleSpec.groovy

@@ -4,6 +4,7 @@ import page.user.UserCreatePage
 import page.user.UserEditPage
 import page.user.UserSearchPage
 import spock.lang.IgnoreIf
+import spock.lang.IgnoreRest
 import spock.lang.Issue
 
 @IgnoreIf({
@@ -18,7 +19,7 @@ import spock.lang.Issue
     }
     false
 })
-class UserSpec extends AbstractSecuritySpec {
+class UserSimpleSpec extends AbstractSecuritySpec {
 
     void testFindAll() {
         when:
@@ -204,4 +205,61 @@ class UserSpec extends AbstractSecuritySpec {
         assert rolesTab.hasEnabledRoles(['ROLE_USER', 'ROLE_ADMIN'])
         assert rolesTab.totalRoles() == 12
     }
+
+    @Issue("https://github.com/grails-plugins/grails-spring-security-ui/issues/106")
+    void testUserRoleAssociationsAreRemoved() {
+        when: "edit user 2"
+        go 'user/edit/2'
+
+        then:
+        at UserEditPage
+
+        when: "select Roles tab"
+        rolesTab.select()
+
+        then: "12 roles are listed and 1 is enabled"
+        assert rolesTab.totalRoles() == 12
+        assert rolesTab.totalEnabledRoles() == 1
+        assert rolesTab.hasEnabledRole('ROLE_USER')
+
+        when: "ROLE_ADMIN is enabled and the changes are saved"
+        rolesTab.enableRole "ROLE_ADMIN"
+        submit()
+        rolesTab.select()
+
+        then: "12 roles are listed and 2 are enabled"
+        assert rolesTab.totalEnabledRoles() == 2
+        assert rolesTab.hasEnabledRoles(['ROLE_USER', 'ROLE_ADMIN'])
+        assert rolesTab.totalRoles() == 12
+
+        when: "edit user 2"
+        go 'user/edit/2'
+
+        then:
+        at UserEditPage
+
+        when: "select Roles tab"
+        rolesTab.select()
+
+        then: "12 roles are listed and 2 are enabled"
+        assert rolesTab.totalRoles() == 12
+        assert rolesTab.totalEnabledRoles() == 2
+        assert rolesTab.hasEnabledRole('ROLE_USER')
+
+        when: "ROLE_ADMIN is disabled and the changes are saved"
+        rolesTab.disableRole "ROLE_ADMIN"
+        submit()
+        go 'user/edit/2'
+
+        then:
+        at UserEditPage
+
+        when: "select Roles tab"
+        rolesTab.select()
+
+        then: "12 roles are listed and 1 is enabled"
+        assert rolesTab.totalEnabledRoles() == 1
+        assert rolesTab.hasEnabledRoles(['ROLE_USER'])
+        assert rolesTab.totalRoles() == 12
+    }
 }

plugin/grails-app/services/grails/plugin/springsecurity/ui/SpringSecurityUiService.groovy

@@ -442,15 +442,20 @@ class SpringSecurityUiService implements AclStrategy, ErrorsStrategy, Persistent
 		}
 
 		try {
-			for (role in rolesToRemove) {
-				UserRole.remove user, role
+			rolesToRemove.each { role ->
+			    removeUserRoleAndReturnBoolean(user, role)
 			}
 		}
 		catch (e) {
 			uiErrorsStrategy.handleException e, user, null, this, 'removeUserRoles', transactionStatus
 		}
 	}
 
+	@Transactional
+	boolean removeUserRoleAndReturnBoolean(def user, def role) {
+		UserRole.remove user, role
+	}
+
 	@Transactional
 	Number removeUserRole(def u, def r) {
 		UserRole.where { user == u && role == r }.deleteAll()