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

API: Remove deprecated response values from action=login

Browse source 
Bug: T121527
Change-Id: Ie370d6dc5a922ad9c50758ba81b98aa8492f83cb
This commit is contained in:
Brad Jorsch 2016-07-27 11:50:33 -04:00
parent 420c52003b
commit 23e5cdb503
3 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
RELEASE-NOTES-1.28
View file

@ -53,6 +53,9 @@ production.
the value of $wgMaxArticleSize. the value of $wgMaxArticleSize.
* Property 'modulemessages' from action=parse&prop=modules was removed * Property 'modulemessages' from action=parse&prop=modules was removed
(deprecated since 1.26). (deprecated since 1.26).
* The following response properties from action=login, deprecated in 1.27, are
now removed: lgtoken, cookieprefix, sessionid. Clients should handle cookies
to properly manage session state.
=== Action API internal changes in 1.28 === === Action API internal changes in 1.28 ===
* Added a new hook, 'ApiMakeParserOptions', to allow extensions to better * Added a new hook, 'ApiMakeParserOptions', to allow extensions to better

13
includes/api/ApiLogin.php
View file

@ -212,15 +212,6 @@ class ApiLogin extends ApiBase {
$result['lguserid'] = intval( $user->getId() ); $result['lguserid'] = intval( $user->getId() );
$result['lgusername'] = $user->getName(); $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; break;
case 'NeedToken': case 'NeedToken':
@ -228,10 +219,6 @@ class ApiLogin extends ApiBase {
$this->setWarning( 'Fetching a token via action=login is deprecated. ' . $this->setWarning( 'Fetching a token via action=login is deprecated. ' .
'Use action=query&meta=tokens&type=login instead.' ); 'Use action=query&meta=tokens&type=login instead.' );
$this->logFeatureUsage( 'action=login&!lgtoken' ); $this->logFeatureUsage( 'action=login&!lgtoken' );
// @todo: See above about deprecation
$result['cookieprefix'] = $this->getConfig()->get( 'CookiePrefix' );
$result['sessionid'] = $session->getId();
break; break;
case 'WrongToken': case 'WrongToken':

1
tests/phpunit/includes/api/ApiLoginTest.php
View file

@ -190,7 +190,6 @@ class ApiLoginTest extends ApiTestCase {
$this->assertArrayHasKey( "login", $data[0] ); $this->assertArrayHasKey( "login", $data[0] );
$this->assertArrayHasKey( "result", $data[0]['login'] ); $this->assertArrayHasKey( "result", $data[0]['login'] );
$this->assertEquals( "Success", $data[0]['login']['result'] ); $this->assertEquals( "Success", $data[0]['login']['result'] );
$this->assertArrayHasKey( 'lgtoken', $data[0]['login'] );
} }
public function testBotPassword() { public function testBotPassword() {