Fix logging in to MW api (#433)

UTRS2 · Feb 15, 2021 · b31e6e0 · b31e6e0
1 parent 27e9184
commit b31e6e0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/app/Jobs/Scheduled/UpdateWikiAppealListJob.php b/app/Jobs/Scheduled/UpdateWikiAppealListJob.php
@@ -82,7 +82,10 @@ public function handle()
         $text = $this->createContents($appeals);
 
         // get page information
-        $services = MediaWikiRepository::getApiForTarget($this->wiki)->getAddWikiServices();
+        $api = MediaWikiRepository::getApiForTarget($this->wiki);
+        $api->login();
+
+        $services = $api->getAddWikiServices();
         $page = $services->newPageGetter()->getFromTitle($page);
 
         // prepare edit

diff --git a/app/Services/MediaWiki/Api/MediaWikiApi.php b/app/Services/MediaWiki/Api/MediaWikiApi.php
@@ -14,4 +14,6 @@ public function getAddWikiMediaWikiApi(): AddwikiMediaWikiApi;
     public function getAddWikiServices(): MediawikiFactory;
 
     public function getMediaWikiExtras(): MediaWikiExtras;
+
+    public function login(): void;
 }
diff --git a/app/Services/MediaWiki/Implementation/RealMediaWikiApi.php b/app/Services/MediaWiki/Implementation/RealMediaWikiApi.php
@@ -35,7 +35,11 @@ public function __construct(string $identifier, string $url)
 
         /** @var CookieJar $jar */
         $jar = $this->guzzleClient->getConfig('cookies');
-        if ($jar->getCookieByName('mediawiki_session')) {
+
+        // session names are unreliable, just assume there is at least some session if it's not empty
+        // checking the logged-in status when logging in isn't that expensive and this is significantly
+        // simpler than trying to guess the correct session cookie name which can change at any point anyways
+        if ($jar->count() > 0) {
             $this->hasExistingSession = true;
         }
     }
@@ -69,7 +73,7 @@ public function getMediaWikiExtras(): MediaWikiExtras
         return new RealMediaWikiExtras($this);
     }
 
-    public function login()
+    public function login(): void
     {
         if ($this->loggedIn) {
             return;

diff --git a/tests/Fakes/MediaWiki/FakeMediaWikiApi.php b/tests/Fakes/MediaWiki/FakeMediaWikiApi.php
@@ -46,4 +46,9 @@ public function getWikiName(): string
     {
         return $this->wiki;
     }
+
+    public function login(): void
+    {
+        // no-op
+    }
 }