$params = $this->extractRequestParams();
$token = $params['token'];
$maxage = $params['maxtokenage'];
- $request = $this->getRequest();
$salts = ApiQueryTokens::getTokenTypeSalts();
- $salt = $salts[$params['type']];
$res = array();
- if ( $this->getUser()->matchEditToken( $token, $salt, $request, $maxage ) ) {
+ $tokenObj = ApiQueryTokens::getToken(
+ $this->getUser(), $this->getRequest()->getSession(), $salts[$params['type']]
+ );
+ if ( $tokenObj->match( $token, $maxage ) ) {
$res['result'] = 'valid';
- } elseif ( $maxage !== null && $this->getUser()->matchEditToken( $token, $salt, $request ) ) {
+ } elseif ( $maxage !== null && $tokenObj->match( $token ) ) {
$res['result'] = 'expired';
} else {
$res['result'] = 'invalid';
}
- $ts = User::getEditTokenTimestamp( $token );
+ $ts = MediaWiki\Session\Token::getTimestamp( $token );
if ( $ts !== null ) {
$mwts = new MWTimestamp();
$mwts->timestamp->setTimestamp( $ts );