wikimedia/mediawiki-extensions-OATHAuth
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/OATHAuth synced 2024-11-28 02:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

OATHUserRepository: Stop handling legacy single-key

Browse source 
Migration is handled by UpdateTables::switchTOTPToMultipleKeys()

The transition has been completed at WMF as well.

Bug: T304375
Change-Id: I0e6d30075dfbd66d692cd8a5e3f7c9ebf44bc065
This commit is contained in:
Reedy 2022-03-26 09:44:50 +00:00
parent 1ee5f486d6
commit 6898d6ba93
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/OATHUserRepository.php
View file

@ -95,11 +95,7 @@ class OATHUserRepository {
$oathUser->setModule( $module ); $oathUser->setModule( $module );
$decodedData = FormatJson::decode( $res->data, true ); $decodedData = FormatJson::decode( $res->data, true );
if ( !isset( $decodedData['keys'] ) && $module->getName() === 'totp' ) { if ( is_array( $decodedData['keys'] ) ) {
// Legacy single-key setup
$key = $module->newKey( $decodedData );
$oathUser->addKey( $key );
} elseif ( is_array( $decodedData['keys'] ) ) {
foreach ( $decodedData['keys'] as $keyData ) { foreach ( $decodedData['keys'] as $keyData ) {
$key = $module->newKey( $keyData ); $key = $module->newKey( $keyData );
$oathUser->addKey( $key ); $oathUser->addKey( $key );