From 90c329d1c434379230a3d35bf0f67e0369788554 Mon Sep 17 00:00:00 2001 From: Liam Cooper Date: Wed, 14 Apr 2021 09:48:12 +0100 Subject: [PATCH 1/3] Throw an exception if the request failed (bad auth code, invalid shop) --- lib/AuthHelper.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/AuthHelper.php b/lib/AuthHelper.php index e879964..265989e 100644 --- a/lib/AuthHelper.php +++ b/lib/AuthHelper.php @@ -170,6 +170,10 @@ public static function getAccessToken() $response = HttpRequestJson::post($config['AdminUrl'] . 'oauth/access_token', $data); + if (CurlRequest::$lastHttpCode >= 400) { + throw new SdkException("Invalid request. The shop domain is incorrect or the authorization code has already been used."); + } + return isset($response['access_token']) ? $response['access_token'] : null; } else { throw new SdkException("This request is not initiated from a valid shopify shop!"); From c70bd52324a54c5e7dac157d30deb853a8a07359 Mon Sep 17 00:00:00 2001 From: Liam Cooper Date: Wed, 14 Apr 2021 09:54:47 +0100 Subject: [PATCH 2/3] Slight change in vocabulary --- lib/AuthHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/AuthHelper.php b/lib/AuthHelper.php index 265989e..d6461e5 100644 --- a/lib/AuthHelper.php +++ b/lib/AuthHelper.php @@ -171,7 +171,7 @@ public static function getAccessToken() $response = HttpRequestJson::post($config['AdminUrl'] . 'oauth/access_token', $data); if (CurlRequest::$lastHttpCode >= 400) { - throw new SdkException("Invalid request. The shop domain is incorrect or the authorization code has already been used."); + throw new SdkException('The shop is invalid or the authorization code has already been used.'); } return isset($response['access_token']) ? $response['access_token'] : null; From fe7e971bf894d6936c0ba136f651617d64e08bf7 Mon Sep 17 00:00:00 2001 From: Liam Cooper Date: Wed, 14 Apr 2021 10:03:12 +0100 Subject: [PATCH 3/3] Follow string quote convention --- lib/AuthHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/AuthHelper.php b/lib/AuthHelper.php index d6461e5..617f542 100644 --- a/lib/AuthHelper.php +++ b/lib/AuthHelper.php @@ -171,7 +171,7 @@ public static function getAccessToken() $response = HttpRequestJson::post($config['AdminUrl'] . 'oauth/access_token', $data); if (CurlRequest::$lastHttpCode >= 400) { - throw new SdkException('The shop is invalid or the authorization code has already been used.'); + throw new SdkException("The shop is invalid or the authorization code has already been used."); } return isset($response['access_token']) ? $response['access_token'] : null;