Changeset 73 for branches/TaskRewrite/src/grails-app/controllers

Timestamp:

Mar 14, 2009, 10:04:39 AM (16 years ago)

Author:

gav

Message:

Add changePassword under options view so that users can change their own password.
Adjust for password validation, userCache etc. Only a small bug during "edit" is left on second "update" command.

Location:

branches/TaskRewrite/src/grails-app/controllers

Files:

• AppCoreController.groovy (modified) (1 diff)
• LoginController.groovy (modified) (1 diff)
• PersonController.groovy (modified) (2 diffs)

branches/TaskRewrite/src/grails-app/controllers/AppCoreController.groovy

@@ -10 +10 @@
     //def allowedMethods = [delete:'POST', save:'POST', update:'POST']
 
-
     def home = {
     }
 
     def options = {
-        def principal = authenticateService.principal()
-        println principal.getUsername()//get username
-        println principal.getAuthorities()//get authorities()
     }
+
+    def changePassword = {
+        //def principal = authenticateService.principal()
+        //println principal.getAuthorities()
+
+        if (request.method == 'GET') {
+            def personInstance = Person.get(authenticateService.userDomain().id)
+            return [ personInstance : personInstance ]       
+        }  
+
+        if (request.method == 'POST') {
+            def personInstance = Person.get(authenticateService.userDomain().id)
+    
+            personInstance.pass = params.pass
+            personInstance.password = authenticateService.encodePassword(personInstance.pass)
+
+            if (!personInstance.hasErrors() && personInstance.save()) {
+                //userCache.removeUserFromCache(personInstance.loginName)
+                flash.message = "Password changed successfully."
+                redirect(action:options)
+            }
+            else {
+                render(view:'changePassword',model:[personInstance:personInstance])
+            }                          
+        }  
+    }
+
 
     @Secured(['ROLE_AppAdmin'])   

branches/TaskRewrite/src/grails-app/controllers/LoginController.groovy

@@ -49 +49 @@
         def auth = {
 
-                nocache response
+                nocache(response)
 
                 if (isLoggedIn()) {

branches/TaskRewrite/src/grails-app/controllers/PersonController.groovy

@@ -96 +96 @@
                 }
 
-                def oldPassword = person.password
                 person.properties = params
-                if (!params.password.equals(oldPassword)) {
-                        person.password = authenticateService.encodePassword(params.password)
-                }
-                if (person.save()) {
-                        Authority.findAll().each { it.removeFromPersons(person) }
-                        addRoles(person)
-                        redirect action: show, id: person.id
-                }
-                else {
-                        render view: 'edit', model: buildPersonModel(person)
-                }
+
+        if (person.pass != "") {
+            if (!person.hasErrors()) {
+                person.password = authenticateService.encodePassword(params.pass)
+            }
+        }
+        else {
+            person.pass = "NothingToClearValidation"
+        }
+
+        if (!person.hasErrors() && person.save()) {
+            Authority.findAll().each { it.removeFromPersons(person) }
+            addRoles(person)
+            redirect action: show, id: person.id
+        }
+        else {
+            render view: 'edit', model: buildPersonModel(person)
+        }
+
         }
 
@@ -122 +129 @@
                 def person = new Person()
                 person.properties = params
-                person.password = authenticateService.encodePassword(params.password)
+                person.password = authenticateService.encodePassword(params.pass)
                 if (person.save()) {
                         addRoles(person)