dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8648
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-10-22 20:54:25 +0200
message:
  Minor
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java	2012-10-22 18:48:19 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AccountController.java	2012-10-22 18:54:25 +0000
@@ -34,8 +34,10 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.hisp.dhis.api.utils.ContextUtils;
+import org.hisp.dhis.configuration.ConfigurationService;
 import org.hisp.dhis.system.util.ValidationUtils;
 import org.hisp.dhis.user.User;
+import org.hisp.dhis.user.UserAuthorityGroup;
 import org.hisp.dhis.user.UserCredentials;
 import org.hisp.dhis.user.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,6 +79,9 @@
     @Autowired
     private AuthenticationManager authenticationManager;
     
+    @Autowired
+    private ConfigurationService configurationService;
+    
     @RequestMapping( method = RequestMethod.POST, produces = ContextUtils.CONTENT_TYPE_TEXT )
     public @ResponseBody String createAccount( 
         @RequestParam String username,
@@ -90,6 +95,14 @@
         HttpServletRequest request,
         HttpServletResponse response )
     {
+        UserAuthorityGroup userRole = configurationService.getConfiguration().getSelfRegistrationRole();
+        
+        if ( userRole == null )
+        {
+            response.setStatus( HttpServletResponse.SC_BAD_REQUEST );
+            return "User self registration is not allowed";
+        }
+        
         // ---------------------------------------------------------------------
         // Trim input
         // ---------------------------------------------------------------------
@@ -201,16 +214,19 @@
         credentials.setUsername( username );
         credentials.setPassword( password );
         credentials.setUser( user );
+        credentials.getUserAuthorityGroups().add( userRole );
         
         user.setUserCredentials( credentials );
-        
-        // TODO user role and org unit
+                
+        // TODO org unit
         
         userService.addUser( user );
         userService.addUserCredentials( credentials );
         
         log.info( "Created user successfully with username: " + username );
         
+        authenticate( user );
+        
         response.setStatus( HttpServletResponse.SC_CREATED );
         return "Account created";
     }
@@ -246,7 +262,6 @@
         return result != null ? result.split( SPLIT ) : null;
     }
     
-    @SuppressWarnings("unused")
     private void authenticate( User user )
     {
         String uname = user.getUserCredentials().getUsername();