Better error messages

gnikyt · May 23, 2018 · 6808a84 · 6808a84
1 parent a34da8b
commit 6808a84
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/OhMyBrew/BasicShopifyAPI.php b/src/OhMyBrew/BasicShopifyAPI.php
@@ -411,12 +411,12 @@ public function graph(string $query)
             throw new Exception('Shopify domain missing for API calls');
         }
 
-        if ($this->private && $this->apiPassword === null) {
+        if ($this->private && ($this->apiPassword === null && $this->accessToken === null)) {
             // Private apps need password for use as access token
-            throw new Exception('API password required for Shopify GraphQL calls');
+            throw new Exception('API password/access token required for private Shopify GraphQL calls');
         } elseif (!$this->private && $this->accessToken === null) {
             // Need access token for public calls
-            throw new Exception('Access token required for Shopify GraphQL calls');
+            throw new Exception('Access token required for public Shopify GraphQL calls');
         }
 
         // Create the request, pass the access token and optional parameters

diff --git a/test/GraphApiTest.php b/test/GraphApiTest.php
@@ -75,7 +75,7 @@ public function itShouldThrowExceptionForMissingDomainOnQuery()
     /**
      * @test
      * @expectedException Exception
-     * @expectedExceptionMessage API password required for Shopify GraphQL calls
+     * @expectedExceptionMessage API password/access token required for private Shopify GraphQL calls
      *
      * Ensure API password is there for private queries
      */
@@ -89,7 +89,7 @@ public function itShouldThrowExceptionForMissingApiPasswordOnPrivateQuery()
     /**
      * @test
      * @expectedException Exception
-     * @expectedExceptionMessage Access token required for Shopify GraphQL calls
+     * @expectedExceptionMessage Access token required for public Shopify GraphQL calls
      *
      * Ensure access token is there for public queries
      */