Restructure security

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.mvc / src / main / java / org / argeo / security / mvc / UsersRolesController.java

diff --git a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java b/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
index 505f0094f118829ef37a25aa4389f50d6785db3b..8b09b94a5d273571184cdf6fae90c88029a19a58 100644 (file)
--- a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
+++ b/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
@@ -1,65 +1,147 @@
 package org.argeo.security.mvc;
 
+import java.io.Reader;
+import java.io.StringReader;
 import java.util.List;
 
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.argeo.security.ArgeoSecurityService;
 import org.argeo.security.ArgeoUser;
+import org.argeo.security.BasicArgeoUser;
 import org.argeo.security.core.ArgeoUserDetails;
-import org.argeo.security.dao.RoleDao;
-import org.argeo.security.dao.UserDao;
 import org.argeo.server.BooleanAnswer;
+import org.argeo.server.DeserializingEditor;
 import org.argeo.server.ServerAnswer;
+import org.argeo.server.ServerDeserializer;
+import org.argeo.server.mvc.MvcConstants;
 import org.springframework.security.Authentication;
 import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
-public class UsersRolesController {
-       private UserDao userDao;
-       private RoleDao roleDao;
+public class UsersRolesController implements MvcConstants {
+       private final static Log log = LogFactory
+                       .getLog(UsersRolesController.class);
+
+       private ArgeoSecurityService securityService;
+
+       private ServerDeserializer userDeserializer = null;
+
+       @InitBinder
+       public void initBinder(WebDataBinder binder) {
+               binder.registerCustomEditor(BasicArgeoUser.class,
+                               new DeserializingEditor(userDeserializer));
+       }
+
+       /* USER */
 
        @RequestMapping("/getCredentials.security")
-       @ModelAttribute("getCredentials")
+       @ModelAttribute(ANSWER_MODEL_KEY)
        public ArgeoUser getCredentials() {
                Authentication authentication = SecurityContextHolder.getContext()
                                .getAuthentication();
-
                return ArgeoUserDetails.asArgeoUser(authentication);
        }
 
        @RequestMapping("/getUsersList.security")
-       @ModelAttribute("getUsersList")
+       @ModelAttribute(ANSWER_MODEL_KEY)
        public List<ArgeoUser> getUsersList() {
-               return userDao.listUsers();
+               return securityService.getSecurityDao().listUsers();
        }
 
        @RequestMapping("/userExists.security")
-       @ModelAttribute("userExists")
+       @ModelAttribute(ANSWER_MODEL_KEY)
        public BooleanAnswer userExists(@RequestParam("username") String username) {
-               return new BooleanAnswer(userDao.userExists(username));
+               return new BooleanAnswer(securityService.getSecurityDao().userExists(
+                               username));
+       }
+
+       @RequestMapping("/createUser.security")
+       @ModelAttribute(ANSWER_MODEL_KEY)
+       public ArgeoUser createUser(Reader reader) {
+               ArgeoUser user = (ArgeoUser) userDeserializer.deserialize(reader);
+               cleanUserBeforeCreate(user);
+               securityService.newUser(user);
+               return securityService.getSecurityDao().getUser(user.getUsername());
+       }
+
+       @RequestMapping("/updateUser.security")
+       @ModelAttribute(ANSWER_MODEL_KEY)
+       public ArgeoUser updateUser(Reader reader) {
+               ArgeoUser user = (ArgeoUser) userDeserializer.deserialize(reader);
+               securityService.getSecurityDao().update(user);
+               return securityService.getSecurityDao().getUser(user.getUsername());
+       }
+
+       @RequestMapping("/createUser2.security")
+       @ModelAttribute(ANSWER_MODEL_KEY)
+       public ArgeoUser createUser(@RequestParam("body") String body) {
+               if (log.isDebugEnabled())
+                       log.debug("body:\n" + body);
+               StringReader reader = new StringReader(body);
+               ArgeoUser user = null;
+               try {
+                       user = (ArgeoUser) userDeserializer.deserialize(reader);
+               } finally {
+                       IOUtils.closeQuietly(reader);
+               }
+               cleanUserBeforeCreate(user);
+               securityService.newUser(user);
+               return securityService.getSecurityDao().getUser(user.getUsername());
        }
 
        @RequestMapping("/deleteUser.security")
-       @ModelAttribute("deleteUser")
+       @ModelAttribute(ANSWER_MODEL_KEY)
        public ServerAnswer deleteUser(@RequestParam("username") String username) {
-               userDao.delete(username);
-               return ServerAnswer.ok(username + " deleted");
+               securityService.getSecurityDao().delete(username);
+               return ServerAnswer.ok("User " + username + " deleted");
        }
 
        @RequestMapping("/getUserDetails.security")
-       @ModelAttribute("getUserDetails")
+       @ModelAttribute(ANSWER_MODEL_KEY)
        public ArgeoUser getUserDetails(@RequestParam("username") String username) {
-               return userDao.getUser(username);
+               return securityService.getSecurityDao().getUser(username);
+       }
+
+       /* ROLE */
+       @RequestMapping("/getRolesList.security")
+       @ModelAttribute(ANSWER_MODEL_KEY)
+       public List<String> getEditableRolesList() {
+               return securityService.getSecurityDao().listEditableRoles();
+       }
+
+       @RequestMapping("/createRole.security")
+       @ModelAttribute(ANSWER_MODEL_KEY)
+       public ServerAnswer createRole(@RequestParam("role") String role) {
+               securityService.newRole(role);
+               return ServerAnswer.ok("Role " + role + " created");
+       }
+
+       @RequestMapping("/deleteRole.security")
+       @ModelAttribute(ANSWER_MODEL_KEY)
+       public ServerAnswer deleteRole(@RequestParam("role") String role) {
+               securityService.getSecurityDao().deleteRole(role);
+               return ServerAnswer.ok("Role " + role + " created");
+       }
+
+       protected void cleanUserBeforeCreate(ArgeoUser user) {
+               user.getUserNatures().clear();
+               user.getRoles().clear();
        }
 
-       public void setUserDao(UserDao userDao) {
-               this.userDao = userDao;
+       public void setUserDeserializer(ServerDeserializer userDeserializer) {
+               this.userDeserializer = userDeserializer;
        }
 
-       public void setRoleDao(RoleDao roleDao) {
-               this.roleDao = roleDao;
+       public void setSecurityService(ArgeoSecurityService securityService) {
+               this.securityService = securityService;
        }
 
 }