Updated tutorial to use permissions resolvers for groups and accounts per @mrioan

Author: dogeared

tutorials/spring-boot/04-a-finer-grain-of-control/src/main/java/com/stormpath/tutorial/controller/HelloController.java

@@ -16,11 +16,11 @@
 package com.stormpath.tutorial.controller;
 
 import com.stormpath.sdk.account.Account;
-import com.stormpath.sdk.directory.CustomData;
 import com.stormpath.sdk.group.Group;
-import com.stormpath.sdk.group.GroupList;
-import com.stormpath.sdk.lang.Collections;
 import com.stormpath.sdk.servlet.account.AccountResolver;
+import com.stormpath.spring.security.authz.permission.Permission;
+import com.stormpath.spring.security.provider.AccountPermissionResolver;
+import com.stormpath.spring.security.provider.GroupPermissionResolver;
 import com.stormpath.tutorial.service.HelloService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -33,6 +33,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @since 1.0.RC5
@@ -41,13 +42,22 @@
 public class HelloController {
 
     private AccountResolver accountResolver;
+    private GroupPermissionResolver stormpathGroupPermissionResolver;
+    private AccountPermissionResolver stormpathAccountPermissionResolver;
     private HelloService helloService;
 
     @Autowired
-    public HelloController(AccountResolver accountResolver, HelloService helloService) {
+    public HelloController(
+        AccountResolver accountResolver, GroupPermissionResolver stormpathGroupPermissionResolver,
+        AccountPermissionResolver stormpathAccountPermissionResolver, HelloService helloService
+    ) {
         Assert.notNull(accountResolver);
+        Assert.notNull(stormpathAccountPermissionResolver);
+        Assert.notNull(stormpathGroupPermissionResolver);
         Assert.notNull(helloService);
         this.accountResolver = accountResolver;
+        this.stormpathAccountPermissionResolver = stormpathAccountPermissionResolver;
+        this.stormpathGroupPermissionResolver = stormpathGroupPermissionResolver;
         this.helloService = helloService;
     }
 
@@ -60,18 +70,24 @@ String home(HttpServletRequest req, Model model) {
     @RequestMapping("/userdetails")
     String userDetails(HttpServletRequest req, Model model) {
         Account account = accountResolver.getAccount(req);
-        Map<String, List<String>> springSecurityPermissions = new HashMap<>();
+        Map<String, Set<Permission>> springSecurityPermissions = new HashMap<>();
 
-        // group perms
+        // groups & group perms
+        List<Group> groups = new ArrayList<>();
         for (Group group : account.getGroups()) {
-            updateSpringSecurityPermissionsMap(
-               "group:" + group.getName(), springSecurityPermissions, group.getCustomData()
+            groups.add(group);
+            springSecurityPermissions.put(
+                "group:" + group.getName(),
+                stormpathGroupPermissionResolver.resolvePermissions(group)
             );
         }
+        model.addAttribute("groups", groups);
 
         // account perms
-        updateSpringSecurityPermissionsMap("account", springSecurityPermissions, account.getCustomData());
-
+        springSecurityPermissions.put(
+            "account",
+            stormpathAccountPermissionResolver.resolvePermissions(account)
+        );
         model.addAttribute("springSecurityPermissions", springSecurityPermissions);
 
         return "userdetails";
@@ -85,14 +101,4 @@ String restricted(HttpServletRequest req, Model model) {
         model.addAttribute("msg", msg);
         return "restricted";
     }
-
-    @SuppressWarnings("unchecked")
-    private void updateSpringSecurityPermissionsMap(
-            String key, Map<String, List<String>> springSecurityPermissions, CustomData customData
-    ) {
-        List<String> springSecurityPermissionsList = (List<String>) customData.get("springSecurityPermissions");
-        if (!Collections.isEmpty(springSecurityPermissionsList)) {
-            springSecurityPermissions.put(key, springSecurityPermissionsList);
-        }
-    }
 }

tutorials/spring/04-a-finer-grain-of-control/src/main/java/com/stormpath/tutorial/controller/HelloController.java

@@ -16,10 +16,11 @@
 package com.stormpath.tutorial.controller;
 
 import com.stormpath.sdk.account.Account;
-import com.stormpath.sdk.directory.CustomData;
 import com.stormpath.sdk.group.Group;
-import com.stormpath.sdk.lang.Collections;
 import com.stormpath.sdk.servlet.account.AccountResolver;
+import com.stormpath.spring.security.authz.permission.Permission;
+import com.stormpath.spring.security.provider.AccountPermissionResolver;
+import com.stormpath.spring.security.provider.GroupPermissionResolver;
 import com.stormpath.tutorial.service.HelloService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -32,6 +33,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @since 1.3.0
@@ -40,13 +42,22 @@
 public class HelloController {
 
     private AccountResolver accountResolver;
+    private GroupPermissionResolver stormpathGroupPermissionResolver;
+    private AccountPermissionResolver stormpathAccountPermissionResolver;
     private HelloService helloService;
 
     @Autowired
-    public HelloController(AccountResolver accountResolver, HelloService helloService) {
+    public HelloController(
+        AccountResolver accountResolver, GroupPermissionResolver stormpathGroupPermissionResolver,
+        AccountPermissionResolver stormpathAccountPermissionResolver, HelloService helloService
+    ) {
         Assert.notNull(accountResolver);
+        Assert.notNull(stormpathAccountPermissionResolver);
+        Assert.notNull(stormpathGroupPermissionResolver);
         Assert.notNull(helloService);
         this.accountResolver = accountResolver;
+        this.stormpathAccountPermissionResolver = stormpathAccountPermissionResolver;
+        this.stormpathGroupPermissionResolver = stormpathGroupPermissionResolver;
         this.helloService = helloService;
     }
 
@@ -59,21 +70,24 @@ String home(HttpServletRequest req, Model model) {
     @RequestMapping("/userdetails")
     String userDetails(HttpServletRequest req, Model model) {
         Account account = accountResolver.getAccount(req);
-        Map<String, List<String>> springSecurityPermissions = new HashMap<>();
+        Map<String, Set<Permission>> springSecurityPermissions = new HashMap<>();
 
-        // groups
+        // groups & group perms
         List<Group> groups = new ArrayList<>();
         for (Group group : account.getGroups()) {
             groups.add(group);
-            updateSpringSecurityPermissionsMap(
-                "group:" + group.getName(), springSecurityPermissions, group.getCustomData()
+            springSecurityPermissions.put(
+                "group:" + group.getName(),
+                stormpathGroupPermissionResolver.resolvePermissions(group)
             );
         }
         model.addAttribute("groups", groups);
 
-        // perms
-        updateSpringSecurityPermissionsMap("account", springSecurityPermissions, account.getCustomData());
-
+        // account perms
+        springSecurityPermissions.put(
+            "account",
+            stormpathAccountPermissionResolver.resolvePermissions(account)
+        );
         model.addAttribute("springSecurityPermissions", springSecurityPermissions);
 
         return "userdetails";
@@ -87,14 +101,4 @@ String restricted(HttpServletRequest req, Model model) {
         model.addAttribute("msg", msg);
         return "restricted";
     }
-
-    @SuppressWarnings("unchecked")
-    private void updateSpringSecurityPermissionsMap(
-        String key, Map<String, List<String>> springSecurityPermissions, CustomData customData
-    ) {
-        List<String> springSecurityPermissionsList = (List<String>) customData.get("springSecurityPermissions");
-        if (!Collections.isEmpty(springSecurityPermissionsList)) {
-            springSecurityPermissions.put(key, springSecurityPermissionsList);
-        }
-    }
 }