From 4930b32e378e888ae215bad3fd649ac71d4b6d9b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerg=C5=91=20Tisza?= Date: Fri, 7 Oct 2016 04:38:24 +0000 Subject: [PATCH] API: Remove deprecated response values from action=login Re-apply 23e5cdb after temporarily reverting in fda4d48 due to bot breakage. Bug: T121527 Change-Id: Ia89719d8bbebb7446b9c41cc9f29ecf26c75839b --- includes/api/ApiLogin.php | 13 ------------- tests/phpunit/includes/api/ApiLoginTest.php | 1 - 2 files changed, 14 deletions(-) diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php index 0e4c6e0c84..1dadc0721a 100644 --- a/includes/api/ApiLogin.php +++ b/includes/api/ApiLogin.php @@ -212,15 +212,6 @@ class ApiLogin extends ApiBase { $result['lguserid'] = intval( $user->getId() ); $result['lgusername'] = $user->getName(); - - // @todo: These are deprecated, and should be removed at some - // point (1.28 at the earliest, and see T121527). They were ok - // when the core cookie-based login was the only thing, but - // CentralAuth broke that a while back and - // SessionManager/AuthManager *really* break it. - $result['lgtoken'] = $user->getToken(); - $result['cookieprefix'] = $this->getConfig()->get( 'CookiePrefix' ); - $result['sessionid'] = $session->getId(); break; case 'NeedToken': @@ -228,10 +219,6 @@ class ApiLogin extends ApiBase { $this->setWarning( 'Fetching a token via action=login is deprecated. ' . 'Use action=query&meta=tokens&type=login instead.' ); $this->logFeatureUsage( 'action=login&!lgtoken' ); - - // @todo: See above about deprecation - $result['cookieprefix'] = $this->getConfig()->get( 'CookiePrefix' ); - $result['sessionid'] = $session->getId(); break; case 'WrongToken': diff --git a/tests/phpunit/includes/api/ApiLoginTest.php b/tests/phpunit/includes/api/ApiLoginTest.php index 155a9dd982..917a6adaff 100644 --- a/tests/phpunit/includes/api/ApiLoginTest.php +++ b/tests/phpunit/includes/api/ApiLoginTest.php @@ -190,7 +190,6 @@ class ApiLoginTest extends ApiTestCase { $this->assertArrayHasKey( "login", $data[0] ); $this->assertArrayHasKey( "result", $data[0]['login'] ); $this->assertEquals( "Success", $data[0]['login']['result'] ); - $this->assertArrayHasKey( 'lgtoken', $data[0]['login'] ); } public function testBotPassword() { -- 2.20.1