Multiproject/domainusage

config.inc.php

@@ -90,8 +90,6 @@
 // Formerly-used OAuth tokens to permit reading identities from
 $oauthLegacyTokens = [];
 
-$oauthMediaWikiCanonicalServer = "https://en.wikipedia.org";
-
 $useOauthSignup = true;
 $enforceOAuth = false;
 
@@ -254,7 +252,6 @@ function wfDebugLog($section, $message)
     ->setOAuthConsumerToken($oauthConsumerToken)
     ->setOAuthLegacyConsumerTokens($oauthLegacyTokens)
     ->setOAuthConsumerSecret($oauthSecretToken)
-    ->setOauthMediaWikiCanonicalServer($oauthMediaWikiCanonicalServer)
     ->setDataClearInterval($dataclear_interval)
     ->setXffTrustedHostsFile($xff_trusted_hosts_file)
     ->setIrcNotificationsEnabled($ircBotNotificationsEnabled == 1)

includes/API/Actions/JsTemplateConfirmsAction.php

@@ -10,15 +10,23 @@
 
 use Waca\API\IJsonApiAction;
 use Waca\DataObjects\EmailTemplate;
+use Waca\Exceptions\ApplicationLogicException;
 use Waca\Tasks\JsonApiPageBase;
+use Waca\Tests\WebRequestTest;
+use Waca\WebRequest;
 
 class JsTemplateConfirmsAction extends JsonApiPageBase implements IJsonApiAction
 {
     public function executeApiAction()
     {
+        $domainId = WebRequest::getInt('d');
+
+        if($domainId === null) {
+            throw new ApplicationLogicException("Unknown domain");
+        }
+
         /** @var EmailTemplate[] $templates */
-        // FIXME: domains!
-        $templates = EmailTemplate::getAllActiveTemplates(null, $this->getDatabase(), 1);
+        $templates = EmailTemplate::getAllActiveTemplates(null, $this->getDatabase(), $domainId);
 
         $dataset = [];
         foreach ($templates as $tpl) {

includes/API/Actions/StatsAction.php

@@ -12,6 +12,7 @@
 use Exception;
 use Waca\API\ApiException;
 use Waca\API\IXmlApiAction;
+use Waca\DataObjects\Domain;
 use Waca\DataObjects\User;
 use Waca\Helpers\OAuthUserHelper;
 use Waca\Helpers\PreferenceManager;
@@ -60,8 +61,17 @@ public function executeApiAction(DOMElement $apiDocument)
         $oauth = new OAuthUserHelper($user, $this->getDatabase(), $this->getOAuthProtocolHelper(),
             $this->getSiteConfiguration());
 
-        // FIXME: domains
-        $prefs = new PreferenceManager($this->getDatabase(), $user->getId(), 1);
+        $domain = false;
+        $domainName = WebRequest::getString("domain");
+        if ($domainName !== null) {
+            $domain = Domain::getByShortName($domainName, $this->getDatabase());
+        }
+        if ($domain === false){
+            // fallback
+            $domain = Domain::getById(1, $this->getDatabase());
+        }
+
+        $prefs = new PreferenceManager($this->getDatabase(), $user->getId(), $domain->getId());
 
         $userElement->setAttribute("username", $user->getUsername());
         $userElement->setAttribute("status", $user->getStatus());

includes/API/Actions/StatusAction.php

@@ -10,21 +10,55 @@
 
 use DOMElement;
 use Waca\API\IXmlApiAction;
+use Waca\DataObjects\Domain;
 use Waca\DataObjects\RequestQueue;
 use Waca\Helpers\SearchHelpers\RequestSearchHelper;
 use Waca\RequestStatus;
 use Waca\Tasks\XmlApiPageBase;
+use Waca\WebRequest;
 
 /**
  * API Count action
  */
 class StatusAction extends XmlApiPageBase implements IXmlApiAction
 {
     public function executeApiAction(DOMElement $apiDocument)
+    {
+        $domainList = [];
+
+        $domainName = WebRequest::getString("domain");
+        if ($domainName !== null) {
+            $domain = Domain::getByShortName($domainName, $this->getDatabase());
+            if ($domain !== false) {
+                $domainList[] = $domain;
+            }
+        }
+
+        if (count($domainList) === 0) {
+            $domainList = array_filter(Domain::getAll($this->getDatabase()), fn(Domain $d) => $d->isEnabled());
+        }
+
+        $banCount = $this->getBanCount();
+
+        foreach ($domainList as $d) {
+            $this->createDomainData($apiDocument, $d, $banCount);
+        }
+
+        return $apiDocument;
+    }
+
+    /**
+     * @param DOMElement $apiDocument
+     * @param Domain     $domain
+     * @param            $banCount
+     */
+    protected function createDomainData(DOMElement $apiDocument, Domain $domain, $banCount)
     {
         $statusElement = $this->document->createElement("status");
         $apiDocument->appendChild($statusElement);
 
+        $statusElement->setAttribute('domain', $domain->getShortName());
+
         $query = $this->getDatabase()->prepare(<<<SQL
             SELECT /* Api/StatusAction */ COUNT(*) AS count
             FROM request
@@ -35,7 +69,7 @@ public function executeApiAction(DOMElement $apiDocument)
 SQL
         );
 
-        $allQueues = RequestQueue::getAllQueues($this->getDatabase());
+        $allQueues = RequestQueue::getAllQueues($this->getDatabase(), $domain->getId());
 
         foreach ($allQueues as $value) {
             $query->bindValue(":pstatus", RequestStatus::OPEN);
@@ -47,18 +81,17 @@ public function executeApiAction(DOMElement $apiDocument)
         }
 
         // hospital queue
-        // FIXME: domains
-        $search = RequestSearchHelper::get($this->getDatabase(), 1)->isHospitalised();
+        $search = RequestSearchHelper::get($this->getDatabase(), $domain->getId())->isHospitalised();
 
         if ($this->getSiteConfiguration()->getEmailConfirmationEnabled()) {
             $search->withConfirmedEmail();
         }
+
         $search->getRecordCount($hospitalCount);
         $statusElement->setAttribute('x-hospital', $hospitalCount);
 
         // job queue
-        // FIXME: domains
-        $search = RequestSearchHelper::get($this->getDatabase(), 1)
+        $search = RequestSearchHelper::get($this->getDatabase(), $domain->getId())
             ->byStatus(RequestStatus::JOBQUEUE);
 
         if ($this->getSiteConfiguration()->getEmailConfirmationEnabled()) {
@@ -69,19 +102,7 @@ public function executeApiAction(DOMElement $apiDocument)
         $statusElement->setAttribute('x-jobqueue', $jobQueueRequestCount);
 
         // bans
-        $query = $this->getDatabase()->prepare(<<<SQL
-            SELECT /* Api/StatusAction */ COUNT(*) AS count
-            FROM ban
-            WHERE
-                (duration > UNIX_TIMESTAMP() OR duration is null)
-                AND active = 1;
-SQL
-        );
-
-        $query->execute();
-        $sus = $query->fetchColumn();
-        $statusElement->setAttribute("bans", $sus);
-        $query->closeCursor();
+        $statusElement->setAttribute("bans", $banCount);
 
         $query = $this->getDatabase()->prepare(<<<SQL
 SELECT /* Api/StatusAction */ COUNT(*) AS count
@@ -98,11 +119,12 @@ public function executeApiAction(DOMElement $apiDocument)
         $query = $this->getDatabase()->prepare(<<<SQL
 select /* Api/StatusAction */ COUNT(*) from user u
 inner join userrole ur on u.id = ur.user
-where u.status = 'Active' and ur.role = :ulevel
+where u.status = 'Active' and ur.role = :ulevel and ur.domain = :domain
 SQL
         );
 
         $query->bindValue(":ulevel", "admin");
+        $query->bindValue(":domain", $domain->getId());
         $query->execute();
         $sus = $query->fetchColumn();
         $statusElement->setAttribute("useradmin", $sus);
@@ -113,7 +135,23 @@ public function executeApiAction(DOMElement $apiDocument)
         $sus = $query->fetchColumn();
         $statusElement->setAttribute("user", $sus);
         $query->closeCursor();
+    }
 
-        return $apiDocument;
+    protected function getBanCount()
+    {
+        $query = $this->getDatabase()->prepare(<<<SQL
+            SELECT /* Api/StatusAction */ COUNT(*) AS count
+            FROM ban
+            WHERE
+                (duration > UNIX_TIMESTAMP() OR duration is null)
+                AND active = 1;
+SQL
+        );
+
+        $query->execute();
+        $sus = $query->fetchColumn();
+        $query->closeCursor();
+
+        return $sus;
     }
 }

includes/Background/CreationTaskBase.php

@@ -9,6 +9,7 @@
 namespace Waca\Background;
 
 use Exception;
+use Waca\DataObjects\Domain;
 use Waca\DataObjects\Request;
 use Waca\DataObjects\User;
 use Waca\ExceptionHandler;
@@ -111,8 +112,14 @@ protected abstract function getMediaWikiClient();
 
     protected function getMediaWikiHelper()
     {
+        /** @var Domain $domain */
+        $domain = Domain::getById($this->getJob()->getDomain(), $this->getDatabase());
+
         if ($this->mwHelper === null) {
-            $this->mwHelper = new MediaWikiHelper($this->getMediaWikiClient(), $this->getSiteConfiguration());
+            $this->mwHelper = new MediaWikiHelper(
+                $this->getMediaWikiClient(),
+                $this->getSiteConfiguration(),
+                $domain->getWikiApiPath());
         }
 
         return $this->mwHelper;

includes/Background/Task/BotCreationTask.php

@@ -22,9 +22,8 @@ class BotCreationTask extends CreationTaskBase
      */
     protected function getMediaWikiClient()
     {
-        // FIXME: domains!
         /** @var Domain $domain */
-        $domain = Domain::getById(1, $this->getDatabase());
+        $domain = Domain::getById($this->getRequest()->getDomain(), $this->getDatabase());
 
         return new BotMediaWikiClient($this->getSiteConfiguration(), $domain);
     }

includes/Background/Task/WelcomeUserTask.php

@@ -9,6 +9,7 @@
 namespace Waca\Background\Task;
 
 use Waca\Background\BackgroundTaskBase;
+use Waca\DataObjects\Domain;
 use Waca\DataObjects\Request;
 use Waca\DataObjects\User;
 use Waca\DataObjects\WelcomeTemplate;
@@ -27,8 +28,11 @@ public function execute()
         $database = $this->getDatabase();
         $this->request = $this->getRequest();
         $user = $this->getTriggerUser();
-        //FIXME: domains
-        $userPrefs = new PreferenceManager($database, $user->getId(), 1);
+
+        /** @var Domain $domain */
+        $domain = Domain::getById($this->getJob()->getDomain(), $database);
+
+        $userPrefs = new PreferenceManager($database, $user->getId(), $this->request->getDomain());
 
         $welcomeTemplate = $userPrefs->getPreference(PreferenceManager::PREF_WELCOMETEMPLATE);
 
@@ -49,7 +53,7 @@ public function execute()
 
         $oauth = new OAuthUserHelper($user, $database, $this->getOauthProtocolHelper(),
             $this->getSiteConfiguration());
-        $mediaWikiHelper = new MediaWikiHelper($oauth, $this->getSiteConfiguration());
+        $mediaWikiHelper = new MediaWikiHelper($oauth, $this->getSiteConfiguration(), $domain->getWikiApiPath());
 
         if ($this->request->getStatus() !== RequestStatus::CLOSED) {
             $this->markFailed('Request is currently open');

includes/DataObjects/Domain.php

@@ -43,22 +43,30 @@ class Domain extends DataObject
 
     public static function getCurrent(PdoDatabase $database)
     {
-        if (self::$currentDomain === null) {
+        if (self::$currentDomain === null || (self::$currentDomain !== null && self::$currentDomain->getId() !== WebRequest::getSessionDomain())) {
             $sessionDomain = WebRequest::getSessionDomain();
 
+            // get the domain indicated by the session variable
             if ($sessionDomain !== null) {
-                /** @var Domain $domain */
+                /** @var Domain|bool $domain */
                 $domain = self::getById($sessionDomain, $database);
 
-                if ($domain === false) {
-                    self::$currentDomain = self::getById(1, $database); // FIXME: #594 User::getCurrent($database)->getDefaultDomain();
-                }
-                else {
+                if ($domain !== false) {
                     self::$currentDomain = $domain;
                 }
             }
-            else {
-                self::$currentDomain = self::getById(1, $database); // FIXME: #594 User::getCurrent($database)->getDefaultDomain();
+
+            // still null? Fetch some random domain that the user happens to be a member of.
+            if (self::$currentDomain === null) {
+                $userDomains = self::getDomainByUser($database, User::getCurrent($database), true);
+
+                if (count($userDomains) == 0) {
+                    // eurgh.
+                    self::$currentDomain = null;
+                    return null;
+                }
+
+                self::$currentDomain = $userDomains[0];
             }
         }
 
@@ -86,6 +94,27 @@ public static function getByShortName(string $shortName, PdoDatabase $database)
         return $result;
     }
 
+    public static function getByApiPath(string $apiPath, PdoDatabase $database)
+    {
+        $statement = $database->prepare(<<<SQL
+            SELECT * FROM domain WHERE wikiapipath = :api;
+SQL
+        );
+
+        $statement->execute([
+            ':api' => $apiPath,
+        ]);
+
+        /** @var RequestForm|false $result */
+        $result = $statement->fetchObject(get_called_class());
+
+        if ($result !== false) {
+            $result->setDatabase($database);
+        }
+
+        return $result;
+    }
+
     public static function getAll(PdoDatabase $database) {
         $statement = $database->prepare("SELECT * FROM domain;");
         $statement->execute();

includes/DataObjects/RequestQueue.php

@@ -44,18 +44,20 @@ class RequestQueue extends DataObject
      * @deprecated Removal due as part of #607
      */
     private $logname;
+
     /**
      * @param PdoDatabase $database
+     * @param int|null    $domain
      *
      * @return RequestQueue[]
      */
-    public static function getAllQueues(PdoDatabase $database)
+    public static function getAllQueues(PdoDatabase $database, ?int $domain): array
     {
         $statement = $database->prepare(<<<SQL
-            SELECT * FROM requestqueue;
+            SELECT * FROM requestqueue WHERE domain = coalesce(:domain, domain);
 SQL
         );
-        $statement->execute();
+        $statement->execute([':domain'  => $domain]);
 
         $resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
 
@@ -72,13 +74,13 @@ public static function getAllQueues(PdoDatabase $database)
      *
      * @return RequestQueue[]
      */
-    public static function getEnabledQueues(PdoDatabase $database)
+    public static function getEnabledQueues(PdoDatabase $database, int $domain)
     {
         $statement = $database->prepare(<<<SQL
-            SELECT * FROM requestqueue WHERE enabled = 1;
+            SELECT * FROM requestqueue WHERE enabled = 1 and domain = :domain;
 SQL
         );
-        $statement->execute();
+        $statement->execute([':domain' => $domain]);
 
         $resultObject = $statement->fetchAll(PDO::FETCH_CLASS, get_called_class());
 

includes/DataObjects/WelcomeTemplate.php

@@ -33,6 +33,7 @@ class WelcomeTemplate extends DataObject
      * Summary of getAll
      *
      * @param PdoDatabase $database
+     * @param int         $domain
      *
      * @return WelcomeTemplate[]
      */