Changeset 1626

Timestamp:

Mar 11, 2011, 1:42:05 PM (11 years ago)

Author:

work@…

Message:

• added initial support of a return URI; not working properly though...

Location:

trunk/grails-app

Files:

• conf/BaseFilters.groovy (modified) (1 diff)
• controllers/dbnp/authentication/LoginController.groovy (modified) (8 diffs)

trunk/grails-app/conf/BaseFilters.groovy

@@ -46 +46 @@
                                         session.removeAttribute('loggedInUser')
 
+                                        def returnURI = request.requestURL.toString().replace(".dispatch","").replace("/grails/","/") + '?' + request.queryString
+
                                         // and redirect to login page
-                                        redirect(controller: 'login', action: 'auth')
+                                        redirect(controller: 'login', action: 'auth', params: [returnURI: returnURI, referer: request.getHeader('referer')] )
                                 }
                         }

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

@@ -14 +14 @@
 
 class LoginController {
-
         /**
          * Dependency injection for the authenticationTrustResolver.
@@ -46 +45 @@
          */
         def auth = {
-
                 def config = SpringSecurityUtils.securityConfig
-
                 if (springSecurityService.isLoggedIn()) {
-                        redirect uri: config.successHandler.defaultTargetUrl
+                        if (params.returnURI) {
+                                // see basefilters
+                                redirect uri: params.returnURI
+                        } else {
+                                redirect uri: config.successHandler.defaultTargetUrl
+                        }
                         return
                 }
@@ -56 +58 @@
                 String view = 'auth'
                 String postUrl = "${request.contextPath}${config.apf.filterProcessesUrl}"
-                render view: view, model: [postUrl: postUrl,
-                        rememberMeParameter: config.rememberMe.parameter]
+                render view: view, model: [postUrl: postUrl, rememberMeParameter: config.rememberMe.parameter]
         }
 
@@ -108 +109 @@
          */
         def denied = {
+println "denied"
                 if (springSecurityService.isLoggedIn() &&
                         authenticationTrustResolver.isRememberMe(SCH.context?.authentication)) {
@@ -119 +121 @@
          */
         def full = {
+pritln "full"
                 def config = SpringSecurityUtils.securityConfig
                 render view: 'auth', params: params,
@@ -129 +132 @@
          */
         def authfail = {
-
+println "authfail"
                 def username = session[UsernamePasswordAuthenticationFilter.SPRING_SECURITY_LAST_USERNAME_KEY]
                 String msg = ''
@@ -164 +167 @@
          */
         def ajaxSuccess = {
+println "ajaxsuccess"
                 render([success: true, username: springSecurityService.authentication.name] as JSON)
         }
@@ -171 +175 @@
          */
         def ajaxDenied = {
+println "ajaxdenied"
                 render([error: 'access denied'] as JSON)
         }