Merge pull request #125 from MegaChriz/has-api-access

Pass implementation of MailchimpApiUser::hasApiAccess() to the api_access object

Author: aprice42

src/Mailchimp.php

@@ -214,6 +214,13 @@ public function request($method, $path, $tokens = NULL, $parameters = [], $batch
     return $this->client->handleRequest($method, $this->endpoint . $path, $options, $parameters, $returnAssoc);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function hasApiAccess() {
+    return isset($this->api_key);
+  }
+
   /**
    * Gets the ID of the data center associated with an API key.
    *

src/Mailchimp2.php

@@ -211,6 +211,13 @@ public function request($method, $path, $tokens = NULL, $parameters = [], $batch
     return $this->client->handleRequest($method, $this->endpoint . $path, $options, $parameters, $returnAssoc);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function hasApiAccess() {
+    return isset($this->access_token);
+  }
+
   /**
    * Instantiates a default HTTP client based on the local environment.
    *

src/MailchimpApiInterface.php

@@ -34,5 +34,12 @@ interface MailchimpApiInterface {
    */
   public function request($method, $path, $tokens = NULL, $parameters = [], $batch = FALSE, $returnAssoc = FALSE);
 
+  /**
+   * Checks if key or token is in place.
+   *
+   * @return bool
+   *   If the access_token or api_key is set.
+   */
+  public function hasApiAccess();
 
 }

src/MailchimpApiUser.php

@@ -120,14 +120,7 @@ public function processBatchOperations() {
    *   If the access_token or api_key is set.
    */
   public function hasApiAccess() {
-    switch (get_class($this->api_class)) {
-      case 'Mailchimp\Mailchimp':
-        return isset($this->api_class->api_key);
-        break;
-      case 'Mailchimp\Mailchimp2':
-        return isset($this->api_class->access_token);
-        break;
-    }
+    return $this->api_class->hasApiAccess();
   }
 
   /**