Merge pull request #12 from vienthuong/1.3.2

Release 1.3.1 - Shopware 6.5 compatibility

Author: vienthuong

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to `shopware-php-sdk` will be documented in this file.
 
 Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
 
+### 1.3.2
+- Shopware 6.5 compatibility
+- `WebhookAuthenticator::authenticateGetRequest` now also consider `sw-context-language` and `sw-user-language`
+- Added properties `userLanguage` and `contextLanguage` into `IFrameRequest`
+
 ### 1.3.1
 - [Hydrate Bug fixed](https://github.com/vienthuong/shopware-php-sdk/issues/10)
 - Update Latest DAL Classes

composer.json

@@ -3,7 +3,7 @@
     "description": "A PHP SDK for Shopware 6 Platform",
     "type": "library",
     "license": "MIT",
-    "version": "1.3.1",
+    "version": "1.3.2",
     "authors": [
         {
             "name": "vin",

src/Data/Webhook/IFrameRequest/IFrameRequest.php

@@ -17,10 +17,16 @@ class IFrameRequest extends Struct
 
     protected ?string $shopwareShopSignature;
 
+    protected ?string $contextLanguage;
+
+    protected ?string $userLanguage;
+
     public function __construct(array $parameters = [])
     {
         $this->shopId = $parameters[ShopRequest::SHOP_ID_REQUEST_PARAMETER];
         $this->shopUrl = $parameters[ShopRequest::SHOP_URL_REQUEST_PARAMETER];
+        $this->contextLanguage = $parameters[ShopRequest::SHOP_CONTEXT_LANGUAGE] ?? null;
+        $this->userLanguage = $parameters[ShopRequest::SHOP_USER_LANGUAGE] ?? null;
         $this->swVersion = $parameters[ShopRequest::SHOPWARE_VERSION_REQUEST_PARAMETER] ?? 'na';
         $this->timestamp = (int) $parameters[ShopRequest::TIME_STAMP_REQUEST_PARAMETER];
         $this->shopwareShopSignature = $parameters[ShopRequest::SHOP_SIGNATURE_REQUEST_PARAMETER] ?? null;
@@ -50,4 +56,14 @@ public function getShopwareShopSignature(): ?string
     {
         return $this->shopwareShopSignature;
     }
+
+    public function getContextLanguage(): ?string
+    {
+        return $this->contextLanguage;
+    }
+
+    public function getUserLanguage(): ?string
+    {
+        return $this->userLanguage;
+    }
 }

src/Data/Webhook/ShopRequest.php

@@ -13,4 +13,8 @@ class ShopRequest
     public const SHOPWARE_VERSION_REQUEST_PARAMETER = 'sw-version';
 
     public const SHOP_SIGNATURE_REQUEST_PARAMETER = 'shopware-shop-signature';
+
+    public const SHOP_CONTEXT_LANGUAGE = 'sw-context-language';
+
+    public const SHOP_USER_LANGUAGE = 'sw-user-language';
 }

src/Service/WebhookAuthenticator.php

@@ -59,6 +59,18 @@ public static function authenticateGetRequest(string $shopSecret): bool
             $queries['sw-version'],
         );
 
+        if (array_key_exists('sw-context-language', $queries) && array_key_exists('sw-context-language', $queries)) {
+            $queryString = sprintf(
+                'shop-id=%s&shop-url=%s&timestamp=%s&sw-version=%s&sw-context-language=%s&sw-user-language=%s',
+                $shop->getShopId(),
+                $shop->getShopUrl(),
+                $queries['timestamp'],
+                $queries['sw-version'],
+                $queries['sw-context-language'],
+                $queries['sw-user-language'],
+            );
+        }
+
         $hmac = \hash_hmac('sha256', htmlspecialchars_decode($queryString), $shopSecret);
 
         return hash_equals($hmac, $queries['shopware-shop-signature']);