Merge branch 'master' into PROT-9-webservice

[proteocache.git] / server / compbio / controllers / UserController.java

diff --git a/server/compbio/controllers/UserController.java b/server/compbio/controllers/UserController.java
index a00bd15..3c922b2 100644 (file)
--- a/server/compbio/controllers/UserController.java
+++ b/server/compbio/controllers/UserController.java
@@ -5,8 +5,6 @@ import java.util.regex.Pattern;
 
 import javax.naming.directory.DirContext;
 
-import org.springframework.ldap.core.LdapTemplate;
-import org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.mail.SimpleMailMessage;
@@ -26,8 +24,13 @@ import compbio.proteocache.users.User;
 import compbio.proteocache.users.UserManager;
 import compbio.cassandra.CassandraUserManager;
 
+/**
+ * @author Alexander Sherstnev
+ * @author Natasha Sherstneva
+ * @version 1.0 Dec 2013
+ */
 @Controller
-public class UserController {
+public class UserController extends BasicController {
 
        @Autowired
        ContextSource contextSource;
@@ -35,7 +38,7 @@ public class UserController {
        // JavaMailSender mailSender;
        private final Pattern EMAIL = Pattern.compile("[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,4}");
 
-       @RequestMapping(value = "/register/query", method = RequestMethod.POST)
+       @RequestMapping(value = "/register/query", method = RequestMethod.GET)
        public String RegisterForm(ModelMap model) {
                User user = new User();
                model.addAttribute(user);
@@ -44,14 +47,14 @@ public class UserController {
 
        @RequestMapping(value = "/register/edit/query", method = RequestMethod.GET)
        public String AccountForm(ModelMap model) {
-               User user = new User();
-               user.setFullName("Sasha Sherstnev");
-               user.setEmail("admin@admin.com");
-               user.setOrganisation("UoD");
-               user.setPosition("cleaner");
-               user.setUpdateByEmail(true);
-               model.addAttribute("u", user);
-               return "Edit";
+               model.put("username", getPrincipalName());
+               /*
+                * User user = new User(); user.setFullName("Sasha Sherstnev");
+                * user.setEmail("admin@admin.com"); user.setOrganisation("UoD");
+                * user.setPosition("cleaner"); user.setUpdateByEmail(true);
+                * model.addAttribute("u", user); return "Edit";
+                */
+               return "support/Notimplemented";
        }
 
        @RequestMapping(value = "/register/do", method = RequestMethod.POST)
@@ -91,7 +94,7 @@ public class UserController {
                }
 
                user.setRegistrationDate(new Date());
-               UserManager cm = new CassandraUserManager();
+               CassandraUserManager cm = new CassandraUserManager();
                try {
                        cm.addUser(user);
                } catch (DataIntegrityViolationException e) {