Changeset 1712

Timestamp:

Apr 6, 2011, 11:36:21 AM (11 years ago)

Author:

robert@…

Message:

Solved user registration bugs: changing password didn't work and lost password form resulted in an error

Location:

trunk/grails-app/controllers/dbnp/authentication

Files:

• RegisterController.groovy (modified) (1 diff)
• UserRegistrationController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/dbnp/authentication/RegisterController.groovy

@@ -56 +56 @@
                 }
 
-                def registrationCode = new RegistrationCode(username: user.username).save()
-
+                def registrationCode = new RegistrationCode(username: user.username, expiryDate: new Date() + 1 )
+                if( !registrationCode.save() ) {
+                        println registrationCode.errors
+                        flash.userError = "Your password could not be reset because of database errors. Please contact the system administrator."
+                        return
+                }
+                
                 String url = generateLink('resetPassword', [t: registrationCode.token])
 

trunk/grails-app/controllers/dbnp/authentication/UserRegistrationController.groovy

@@ -239 +239 @@
                 String salt = user.username
                 RegistrationCode.withTransaction { status ->
-                        user.password = springSecurityService.encodePassword(command.password, salt)
+                        if( command.password != "" ) 
+                                user.password = springSecurityService.encodePassword(command.password, salt)
                         user.email = command.email
                         user.save()
@@ -274 +275 @@
                                 (!password.matches('^.*\\p{Alpha}.*$') ||
                                 !password.matches('^.*\\p{Digit}.*$') ||
-                                !password.matches('^.*[!@#$%^&].*$'))) {
+                                !password.matches('^.*[!@#$%+^&].*$'))) {
                         return 'command.password.error.strength'
                 }