Merge pull request #98 from bezhermoso/url-in-signer

Feature Request: Support using webhook URLs as part of webhook signatures
spatie · Sep 10, 2021 · 96eacc9 · 96eacc9
2 parents 21292b3 + 5b9e1eb
commit 96eacc9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/Signer/DefaultSigner.php b/src/Signer/DefaultSigner.php
@@ -4,7 +4,7 @@
 
 class DefaultSigner implements Signer
 {
-    public function calculateSignature(array $payload, string $secret): string
+    public function calculateSignature(string $webhookUrl, array $payload, string $secret): string
     {
         $payloadJson = json_encode($payload);
 

diff --git a/src/Signer/Signer.php b/src/Signer/Signer.php
@@ -6,5 +6,5 @@ interface Signer
 {
     public function signatureHeaderName(): string;
 
-    public function calculateSignature(array $payload, string $secret): string;
+    public function calculateSignature(string $webhookUrl, array $payload, string $secret): string;
 }
diff --git a/src/WebhookCall.php b/src/WebhookCall.php
@@ -220,7 +220,7 @@ protected function getAllHeaders(): array
             return $headers;
         }
 
-        $signature = $this->signer->calculateSignature($this->payload, $this->secret);
+        $signature = $this->signer->calculateSignature($this->callWebhookJob->webhookUrl, $this->payload, $this->secret);
 
         $headers[$this->signer->signatureHeaderName()] = $signature;
 

diff --git a/tests/DefaultSignerTest.php b/tests/DefaultSignerTest.php
@@ -11,7 +11,7 @@ public function it_can_calculate_a_signature_for_a_given_payload_and_secret()
     {
         $signer = new DefaultSigner();
 
-        $signature = $signer->calculateSignature(['a' => '1'], 'abc');
+        $signature = $signer->calculateSignature('https://my.app/webhooks', ['a' => '1'], 'abc');
 
         $this->assertEquals(
             '345611a3626cf5e080a7a412184001882ab231b8bdb465dc76dbf709f01f210a',