Functions for autoset and get AdminUrl

Author: tareqtms

lib/AuthHelper.php

@@ -12,27 +12,6 @@
 
 class AuthHelper
 {
-    /**
-     * Return the admin url, based on a given shop url
-     *
-     * @param string $shopUrl
-     * @param string $apiKey
-     * @param string $apiPassword
-     * @return string
-     */
-    public static function getAdminUrl($shopUrl, $apiKey = null, $apiPassword = null)
-    {
-        //Remove https:// and trailing slash (if provided)
-        $shopUrl = preg_replace('#^https?://|/$#', '', $shopUrl);
-
-        if($apiKey && $apiPassword) {
-            $adminUrl = "https://$apiKey:$apiPassword@$shopUrl/admin/";
-        } else {
-            $adminUrl = "https://$shopUrl/admin/";
-        }
-        return $adminUrl;
-    }
-
     /**
      * Get the url of the current page
      *
@@ -130,7 +109,7 @@ public static function createAuthRequest($scopes, $redirectUrl = null)
         if (is_array($scopes)) {
             $scopes = join(',', $scopes);
         }
-        $authUrl = $config['ApiUrl'] . 'oauth/authorize?client_id=' . $config['ApiKey'] . '&redirect_uri=' . $redirectUrl . "&scope=$scopes";
+        $authUrl = $config['AdminUrl'] . 'oauth/authorize?client_id=' . $config['ApiKey'] . '&redirect_uri=' . $redirectUrl . "&scope=$scopes";
 
         header("Location: $authUrl");
     }
@@ -158,7 +137,7 @@ public static function getAccessToken()
                 'code' => $_GET['code'],
             );
 
-            $response = HttpRequestJson::post($config['ApiUrl'] . 'oauth/access_token', $data);
+            $response = HttpRequestJson::post($config['AdminUrl'] . 'oauth/access_token', $data);
 
             return isset($response['access_token']) ? $response['access_token'] : null;
         }

lib/ShopifyAPI.php

@@ -112,7 +112,7 @@ public function __construct($id = null, $parentResourceUrl = '')
 
         $config = ShopifyClient::$config;
 
-        $this->resourceUrl = ($parentResourceUrl ? $parentResourceUrl . '/' :  $config['ApiUrl']) . $this->getResourcePath() . ($this->id ? '/' . $this->id : '');
+        $this->resourceUrl = ($parentResourceUrl ? $parentResourceUrl . '/' :  $config['AdminUrl']) . $this->getResourcePath() . ($this->id ? '/' . $this->id : '');
 
         if (isset($config['AccessToken'])) {
             $this->httpHeaders['X-Shopify-Access-Token'] = $config['AccessToken'];

lib/ShopifyClient.php

@@ -70,7 +70,7 @@ class ShopifyClient
      *
      * @var array
      */
-    public static $config;
+    public static $config = array();
 
     /**
      * List of available resources which can be called from this client
@@ -137,15 +137,12 @@ class ShopifyClient
      *
      * @return void
      */
-    public function __construct($config)
+    public function __construct($config = array())
     {
-        if (isset($config['ApiKey']) && isset($config['Password'])) {
-            $config['ApiUrl'] = AuthHelper::getAdminUrl($config['ShopUrl'], $config['ApiKey'], $config['Password']);
-        } else {
-            $config['ApiUrl'] = AuthHelper::getAdminUrl($config['ShopUrl']);
+        if(!empty($config)) {
+            ShopifyClient::$config = $config;
+            ShopifyClient::setAdminUrl();
         }
-
-        ShopifyClient::$config = $config;
     }
 
     /**
@@ -199,11 +196,55 @@ public function __call($resourceName, $arguments)
     /**
      * Configure the SDK client
      *
-     * @param $config
+     * @param array $config
+     *
      * @return ShopifyClient
      */
     public static function config($config)
     {
-        return new ShopifyClient($config);
+        foreach ($config as $key => $value) {
+            self::$config[$key] = $value;
+        }
+
+        //Re-set the admin url if shop url is changed
+        if(isset($config['ShopUrl'])) {
+            self::setAdminUrl();
+        }
+
+        return new ShopifyClient;
+    }
+
+    /**
+     * Set the admin url, based on the configured shop url
+     *
+     * @return string
+     */
+    public static function setAdminUrl()
+    {
+        $shopUrl = self::$config['ShopUrl'];
+
+        //Remove https:// and trailing slash (if provided)
+        $shopUrl = preg_replace('#^https?://|/$#', '', $shopUrl);
+
+        if(isset(self::$config['ApiKey']) && isset(self::$config['Password'])) {
+            $apiKey = self::$config['ApiKey'];
+            $apiPassword = self::$config['Password'];
+            $adminUrl = "https://$apiKey:$apiPassword@$shopUrl/admin/";
+        } else {
+            $adminUrl = "https://$shopUrl/admin/";
+        }
+
+        self::$config['AdminUrl'] = $adminUrl;
+
+        return $adminUrl;
+    }
+
+    /**
+     * Get the admin url of the configured shop
+     *
+     * @return string
+     */
+    public static function getAdminUrl() {
+        return self::$config['AdminUrl'];
     }
 }