OATHUserRepository: rely less on global state

Inject more stuff into OATHUserRepository properly. Also done other misc
cleanup on that class.

Change-Id: I194345974146517c8216a81330cd930534d655e4

ServiceWiring.php

@@ -1,7 +1,9 @@
 <?php
 
+use MediaWiki\Config\ServiceOptions;
 use MediaWiki\Extension\OATHAuth\OATHAuth;
 use MediaWiki\Extension\OATHAuth\OATHUserRepository;
+use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 
 return [
@@ -12,14 +14,18 @@ return [
 		);
 	},
 	'OATHUserRepository' => static function ( MediaWikiServices $services ) {
-		global $wgOATHAuthDatabase;
-		$auth = $services->getService( 'OATHAuth' );
 		return new OATHUserRepository(
-			$services->getDBLoadBalancerFactory()->getMainLB( $wgOATHAuthDatabase ),
+			new ServiceOptions(
-			new \HashBagOStuff( [
+				OATHUserRepository::CONSTRUCTOR_OPTIONS,
+				$services->getMainConfig(),
+			),
+			$services->getDBLoadBalancerFactory(),
+			new HashBagOStuff( [
 				'maxKey' => 5
 			] ),
-			$auth
+			$services->getService( 'OATHAuth' ),
+			$services->getCentralIdLookupFactory(),
+			LoggerFactory::getInstance( 'authentication' )
 		);
 	}
 ];

src/OATHUserRepository.php

@@ -21,42 +21,64 @@ namespace MediaWiki\Extension\OATHAuth;
 use BagOStuff;
 use ConfigException;
 use FormatJson;
-use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\Config\ServiceOptions;
-use MediaWiki\MediaWikiServices;
+use MediaWiki\User\CentralId\CentralIdLookupFactory;
 use MWException;
+use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use RequestContext;
 use User;
 use Wikimedia\Rdbms\IDatabase;
-use Wikimedia\Rdbms\ILoadBalancer;
+use Wikimedia\Rdbms\LBFactory;
 
-class OATHUserRepository {
+class OATHUserRepository implements LoggerAwareInterface {
-	/** @var ILoadBalancer */
+	/** @var ServiceOptions */
-	protected $lb;
+	private ServiceOptions $options;
+
+	/** @var LBFactory */
+	private LBFactory $lbFactory;
 
 	/** @var BagOStuff */
-	protected $cache;
+	private BagOStuff $cache;
 
-	/**
+	/** @var OATHAuth */
-	 * @var OATHAuth
+	private OATHAuth $auth;
-	 */
+
-	protected $auth;
+	/** @var CentralIdLookupFactory */
+	private CentralIdLookupFactory $centralIdLookupFactory;
 
 	/** @var LoggerInterface */
-	private $logger;
+	private LoggerInterface $logger;
+
+	/** @internal Only public for service wiring use. */
+	public const CONSTRUCTOR_OPTIONS = [
+		'OATHAuthDatabase',
+	];
 
 	/**
 	 * OATHUserRepository constructor.
-	 * @param ILoadBalancer $lb
+	 * @param ServiceOptions $options
+	 * @param LBFactory $lbFactory
 	 * @param BagOStuff $cache
 	 * @param OATHAuth $auth
+	 * @param CentralIdLookupFactory $centralIdLookupFactory
+	 * @param LoggerInterface $logger
 	 */
-	public function __construct( ILoadBalancer $lb, BagOStuff $cache, OATHAuth $auth ) {
+	public function __construct(
-		$this->lb = $lb;
+		ServiceOptions $options,
+		LBFactory $lbFactory,
+		BagOStuff $cache,
+		OATHAuth $auth,
+		CentralIdLookupFactory $centralIdLookupFactory,
+		LoggerInterface $logger
+	) {
+		$options->assertRequiredOptions( self::CONSTRUCTOR_OPTIONS );
+		$this->options = $options;
+		$this->lbFactory = $lbFactory;
 		$this->cache = $cache;
 		$this->auth = $auth;
-
+		$this->centralIdLookupFactory = $centralIdLookupFactory;
-		$this->setLogger( LoggerFactory::getInstance( 'authentication' ) );
+		$this->setLogger( $logger );
 	}
 
 	/**
@@ -77,9 +99,7 @@ class OATHUserRepository {
 		if ( !$oathUser ) {
 			$oathUser = new OATHUser( $user, [] );
 
-			$uid = MediaWikiServices::getInstance()
+			$uid = $this->centralIdLookupFactory->getLookup()
-				->getCentralIdLookupFactory()
-				->getLookup()
 				->centralIdFromLocalUser( $user );
 			$res = $this->getDB( DB_REPLICA )->selectRow(
 				'oathauth_users',
@@ -125,9 +145,7 @@ class OATHUserRepository {
 			'oathauth_users',
 			'id',
 			[
-				'id' => MediaWikiServices::getInstance()
+				'id' => $this->centralIdLookupFactory->getLookup()
-					->getCentralIdLookupFactory()
-					->getLookup()
 					->centralIdFromLocalUser( $user->getUser() ),
 				'module' => $user->getModule()->getName(),
 				'data' => FormatJson::encode( $data )
@@ -164,9 +182,7 @@ class OATHUserRepository {
 	public function remove( OATHUser $user, $clientInfo, bool $self ) {
 		$this->getDB( DB_PRIMARY )->delete(
 			'oathauth_users',
-			[ 'id' => MediaWikiServices::getInstance()
+			[ 'id' => $this->centralIdLookupFactory->getLookup()
-				->getCentralIdLookupFactory()
-				->getLookup()
 				->centralIdFromLocalUser( $user->getUser() ) ],
 			__METHOD__
 		);
@@ -186,9 +202,8 @@ class OATHUserRepository {
 	 * @param int $index DB_PRIMARY/DB_REPLICA
 	 * @return IDatabase
 	 */
-	private function getDB( $index ) {
+	private function getDB( int $index ): IDatabase {
-		global $wgOATHAuthDatabase;
+		$db = $this->options->get( 'OATHAuthDatabase' );
-
+		return $this->lbFactory->getMainLB( $db )->getConnectionRef( $index, [], $db );
-		return $this->lb->getConnectionRef( $index, [], $wgOATHAuthDatabase );
 	}
 }