Changeset 14924

Timestamp:

05/29/12 22:37:50 (12 months ago)

Author:

ArthurClemens

Message:

Item11904: Split out logout code from LoginManager

File:

• trunk/core/lib/Foswiki/LoginManager.pm (modified) (3 diffs)

trunk/core/lib/Foswiki/LoginManager.pm

@@ -455 +455 @@
         }
         else {
-            _trace( $this, "User is logging out" );
-            $session->logEvent( 'logout', ' ',
-                "AUTHENTICATION LOGOUT - $authUser - " );
-
-            #TODO: consider if we should risk passing on the urlparams on logout
-            my $path_info = $session->{request}->path_info();
-            if ( my $topic = $session->{request}->param('topic') )
-            {    #we should at least respect the ?topic= request
-                my $topicRequest = Foswiki::Sandbox::untaintUnchecked(
-                    $session->{request}->param('topic') );
-                my ( $web, $topic ) =
-                  $this->{session}
-                  ->normalizeWebTopicName( undef, $topicRequest );
-                $path_info = '/' . $web . '/' . $topic;
-            }
-
-            my $redirectUrl;
-            if ($path_info) {
-                $redirectUrl = $session->{request}->url() . $path_info;
-            }
-            else {
-                $redirectUrl = $session->{request}->referer();
-            }
-
-            #lets avoid infinite loops
-            $session->{request}->delete('logout');
-            $authUser = $defaultUser;
-            $session->redirect( $redirectUrl, 0 );
+            $authUser = $this->_logout( $authUser, $defaultUser );
         }
     }
@@ -508 +481 @@
         $this->_addSessionCookieToResponse();
     }
+
+    return $authUser;
+}
+
+=begin TML
+
+---++ ObjectMethod _logout($defaultUser)
+
+=cut
+
+sub _logout {
+    my ( $this, $authUser, $defaultUser ) = @_;
+    _trace( $this, "User is logging out" );
+
+    my $session = $this->{session};
+    $defaultUser = $Foswiki::cfg{DefaultUserLogin}
+      unless ( defined($defaultUser) );
+
+    $session->logEvent( 'logout', ' ', "AUTHENTICATION LOGOUT - $authUser - " );
+
+    #TODO: consider if we should risk passing on the urlparams on logout
+    my $path_info = $session->{request}->path_info();
+    if ( my $topic = $session->{request}->param('topic') )
+    {    #we should at least respect the ?topic= request
+        my $topicRequest = Foswiki::Sandbox::untaintUnchecked(
+            $session->{request}->param('topic') );
+        my ( $web, $topic ) =
+          $this->{session}->normalizeWebTopicName( undef, $topicRequest );
+        $path_info = '/' . $web . '/' . $topic;
+    }
+
+    my $redirectUrl;
+    if ($path_info) {
+        $redirectUrl = $session->{request}->url() . $path_info;
+    }
+    else {
+        $redirectUrl = $session->{request}->referer();
+    }
+
+    #lets avoid infinite loops
+    $session->{request}->delete('logout');
+    $authUser = $defaultUser;
+    $session->redirect( $redirectUrl, 0 );
 
     return $authUser;
@@ -1265 +1281 @@
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2008-2010 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2008-2012 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.