Changeset 1588 for trunk/grails-app/controllers/dbnp/authentication/LoginController.groovy

Timestamp:

Mar 4, 2011, 12:30:52 PM (12 years ago)

Author:

s.h.sikkema@…

Message:

Fixed tests (except webtests); cleaned up Example{Studies,Templates}.groovy; decapitalized injected services; made 'transactional' properties static

File:

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

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

@@ -28 +28 @@
          * Dependency injection for the GSCF authentication service
          */
-        def AuthenticationService
+        def authenticationService
 
         /**
@@ -75 +75 @@
             // If the user is already authenticated with this session_id, redirect
             // him
-            if( AuthenticationService.isRemotelyLoggedIn( consumer, token ) ) {
+            if( authenticationService.isRemotelyLoggedIn( consumer, token ) ) {
                 if( returnUrl ) {
                                         redirect url: returnUrl
@@ -85 +85 @@
             // If the user is already logged in locally, we log him in and
             // immediately redirect him
-            if (AuthenticationService.isLoggedIn()) {
-                                AuthenticationService.logInRemotely( consumer, token, AuthenticationService.getLoggedInUser() )
+            if (authenticationService.isLoggedIn()) {
+                                authenticationService.logInRemotely( consumer, token, authenticationService.getLoggedInUser() )
 
                                 if( returnUrl ) {