Issue #79: Refactor UserController as demonstrated in PR 13

Applied refactoring from PR #13
grails · Oct 4, 2017 · fccf262 · fccf262
1 parent 341c1f7
commit fccf262
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/plugin/grails-app/controllers/grails/plugin/springsecurity/ui/UserController.groovy b/plugin/grails-app/controllers/grails/plugin/springsecurity/ui/UserController.groovy
@@ -86,17 +86,12 @@ class UserController extends AbstractS2UiDomainController {
 		if (!userRoleNames) {
 			return [:]
 		}
-		Map granted = [:]
-		Map notGranted = [:]
+		Map roleMap = [:]
 		for (role in sortedRoles()) {
 			String authority = role[authorityNameField]
-			if (userRoleNames.contains(authority)) {
-				granted[(role)] = userRoleNames.contains(authority)
-			} else {
-				notGranted[(role)] = userRoleNames.contains(authority)
-			}
+			roleMap[(role)] = userRoleNames.contains(authority)
 		}
-		return granted + notGranted
+		return roleMap
 	}
 
 	protected List sortedRoles() {

diff --git a/plugin/src/test/groovy/grails/plugin/springsecurity/ui/UserControllerSpec.groovy b/plugin/src/test/groovy/grails/plugin/springsecurity/ui/UserControllerSpec.groovy
@@ -28,6 +28,7 @@ class UserControllerSpec extends Specification implements ControllerUnitTest<Use
 
         then: "the user is only granted access to roles with which they are associated"
         results == expectedResults
+        results instanceof LinkedHashMap
 
         where:
         rolesAssignedToUser                                | expectedResults