Merge pull request #711 from enwikipedia-acc/oauth-useragent

Composer package updates
enwikipedia-acc · Oct 22, 2021 · 9977999 · 9977999
2 parents 009b476 + bc6f053
commit 9977999
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 63 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "ext-curl": "*",
         "ext-mbstring": "*",
         "ext-simplexml": "*",
-        "mediawiki/oauthclient": "^1.1"
+        "mediawiki/oauthclient": "^1.2"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3",

diff --git a/composer.lock b/composer.lock
diff --git a/includes/ApplicationBase.php b/includes/ApplicationBase.php
@@ -159,7 +159,8 @@ protected function setupHelpers(
             $siteConfiguration->getOAuthBaseUrl(),
             $siteConfiguration->getOAuthConsumerToken(),
             $siteConfiguration->getOAuthConsumerSecret(),
-            $siteConfiguration->getMediawikiWebServiceEndpoint()
+            $siteConfiguration->getMediawikiWebServiceEndpoint(),
+            $siteConfiguration->getUserAgent()
         ));
 
         $page->setNotificationHelper(new IrcNotificationHelper(

diff --git a/includes/Helpers/OAuthProtocolHelper.php b/includes/Helpers/OAuthProtocolHelper.php
@@ -29,16 +29,19 @@ class OAuthProtocolHelper implements Interfaces\IOAuthProtocolHelper
      * @param string     $consumerKey
      * @param string     $consumerSecret
      * @param string     $mediawikiWebServiceEndpoint
+     * @param string     $userAgent
      */
     public function __construct(
         $oauthEndpoint,
         $consumerKey,
         $consumerSecret,
-        $mediawikiWebServiceEndpoint
+        $mediawikiWebServiceEndpoint,
+        $userAgent
     ) {
         $this->mediawikiWebServiceEndpoint = $mediawikiWebServiceEndpoint;
 
         $oauthClientConfig = new ClientConfig($oauthEndpoint);
+        $oauthClientConfig->setUserAgent($userAgent);
         $oauthClientConfig->setConsumer(new Consumer($consumerKey, $consumerSecret));
 
         $this->oauthClient = new Client($oauthClientConfig);
@@ -107,4 +110,4 @@ public function apiCall($apiParams, $accessToken, $accessSecret, $method = 'GET'
 
         return json_decode($data);
     }
-}
+}