Merge branch 'master' of https://github.com/Richtermeister/symfony-sh…

…opify-bundle
Richtermeister · Jul 29, 2018 · d9eca07 · d9eca07
2 parents 2e3c47e + 6bc0e50
commit d9eca07
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Controller/OAuthController.php b/src/Controller/OAuthController.php
@@ -131,9 +131,10 @@ public function verify(Request $request)
         $hmac      = $request->get('hmac');
 
         // todo validate store name
+        // todo leverage options resolver?
 
-        if (!$authCode || !$storeName) {
-            throw new BadRequestHttpException('Request is missing required parameters: "code", "shop".');
+        if (!$authCode || !$storeName || !$nonce || !$hmac) {
+            throw new BadRequestHttpException('Request is missing one or more of required parameters: "code", "shop", "state", "hmac".');
         }
 
         if (!$this->hmacSignature->isValid($hmac, $request->query->all())) {
@@ -151,6 +152,7 @@ public function verify(Request $request)
             ],
         ];
 
+        // todo this can fail - 400
         $response = $this->client->request('POST', 'https://' . $storeName . '/admin/oauth/access_token', $params);
         $responseJson = \GuzzleHttp\json_decode($response->getBody(), true);
 

diff --git a/src/Service/WebhookCreator.php b/src/Service/WebhookCreator.php
@@ -44,6 +44,9 @@ public function createWebhooks(string $storeName, array $topics)
                 'topic' => $topic,
             ], UrlGeneratorInterface::ABSOLUTE_URL);
 
+            // endpoint HAS to be https
+            $endpoint = str_replace("http://", "https://", $endpoint);
+
             $webhook = GenericResource::create([
                 'topic' => $topic,
                 'address' => $endpoint,