Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Return early in ApiLogout if user not logged in"

Browse source
This commit is contained in:
jenkins-bot 2024-09-09 17:34:51 +00:00 committed by Gerrit Code Review
commit e6d0f05427
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
includes/api/ApiLogout.php
View file

@ -51,6 +51,13 @@ class ApiLogout extends ApiBase {
} }
$user = $this->getUser(); $user = $this->getUser();
if ( $user->isAnon() ) {
// Cannot logout a anon user, so add a warning and return early.
$this->addWarning( 'apierror-mustbeloggedin-generic', 'notloggedin' );
return;
}
$oldName = $user->getName(); $oldName = $user->getName();
$user->logout(); $user->logout();

14
tests/phpunit/includes/api/ApiLogoutTest.php
View file

@ -35,6 +35,20 @@ class ApiLogoutTest extends ApiTestCase {
} }
} }
public function testUserLogoutAlreadyLoggedOut() {
$user = $this->getServiceContainer()->getUserFactory()->newAnonymous( '1.2.3.4' );
$this->assertFalse( $user->isRegistered() );
$token = $this->getUserCsrfTokenFromApi( $user );
$response = $this->doUserLogout( $token, $user )[0];
$this->assertFalse( $user->isRegistered() );
$this->assertArrayEquals(
[ 'warnings' => [ 'logout' => [ 'warnings' => 'You must be logged in.' ] ] ],
$response
);
}
public function testUserLogout() { public function testUserLogout() {
$user = $this->getTestSysop()->getUser(); $user = $this->getTestSysop()->getUser();