Merge branch 'delete-tokens-401' into add-resource-tests

Author: n7studios

includes/class-integrate-convertkit-wpforms-api.php

@@ -29,13 +29,6 @@ class Integrate_ConvertKit_WPForms_API extends ConvertKit_API_V4 {
 	 */
 	public $error_messages = false;
 
-	/**
-	 * Access Token
-	 *
-	 * @var string
-	 */
-	public $access_token = '';
-
 	/**
 	 * Sets up the API with the required credentials.
 	 *
@@ -120,4 +113,17 @@ public function __construct( $client_id, $redirect_uri, $access_token = false, $
 
 	}
 
+	/**
+	 * Returns the access token.
+	 *
+	 * @since   1.8.9
+	 *
+	 * @return  string
+	 */
+	public function access_token() {
+
+		return $this->access_token;
+
+	}
+
 }

includes/class-integrate-convertkit-wpforms-resource.php

@@ -14,6 +14,13 @@
  */
 class Integrate_ConvertKit_WPForms_Resource extends ConvertKit_Resource_V4 {
 
+	/**
+	 * The API class
+	 *
+	 * @var     bool|Integrate_ConvertKit_WPForms_API
+	 */
+	public $api = false;
+
 	/**
 	 * Constructor.
 	 *
@@ -57,7 +64,7 @@ public function refresh() {
 		// If an error occured, maybe delete credentials from the Plugin's settings
 		// if the error is a 401 unauthorized.
 		if ( is_wp_error( $result ) ) {
-			integrate_convertkit_wpforms_maybe_delete_credentials( $result, INTEGRATE_CONVERTKIT_WPFORMS_OAUTH_CLIENT_ID, $this->api->access_token );
+			integrate_convertkit_wpforms_maybe_delete_credentials( $result, INTEGRATE_CONVERTKIT_WPFORMS_OAUTH_CLIENT_ID, $this->api->access_token() );
 		}
 
 		return $result;