Allow client subscription structure to be directly passed to create (#…

…191)

this addresses #179

README.md

@@ -56,7 +56,16 @@ $notifications = [
             'contentEncoding' => 'aesgcm', // one of PushManager.supportedContentEncodings
         ]),
         'payload' => '{msg:"test"}',
-    ],
+    ], [
+          'subscription' => Subscription::create([ // this is the structure for the working draft from october 2018 (https://www.w3.org/TR/2018/WD-push-api-20181026/) 
+              "endpoint" => "https://example.com/other/endpoint/of/another/vendor/abcdef...",
+              "keys" => [
+                  'p256dh' => '(stringOf88Chars)',
+                  'auth' => '(stringOf24Chars)'
+              ],
+          ]),
+          'payload' => '{msg:"Hello World!"}',
+      ],
 ];
 
 $webPush = new WebPush();

src/Subscription.php

@@ -73,6 +73,15 @@ public static function create(array $associativeArray): Subscription {
             );
         }
 
+        if (array_key_exists('keys', $associativeArray) && is_array($associativeArray['keys'])) {
+            return new self(
+                $associativeArray['endpoint'],
+                $associativeArray['keys']['p256dh'] ?? null,
+                $associativeArray['keys']['auth'] ?? null,
+                $associativeArray['contentEncoding'] ?? "aesgcm"
+            );
+        }
+
         return new self(
             $associativeArray['endpoint']
         );

tests/SubscriptionTest.php

@@ -72,4 +72,18 @@ public function testConstructFull()
         $this->assertEquals("authToken", $subscription->getAuthToken());
         $this->assertEquals("aes128gcm", $subscription->getContentEncoding());
     }
+
+    public function testCreatePartialWithNewStructure()
+    {
+        $subscription = Subscription::create([
+            "endpoint" => "http://toto.com",
+            "keys" => [
+                'p256dh' => 'publicKey',
+                'auth' => 'authToken'
+            ]
+        ]);
+        $this->assertEquals("http://toto.com", $subscription->getEndpoint());
+        $this->assertEquals("publicKey", $subscription->getPublicKey());
+        $this->assertEquals("authToken", $subscription->getAuthToken());
+    }
 }