Merge pull request #7 from cluebotng/refactor-login-debugging

Refactor login & debugging
cluebotng · Oct 18, 2021 · 29939be · 29939be
2 parents 92d7073 + f5a4e22
commit 29939be
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 35 deletions.
diff --git a/src/Wikipedia/Api.php b/src/Wikipedia/Api.php
@@ -476,10 +476,6 @@ public function edit(
         }
 
         $x = $this->http->post($this->apiurl, $params);
-        if ($this->logger !== null) {
-            $this->logger->addDebug($x);
-        }
-
         $x = $this->http->unserialize($x);
 
         if ($x['edit']['result'] == 'Success') {
@@ -515,6 +511,21 @@ public function gettoken($title)
         return $x['query']['tokens']['csrftoken'];
     }
 
+    /**
+     * This function returns a login token.
+     *
+     * @return A login token
+     **/
+    public function getLoginToken()
+    {
+        $x = $this->http->get($this->apiurl . '?rawcontinue=1&format=php' .
+                              '&meta=tokens&type=login');
+        $x = $this->http->unserialize($x);
+
+        return $x['query']['tokens']['logintoken'];
+    }
+
+
     /**
      * This function takes a username and password and logs you into wikipedia.
      *
@@ -527,36 +538,14 @@ public function login($user, $pass)
         $this->pass = $pass;
         $x = $this->http->post(
             $this->apiurl . '?action=login&format=php',
-            array('lgname' => $user, 'lgpassword' => $pass)
+            array('lgname' => $user,
+                  'lgpassword' => $pass,
+                  'lgtoken' => $this->getLoginToken())
         );
 
-        if ($this->logger !== null) {
-            $this->logger->addDebug($x);
-        }
-
         $x = $this->http->unserialize($x);
 
-        if ($x['login']['result'] == 'Success') {
-            return true;
-        }
-        if ($x['login']['result'] == 'NeedToken') {
-            $x = $this->http->post(
-                $this->apiurl . '?action=login&format=php',
-                array('lgname' => $user, 'lgpassword' => $pass, 'lgtoken' => $x['login']['token'])
-            );
-
-            if ($this->logger !== null) {
-                $this->logger->addDebug($x);
-            }
-
-            $x = $this->http->unserialize($x);
-
-            if ($x['login']['result'] == 'Success') {
-                return true;
-            }
-        }
-
-        return false;
+        return $x['login']['result'] == 'Success';
     }
 
     /**
@@ -587,11 +576,6 @@ public function move($old, $new, $reason, $checkrun = true)
         );
 
         $x = $this->http->post($this->apiurl, $params);
-
-        if ($this->logger !== null) {
-            $this->logger->addDebug($x);
-        }
-
         $this->http->unserialize($x);  // this emits warnings if needed
     }
 

diff --git a/src/Wikipedia/Http.php b/src/Wikipedia/Http.php
@@ -136,6 +136,10 @@ public function get($url)
      **/
     public function unserialize($response)
     {
+        if ($this->logger !== null) {
+            $this->logger->addDebug('Decoding response: ' . $response);
+        }
+
         $response = unserialize($response);
 
         if ($this->logger !== null) {