Merge pull request #270 from Shopify/topic-name-graphql-transformation

Add support for Event topic names

Author: pacocastrotech

CHANGELOG.md

@@ -14,6 +14,7 @@ and adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 - [#262](https://github.com/Shopify/shopify-api-php/pull/262) ⚠️ [Breaking] Added support for PHP 8.2, and removed support for PHP 7.4
 - [#264](https://github.com/Shopify/shopify-api-php/pull/264) [Patch] Remove support for currently-non-existent versions of PHP (8.3+)
 - [#272](https://github.com/Shopify/shopify-api-php/pull/272) ⚠️ [Breaking] Removed REST resources for 2022-01, update resources for remaining versions
+- [#270](https://github.com/Shopify/shopify-api-php/pull/270) [Patch] Add support for Event topic names
 
 ## v4.3.0 - 2023-04-12
 

src/Webhooks/Registry.php

@@ -295,6 +295,6 @@ private static function validateProcessHmac(string $rawBody, string $hmac): void
      */
     private static function convertTopic(string $topic): string
     {
-        return strtoupper(str_replace('/', '_', $topic));
+        return strtoupper(str_replace(['/', '.'], '_', $topic));
     }
 }

tests/Webhooks/RegistryTest.php

@@ -408,6 +408,29 @@ public function testProcessWebhook()
         $this->assertNull($response->getErrorMessage());
     }
 
+    public function testHandlesVarianceInWebhookTopicNames()
+    {
+        $handler = $this->getMockHandler();
+        $handler->expects($this->once())
+            ->method('handle')
+            ->with(
+                "DOMAIN_SUB_DOMAIN_SOMETHING_HAPPENED",
+                'test-shop.myshopify.io',
+                $this->processBody,
+            );
+
+        Registry::addHandler("DOMAIN_SUB_DOMAIN_SOMETHING_HAPPENED", $handler);
+
+        $processHeaders = [
+            HttpHeaders::X_SHOPIFY_HMAC => '/Redz4YXHLnSmmSN8grr5/Jl/Ua3d7yX3iWbjb8R8wo=',
+            HttpHeaders::X_SHOPIFY_TOPIC => 'domain.sub_domain.something_happened',
+            HttpHeaders::X_SHOPIFY_DOMAIN => 'test-shop.myshopify.io',
+        ];
+        $response = Registry::process($processHeaders, json_encode($this->processBody));
+        $this->assertTrue($response->isSuccess());
+        $this->assertNull($response->getErrorMessage());
+    }
+
     public function testProcessWebhookWithHandlerErrors()
     {
         $handler = $this->getMockHandler();