Changeset 1770

Timestamp:

Apr 13, 2011, 2:57:42 PM (11 years ago)

Author:

robert@…

Message:

Improved logging in from modules

File:

• trunk/grails-app/controllers/dbnp/authentication/LoginController.groovy (modified) (3 diffs)

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

@@ -12 +12 @@
 import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter
+import org.codehaus.groovy.grails.commons.ConfigurationHolder
 
 class LoginController {
@@ -67 +68 @@
                 def consumer = params.consumer
                 def token = params.token
-
+                
                 if (consumer == null || token == null) {
                         throw new Exception("Consumer and Token must be given!");
                 }
 
-                def returnUrl = params.returnUrl
+                def returnUrl;
+                
+                // If no returnUrl is given, find the previous one from the session
+                if( params.returnUrl ) {
+                        returnUrl = params.returnUrl;
+                        session.authRemoteUrl = returnUrl;
+                } else if( session.authRemoteUrl ) {
+                        returnUrl = session.authRemoteUrl;
+                }
 
                 // If the user is already authenticated with this session_id, redirect
@@ -100 +109 @@
                 String view = 'auth'
                 String postUrl = "${request.contextPath}${config.apf.filterProcessesUrl}"
-                String redirectUrl = g.createLink(controller: 'login', action: 'auth_remote', params: [consumer: params.consumer, token: params.token, returnUrl: params.returnUrl], absolute: true)
+                
+                String redirectUrl = g.createLink(controller: 'login', action: 'auth_remote', params: [consumer: params.consumer, token: params.token], absolute: true)
                 render view: view, model: [postUrl: postUrl,
                         rememberMeParameter: config.rememberMe.parameter, redirectUrl: redirectUrl]