Merge pull request #1 from HanashiDev/1.1.0

1.1.0

Author: Hanashi

files/lib/system/exception/SteamException.class.php

@@ -10,6 +10,6 @@
 * @license  Freie Lizenz (https://hanashi.eu/freie-lizenz/)
 * @package  WoltLabSuite\Core\System\Exception
 */
-class SteamException extends SystemException
+class SteamException extends \Exception
 {
 }

files/lib/system/steam/SteamAPI.class.php

@@ -2,10 +2,11 @@
 
 namespace wcf\system\steam;
 
+use GuzzleHttp\Exception\BadResponseException;
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Psr7\Request;
 use wcf\system\exception\SteamException;
-use wcf\system\exception\SystemException;
-use wcf\util\exception\HTTPException;
-use wcf\util\HTTPRequest;
+use wcf\system\io\HttpFactory;
 use wcf\util\JSON;
 use wcf\util\StringUtil;
 
@@ -54,30 +55,38 @@ public static function execute(string $interface, string $method, int $version,
         $apiURL = 'http://api.steampowered.com/' . $interface . '/' . $method . '/v' . $version . '/';
 
         $postParameters = [];
+        $headers = [];
         if ($httpmethod == 'GET') {
-            $apiURL .= '?' . http_build_query($parameters, null, '&');
+            $apiURL .= '?' . http_build_query($parameters, '', '&');
         } else {
             $postParameters = $parameters;
+            $headers['content-type'] = 'application/x-www-form-urlencoded';
         }
 
-        $request = new HTTPRequest($apiURL, ['method' => $httpmethod], $postParameters);
+        $request = new Request($httpmethod, $apiURL, $headers, http_build_query($postParameters, '', '&'));
         try {
-            $request->execute();
-            $reply = $request->getReply();
+            $response = HttpFactory::getDefaultClient()->send($request);
+            $content = (string)$response->getBody();
             try {
-                return JSON::decode($reply['body'], true);
-            } catch (SystemException $e) {
-                return $reply['body'];
+                return JSON::decode($content, true);
+            } catch (\Exception $e) {
+                return $content;
             }
-        } catch (HTTPException $e) {
-            throw new SteamException('Wrong Steam API call or Steam API is not reachable. (Message: ' . $e->getMessage() . ')');
-        } catch (SystemException $e) {
-            $reply = $request->getReply();
+        } catch (BadResponseException $e) {
+            if (\ENABLE_DEBUG_MODE) {
+                \wcf\functions\exception\logThrowable($e);
+            }
+            $content = (string)$e->getResponse()->getBody();
             try {
-                return JSON::decode($reply['body'], true);
-            } catch (SystemException $e) {
-                return $reply['body'];
+                return JSON::decode($content, true);
+            } catch (\Exception $e) {
+                return $content;
+            }
+        } catch (GuzzleException $e) {
+            if (\ENABLE_DEBUG_MODE) {
+                \wcf\functions\exception\logThrowable($e);
             }
+            throw new SteamException('Wrong Steam API call or Steam API is not reachable. (Message: ' . $e->getMessage() . ')');
         }
     }
 
@@ -100,7 +109,7 @@ public static function getOpenIDUrl(string $redirectUri, string $realm): string
             'openid.claimed_id' => 'http://specs.openid.net/auth/2.0/identifier_select',
             'openid.identity' => 'http://specs.openid.net/auth/2.0/identifier_select'
         ];
-        return 'https://steamcommunity.com/openid/login?' . http_build_query($data, null, '&');
+        return 'https://steamcommunity.com/openid/login?' . http_build_query($data, '', '&');
     }
 
     /**
@@ -119,11 +128,23 @@ public static function validateOpenID(): int
             }
         }
         $params['openid.mode'] = 'check_authentication';
+        $parameters = \http_build_query($params, "", '&');
 
-        $request = new HTTPRequest('https://steamcommunity.com/openid/login', [], $params);
-        $request->execute();
-        $reply = $request->getReply();
-        $content = $reply['body'];
+        $headers = [
+            'content-type' => 'application/x-www-form-urlencoded'
+        ];
+
+        $request = new Request('POST', 'https://steamcommunity.com/openid/login', $headers, $parameters);
+        $content = '';
+        try {
+            $response = HttpFactory::getDefaultClient()->send($request);
+            $content = (string)$response->getBody();
+        } catch (\Exception $e) {
+            if (\ENABLE_DEBUG_MODE) {
+                \wcf\functions\exception\logThrowable($e);
+            }
+            throw new SteamException('API error - ' . $e->getMessage());
+        }
 
         if (strpos($content, 'is_valid:true') === false) {
             throw new SteamException('Invalid authentication');

package.xml

@@ -5,8 +5,8 @@
         <packagename language="de"><![CDATA[Steam-API]]></packagename>
         <packagedescription><![CDATA[Api package for Steam.]]></packagedescription>
         <packagedescription language="de"><![CDATA[API-Paket für Steam.]]></packagedescription>
-        <version>1.0.2</version>
-        <date>2021-07-19</date>
+        <version>1.1.0</version>
+        <date>2021-07-20</date>
     </packageinformation>
 
     <authorinformation>
@@ -15,7 +15,7 @@
     </authorinformation>
 
     <requiredpackages>
-        <requiredpackage minversion="3.0.0">com.woltlab.wcf</requiredpackage>
+        <requiredpackage minversion="5.3.0">com.woltlab.wcf</requiredpackage>
     </requiredpackages>
 
     <excludedpackages>
@@ -34,7 +34,7 @@
         <instruction type="option" />
     </instructions>
 
-    <instructions type="update" fromversion="1.0.1 pl 1">
+    <instructions type="update" fromversion="1.0.2">
 		<!-- files -->
         <instruction type="file" />
     </instructions>