store to shop rename

pizdata · Mar 29, 2017 · 6573396 · 6573396
1 parent a5b26f8
commit 6573396
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ $provider = new Pizdata\OAuth2\Client\Provider\Shopify([
     'clientId'                => '{shopify-client-id}',    // The client ID assigned to you by the Shopify
     'clientSecret'            => '{shopify-client-secret}',   // The client password assigned to you by the Shopify
     'redirectUri'             => 'http://localhost/callback', // The redirect URI assigned to you
-    'store'                   => 'my-test-store', // The Store name
+    'shop'                    => 'pizdata.myshopify.com', // The Shop name
 ]);
 
 // If we don't have an authorization code then get one

diff --git a/src/Provider/Shopify.php b/src/Provider/Shopify.php
@@ -7,13 +7,6 @@
 
 class Shopify extends AbstractProvider
 {
-    /**
-     * Production Shopify domain.
-     *
-     * @const string
-     */
-    const BASE_SHOPIFY_DOMAIN = 'myshopify.com';
-
     /**
      * The store name.
      *
@@ -31,12 +24,12 @@ public function __construct($options = [], array $collaborators = [])
     {
         parent::__construct($options, $collaborators);
 
-        if (empty($options['store'])) {
-            $message = 'The "store" option not set. Please set a Store name.';
+        if (empty($options['shop'])) {
+            $message = 'The "shop" option not set. Please set a Shop name.';
             throw new \InvalidArgumentException($message);
         }
 
-        $this->store = $options['store'];
+        $this->store = $options['shop'];
     }
 
     /**
@@ -46,7 +39,7 @@ public function __construct($options = [], array $collaborators = [])
      */
     public function getBaseAuthorizationUrl()
     {
-        return sprintf('https://%s.%s/admin/oauth/authorize', $this->store, self::BASE_SHOPIFY_DOMAIN);
+        return sprintf('https://%s/admin/oauth/authorize', $this->store);
     }
 
     /**
@@ -58,7 +51,7 @@ public function getBaseAuthorizationUrl()
      */
     public function getBaseAccessTokenUrl(array $params)
     {
-        return sprintf('https://%s.%s/admin/oauth/access_token', $this->store, self::BASE_SHOPIFY_DOMAIN);
+        return sprintf('https://%s/admin/oauth/access_token', $this->store);
     }
 
     /**
@@ -71,9 +64,8 @@ public function getBaseAccessTokenUrl(array $params)
     public function getResourceOwnerDetailsUrl(AccessToken $token)
     {
         return sprintf(
-            'https://%s.%s/admin/shop.json?access_token=%s',
+            'https://%s/admin/shop.json?access_token=%s',
             $this->store,
-            self::BASE_SHOPIFY_DOMAIN,
             $token->getToken()
         );
     }

diff --git a/tests/Provider/ShopifyTest.php b/tests/Provider/ShopifyTest.php
@@ -15,7 +15,7 @@ protected function setUp()
             'clientId' => 'mock_client_id',
             'clientSecret' => 'mock_secret',
             'redirectUri' => 'none',
-            'store' => 'mock_domain',
+            'shop' => 'mock_domain',
         ]);
     }
 
@@ -27,7 +27,7 @@ public function tearDown()
 
     /**
      * @covers \Pizdata\OAuth2\Client\Provider\Shopify::__construct
-     * @expectExceptionMessage 'The "store" option not set. Please set a Store name.'
+     * @expectExceptionMessage 'The "shop" option not set. Please set a Shop name.'
      * @expectedException \InvalidArgumentException
      */
     public function testNoStoreName()