awesomemotive / google-analytics-for-wordpress

assets/lib/google/src/Google/Logger/Psr.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
  * limitations under the License.
  */
 
-if (!class_exists('MonsterInsights_GA_Lib_Client')) {
+if ( ! class_exists('MonsterInsights_GA_Lib_Client')) {
   require_once dirname(__FILE__) . '/../autoload.php';
 }
 
@@ -72,7 +72,7 @@ 
    */
   public function log($level, $message, array $context = array())
   {
-    if (!$this->shouldHandle($level)) {
+    if ( ! $this->shouldHandle($level)) {
       return false;
     }
 

assets/lib/google/src/Google/Logger/Exception.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-if (!class_exists('MonsterInsights_GA_Lib_Client')) {
+if ( ! class_exists('MonsterInsights_GA_Lib_Client')) {
   require_once dirname(__FILE__) . '/../autoload.php';
 }
 

assets/lib/google/src/Google/Logger/File.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
  * limitations under the License.
  */
 
-if (!class_exists('MonsterInsights_GA_Lib_Client')) {
+if ( ! class_exists('MonsterInsights_GA_Lib_Client')) {
   require_once dirname(__FILE__) . '/../autoload.php';
 }
 
@@ -56,14 +56,14 @@ 
     parent::__construct($client);
 
     $file = $client->getClassConfig('MonsterInsights_GA_Lib_Logger_File', 'file');
-    if (!is_string($file) && !is_resource($file)) {
+    if ( ! is_string($file) && ! is_resource($file)) {
       throw new MonsterInsights_GA_Lib_Logger_Exception(
           'File logger requires a filename or a valid file pointer'
       );
     }
 
     $mode = $client->getClassConfig('MonsterInsights_GA_Lib_Logger_File', 'mode');
-    if (!$mode) {
+    if ( ! $mode) {
       $this->mode = $mode;
     }
 
@@ -78,7 +78,7 @@ 
   {
     if (is_string($this->file)) {
       $this->open();
-    } elseif (!is_resource($this->file)) {
+    } elseif ( ! is_resource($this->file)) {
       throw new MonsterInsights_GA_Lib_Logger_Exception('File pointer is no longer available');
     }
 
@@ -106,7 +106,7 @@ 
 
     $old = set_error_handler(array($this, 'trapError'));
 
-    $needsChmod = !file_exists($this->file);
+    $needsChmod = ! file_exists($this->file);
     $fh = fopen($this->file, 'a');
 
     restore_error_handler();

assets/lib/google/src/Google/Logger/Abstract.php

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
  * limitations under the License.
  */
 
-if (!class_exists('MonsterInsights_GA_Lib_Client')) {
+if ( ! class_exists('MonsterInsights_GA_Lib_Client')) {
   require_once dirname(__FILE__) . '/../autoload.php';
 }
 
@@ -267,7 +267,7 @@ 
    */
   public function log($level, $message, array $context = array())
   {
-    if (!$this->shouldHandle($level)) {
+    if ( ! $this->shouldHandle($level)) {
       return false;
     }
 
@@ -294,7 +294,7 @@ 
   {
     $template = $this->logFormat;
 
-    if (!$variables['context']) {
+    if ( ! $variables['context']) {
       $template = str_replace('%context%', '', $template);
       unset($variables['context']);
     } else {
@@ -302,7 +302,7 @@ 
     }
 
     foreach ($variables as $key => $value) {
-      if (strpos($template, '%'. $key .'%') !== false) {
+      if (strpos($template, '%' . $key . '%') !== false) {
         $template = str_replace(
             '%' . $key . '%',
             $this->export($value),
@@ -321,12 +321,12 @@ 
    */
   protected function reverseJsonInContext(array &$context)
   {
-    if (!$context) {
+    if ( ! $context) {
       return;
     }
 
     foreach ($context as $key => $val) {
-      if (!$val || !is_string($val) || !($val[0] == '{' || $val[0] == '[')) {
+      if ( ! $val || ! is_string($val) || ! ($val[0] == '{' || $val[0] == '[')) {
         continue;
       }
 

assets/lib/google/src/Google/Utils/URITemplate.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
    */
   private $reserved = array(
       "=", ",", "!", "@", "|", ":", "/", "?", "#",
-      "[", "]",'$', "&", "'", "(", ")", "*", "+", ";"
+      "[", "]", '$', "&", "'", "(", ")", "*", "+", ";"
   );
   private $reservedEncoded = array(
     "%3D", "%2C", "%21", "%40", "%7C", "%3A", "%2F", "%3F",
@@ -107,7 +107,7 @@ 
         case "segments":
           // Slash separated data. Bare values only.
           $prefix = "/";
-          $data =$this->replaceVars($data, $parameters, "/");
+          $data = $this->replaceVars($data, $parameters, "/");
           break;
         case "dotprefix":
           // Dot separated data. Bare values only.
@@ -264,7 +264,7 @@ 
 
     // If we do not need to include the key name, we just return the raw
     // value.
-    if (!$combine || $skip_final_combine) {
+    if ( ! $combine || $skip_final_combine) {
       return $value;
     }
         

assets/lib/google/src/Google/Client.php

Indentation +1 added lines, -1 removed lines

@@ -544,7 +544,7 @@
    */
   public function getScopes()
   {
-     return $this->requestedScopes;
+      return $this->requestedScopes;
   }
 
   /**

Spacing +12 added lines, -12 removed lines

@@ -15,7 +15,7 @@ 
  * limitations under the License.
  */
 
-if (!class_exists('MonsterInsights_GA_Lib_Client')) {
+if ( ! class_exists('MonsterInsights_GA_Lib_Client')) {
   require_once dirname(__FILE__) . '/autoload.php';
 }
 
@@ -76,7 +76,7 @@ 
   {
     if (is_string($config) && strlen($config)) {
       $config = new MonsterInsights_GA_Lib_Config($config);
-    } else if ( !($config instanceof MonsterInsights_GA_Lib_Config)) {
+    } else if ( ! ($config instanceof MonsterInsights_GA_Lib_Config)) {
       $config = new MonsterInsights_GA_Lib_Config();
 
       if ($this->isAppEngine()) {
@@ -92,7 +92,7 @@ 
 
     if ($config->getIoClass() == MonsterInsights_GA_Lib_Config::USE_AUTO_IO_SELECTION) {
       if (function_exists('curl_version') && function_exists('curl_exec')
-          && !$this->isAppEngine()) {
+          && ! $this->isAppEngine()) {
         $config->setIoClass("MonsterInsights_GA_Lib_IO_Curl");
       } else {
         $config->setIoClass("MonsterInsights_GA_Lib_IO_Stream");
@@ -167,7 +167,7 @@ 
   {
     $data = json_decode($json);
     $key = isset($data->installed) ? 'installed' : 'web';
-    if (!isset($data->$key)) {
+    if ( ! isset($data->$key)) {
       throw new MonsterInsights_GA_Lib_Exception("Invalid client secret JSON file.");
     }
     $this->setClientId($data->$key->client_id);
@@ -528,7 +528,7 @@ 
    */
   public function addScope($scope_or_scopes)
   {
-    if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) {
+    if (is_string($scope_or_scopes) && ! in_array($scope_or_scopes, $this->requestedScopes)) {
       $this->requestedScopes[] = $scope_or_scopes;
     } else if (is_array($scope_or_scopes)) {
       foreach ($scope_or_scopes as $scope) {
@@ -586,7 +586,7 @@ 
           . " " . self::USER_AGENT_SUFFIX
           . $this->getLibraryVersion()
       );
-      if (!$this->getClassConfig("MonsterInsights_GA_Lib_Http_Request", "disable_gzip")) {
+      if ( ! $this->getClassConfig("MonsterInsights_GA_Lib_Http_Request", "disable_gzip")) {
         $request->enableGzip();
       }
       $request->maybeMoveParametersToBody();
@@ -612,7 +612,7 @@ 
    */
   public function getAuth()
   {
-    if (!isset($this->auth)) {
+    if ( ! isset($this->auth)) {
       $class = $this->config->getAuthClass();
       $this->auth = new $class($this);
     }
@@ -624,7 +624,7 @@ 
    */
   public function getIo()
   {
-    if (!isset($this->io)) {
+    if ( ! isset($this->io)) {
       $class = $this->config->getIoClass();
       $this->io = new $class($this);
     }
@@ -636,7 +636,7 @@ 
    */
   public function getCache()
   {
-    if (!isset($this->cache)) {
+    if ( ! isset($this->cache)) {
       $class = $this->config->getCacheClass();
       $this->cache = new $class($this);
     }
@@ -648,7 +648,7 @@ 
    */
   public function getLogger()
   {
-    if (!isset($this->logger)) {
+    if ( ! isset($this->logger)) {
       $class = $this->config->getLoggerClass();
       $this->logger = new $class($this);
     }
@@ -663,7 +663,7 @@ 
    */
   public function getClassConfig($class, $key = null)
   {
-    if (!is_string($class)) {
+    if ( ! is_string($class)) {
       $class = get_class($class);
     }
     return $this->config->getClassConfig($class, $key);
@@ -680,7 +680,7 @@ 
    */
   public function setClassConfig($class, $config, $value = null)
   {
-    if (!is_string($class)) {
+    if ( ! is_string($class)) {
       $class = get_class($class);
     }
     $this->config->setClassConfig($class, $config, $value);

assets/lib/google/src/Google/Signer/P12.php

Spacing +7 added lines, -7 removed lines

@@ -15,7 +15,7 @@ 
  * limitations under the License.
  */
 
-if (!class_exists('MonsterInsights_GA_Lib_Client')) {
+if ( ! class_exists('MonsterInsights_GA_Lib_Client')) {
   require_once dirname(__FILE__) . '/../autoload.php';
 }
 
@@ -34,7 +34,7 @@ 
   // Creates a new signer from a .p12 file.
   public function __construct($p12, $password)
   {
-    if (!function_exists('openssl_x509_read')) {
+    if ( ! function_exists('openssl_x509_read')) {
       throw new MonsterInsights_GA_Lib_Exception(
           'The Google PHP API library needs the openssl PHP extension'
       );
@@ -44,14 +44,14 @@ 
     // format. Different versions of openssl support different p12 formats
     // and the key from google wasn't being accepted by the version available
     // at the time.
-    if (!$password && strpos($p12, "-----BEGIN RSA PRIVATE KEY-----") !== false) {
+    if ( ! $password && strpos($p12, "-----BEGIN RSA PRIVATE KEY-----") !== false) {
       $this->privateKey = openssl_pkey_get_private($p12);
     } elseif ($password === 'notasecret' && strpos($p12, "-----BEGIN PRIVATE KEY-----") !== false) {
       $this->privateKey = openssl_pkey_get_private($p12);
     } else {
       // This throws on error
       $certs = array();
-      if (!openssl_pkcs12_read($p12, $certs, $password)) {
+      if ( ! openssl_pkcs12_read($p12, $certs, $password)) {
         throw new MonsterInsights_GA_Lib_Auth_Exception(
             "Unable to parse the p12 file.  " .
             "Is this a .p12 file?  Is the password correct?  OpenSSL error: " .
@@ -60,13 +60,13 @@ 
       }
       // TODO(beaton): is this part of the contract for the openssl_pkcs12_read
       // method?  What happens if there are multiple private keys?  Do we care?
-      if (!array_key_exists("pkey", $certs) || !$certs["pkey"]) {
+      if ( ! array_key_exists("pkey", $certs) || ! $certs["pkey"]) {
         throw new MonsterInsights_GA_Lib_Auth_Exception("No private key found in p12 file.");
       }
       $this->privateKey = openssl_pkey_get_private($certs['pkey']);
     }
 
-    if (!$this->privateKey) {
+    if ( ! $this->privateKey) {
       throw new MonsterInsights_GA_Lib_Auth_Exception("Unable to load private key");
     }
   }
@@ -86,7 +86,7 @@ 
       );
     }
     $hash = defined("OPENSSL_ALGO_SHA256") ? OPENSSL_ALGO_SHA256 : "sha256";
-    if (!openssl_sign($data, $signature, $this->privateKey, $hash)) {
+    if ( ! openssl_sign($data, $signature, $this->privateKey, $hash)) {
       throw new MonsterInsights_GA_Lib_Auth_Exception("Unable to sign data");
     }
     return $signature;

assets/lib/google/src/Google/autoload.php

Spacing +3 added lines, -3 removed lines

@@ -33,12 +33,12 @@
 function monsterinsights_renamed_google_api_php_client_autoload($className)
 {
   $classPath = explode('_', $className);
-  if ( empty( $classPath[0] ) || empty( $classPath[1] ) || empty( $classPath[2] ) || 
+  if (empty($classPath[0]) || empty($classPath[1]) || empty($classPath[2]) || 
       $classPath[0] != 'MonsterInsights' && $classPath[1] != 'GA' && $classPath[2] != 'Lib') {
     return;
   }
-  unset( $classPath[0] );
-  unset( $classPath[1] );
+  unset($classPath[0]);
+  unset($classPath[1]);
   $classPath[2] = 'Google';
   // Drop 'MonsterInsights_GA_Lib', and maximum class file path depth in this project is 3.
   $classPath = array_slice($classPath, 1, 2);

assets/lib/google/class-ga-client.php

Indentation +337 added lines, -337 removed lines

@@ -4,345 +4,345 @@
  */
 // Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+  exit;
 }
 class MonsterInsights_GA_Client extends MonsterInsights_GA_Lib_Client {
 
-	/**
-	 * @var string
-	 */
-	protected $option_refresh_token;
-
-	/**
-	 * @var string
-	 */
-	protected $option_access_token;
-
-	/**
-	 * @var string
-	 */
-	protected $http_response_code;
-
-	/**
-	 * @var string
-	 */
-	public $client; // used for reporting purposes
-
-	/**
-	 * Initialize the config and refresh the token
-	 *
-	 * @param array  $config
-	 * @param string $option_prefix
-	 */
-	public function __construct( $google_settings, $client_name ) {
-
-		// Initialize the config to set all properties properly.
-		$config = $this->init_config( $google_settings );
-
-		parent::__construct( $config );
-
-		$this->client = new MonsterInsights_GA_Lib_Client( $config );
-
-		if ( ! empty( $google_settings['scopes'] ) ) {
-			$this->setScopes( $google_settings['scopes'] );
-		}
-
-		$this->setAccessType( 'offline' );
-
-		// Client name will be `pro`, `lite`, or `support`
-		$this->option_refresh_token = 'monsterinsights_' . $client_name . '_refresh_token';
-		$this->option_access_token  = 'monsterinsights_' . $client_name . '_access_token';
-
-		// Let's get an access token if we've got a refresh token.
-		$this->refresh_tokens();
-	}
-
-	/**
-	 * Authenticate the client. If $authorization_code is empty it will lead the user through the validation process of
-	 * Google. If set it will be get the access token for current session and save the refresh_token for future use
-	 *
-	 * @param mixed $authorization_code
-	 *
-	 * @return bool
-	 */
-	public function authenticate_client( $authorization_code = null ) {
-		static $has_retried;
-
-		// Authenticate client.
-		try {
-			$this->authenticate( $authorization_code );
-
-			// Get access response.
-			$response = $this->getAccessToken();
-
-			// Check if there is a response body.
-			if ( ! empty( $response ) ) {
-				$response = json_decode( $response );
-
-				if ( is_object( $response ) ) {
-					// Save the refresh token.
-					$this->save_refresh_token( $response->refresh_token );
-					$this->save_initial_access_token( $response );
-					return true;
-				}
-			}
-		} catch ( MonsterInsights_GA_Lib_Auth_Exception $exception ) {
-			// If there aren't any attempts before, try again and set attempts on true, to prevent further attempts.
-			if ( empty( $has_retried ) ) {
-				$has_retried = true;
-
-				return $this->authenticate_client( $authorization_code );
-			}
-			//error_log( $exception ); // @todo proper logging and handling of already used oauth token
-		}
-
-		return false;
-	}
-
-	/**
-	 * Doing a request to the API
-	 *
-	 * @param string $target_request_url
-	 * @param bool   $decode_response
-	 * @param string $request_method
-	 *
-	 * @return array
-	 */
-	public function do_request( $target_request_url, $decode_response = false, $request_method = 'GET', $body = array() ) {
-		// Get response.
-		$request  = new MonsterInsights_GA_Lib_Http_Request( $target_request_url, $request_method );
-		if ( ! empty( $body ) ) {
-			$request->setPostBody( $body ); // used exclusively for auth profiles
-		}
-
-		$response = $this->getAuth()->authenticatedRequest( $request );
-
-		// Storing the response code.
-		$this->http_response_code = $response->getResponseHttpCode();
-
-		if ( $decode_response ) {
-			return $this->decode_response( $response );
-		}
-
-		return $response;
-	}
-
-	/**
-	 * Decode the JSON response
-	 *
-	 * @param object $response
-	 * @param int    $accepted_response_code
-	 *
-	 * @return mixed
-	 */
-	public function decode_response( $response, $accepted_response_code = 200 ) {
-		if ( $accepted_response_code === $response->getResponseHttpCode() ) {
-			return json_decode( $response->getResponseBody() );
-		}
-	}
-
-	/**
-	 * Getting the response code, saved from latest request to Google
-	 *
-	 * @return mixed
-	 */
-	public function get_http_response_code() {
-		return $this->http_response_code;
-	}
-
-	/**
-	 * Clears the options and revokes the token
-	 */
-	public function clear_data() {
-		$this->revokeToken();
-		delete_option( $this->option_access_token );
-		delete_option( $this->option_refresh_token );
-	}
-
-	/**
-	 * Moves test options to live
-	 */
-	public function move_test_to_live() {
-		$new_option_access_token  = str_replace( 'test_', '', $this->option_access_token );
-		$new_option_refresh_token = str_replace( 'test_', '', $this->option_refresh_token );
-
-		update_option( $new_option_access_token,  get_option( $this->option_access_token,  '' ) );
-		update_option( $new_option_refresh_token, get_option( $this->option_refresh_token, '' ) );
-
-		delete_option( $this->option_access_token );
-		delete_option( $this->option_refresh_token );
-	}
-
-	/**
-	 * Check if user is authenticated
-	 *
-	 * @return bool
-	 */
-	public function is_authenticated() {
-		$has_refresh_token    = ( $this->get_refresh_token() !== '' );
-		$access_token_expired = $this->access_token_expired();
-
-		return $has_refresh_token && ! $access_token_expired;
-	}
-
-	/**
-	 * Initialize the config, will merge given config with default config to be sure all settings are available
-	 *
-	 * @param array $settings
-	 */
-	protected function init_config( array $google_config ) {
-
-		// Load MI io
-		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/class-ga-io.php';
-
-		// Load MI cache
-		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/class-ga-cache.php';
-
-		// Load MI logger
-		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/class-ga-logger.php';
-
-		$config = new MonsterInsights_GA_Lib_Config();
-
-		$config->setIoClass( 'MonsterInsights_GA_IO' );
-		$config->setCacheClass( 'MonsterInsights_GA_Cache' );
-		$config->setLoggerClass( 'MonsterInsights_GA_Logger' );
-
-		if ( ! empty( $google_config['application_name'] ) ) {
-			$config->setApplicationName( $google_config['application_name'] );
-		}
-
-		if ( ! empty( $google_config['client_id'] ) ) {
-			$config->setClientId( $google_config['client_id'] );
-		}
-
-		if ( ! empty( $google_config['client_secret'] ) ) {
-			$config->setClientSecret( $google_config['client_secret'] );
-		}
-
-		if ( ! empty( $google_config['redirect_uri'] ) ) {
-			$config->setRedirectUri( $google_config['redirect_uri'] );
-		}
-
-		return $config;
-	}
-
-	/**
-	 * Refreshing the tokens
-	 */
-	protected function refresh_tokens() {
-		if ( ( $refresh_token = $this->get_refresh_token() ) !== '' && $this->access_token_expired() ) {
-			try {
-				// Refresh the token.
-				$this->refreshToken( $refresh_token );
-
-				$response = $this->getAuth()->getAccessToken();
-				$response = json_decode( $response );
-
-				// Check response and if there is an access_token.
-				if ( ! empty( $response ) && ! empty ( $response->access_token ) ) {
-					$this->save_access_token( $response );
-				}
-			}
-			catch ( Exception $e ) {
-				return false;
-			}
-		}
-	}
-
-	/**
-	 * Save the refresh token
-	 *
-	 * @param string $refresh_token
-	 */
-	protected function save_refresh_token( $refresh_token ) {
-		update_option( $this->option_refresh_token, trim( $refresh_token ) );
-	}
-
-	/**
-	 * Return refresh token
-	 *
-	 * @return string
-	 */
-	protected function get_refresh_token() {
-		return get_option( $this->option_refresh_token, '' );
-	}
-
-
-	/**
-	 * Saving the access token as an option for further use till it expires.
-	 *
-	 * @param array $response
-	 */
-	protected function save_initial_access_token( $response ) {
-		update_option(
-			$this->option_access_token,
-			array(
-				'refresh_token' => $response->refresh_token,
-				'access_token'  => $response->access_token,
-				'expires'       => current_time( 'timestamp' ) + $response->expires_in,
-				'expires_in'    => $response->expires_in,
-				'created'       => $response->created,
-			)
-		);
-
-		try {
-			$this->setAccessToken( json_encode( $response ) );
-		} catch ( MonsterInsights_GA_Lib_Auth_Exception $exception ) {
-
-		}
-	}
-
-	/**
-	 * Saving the access token as an option for further use till it expires.
-	 *
-	 * @param array $response
-	 */
-	protected function save_access_token( $response ) {
-		update_option(
-			$this->option_access_token,
-			array(
-				'refresh_token' => $this->get_refresh_token(),
-				'access_token'  => $response->access_token,
-				'expires'       => current_time( 'timestamp' ) + $response->expires_in,
-				'expires_in'    => $response->expires_in,
-				'created'       => $response->created,
-			)
-		);
-
-		try {
-			$this->setAccessToken( json_encode( $response ) );
-		} catch ( MonsterInsights_GA_Lib_Auth_Exception $exception ) {
-
-		}
-	}
-
-	/**
-	 * Check if current access token is expired.
-	 *
-	 * @return bool
-	 */
-	private function access_token_expired() {
-		$access_token = $this->get_access_token();
-
-		if ( empty( $access_token ) || empty( $access_token['expires'] ) || current_time( 'timestamp' ) >= $access_token['expires'] ) {
-			return true;
-		}
-
-		try {
-			$this->setAccessToken( json_encode( $access_token ) );
-		} catch ( MonsterInsights_GA_Lib_Auth_Exception $exception ) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Getting the current access token from the options
-	 *
-	 * @return mixed
-	 */
-	public function get_access_token() {
-		return get_option( $this->option_access_token, array( 'access_token' => false, 'expires' => 0 ) );
-	}
+  /**
+   * @var string
+   */
+  protected $option_refresh_token;
+
+  /**
+   * @var string
+   */
+  protected $option_access_token;
+
+  /**
+   * @var string
+   */
+  protected $http_response_code;
+
+  /**
+   * @var string
+   */
+  public $client; // used for reporting purposes
+
+  /**
+   * Initialize the config and refresh the token
+   *
+   * @param array  $config
+   * @param string $option_prefix
+   */
+  public function __construct( $google_settings, $client_name ) {
+
+    // Initialize the config to set all properties properly.
+    $config = $this->init_config( $google_settings );
+
+    parent::__construct( $config );
+
+    $this->client = new MonsterInsights_GA_Lib_Client( $config );
+
+    if ( ! empty( $google_settings['scopes'] ) ) {
+      $this->setScopes( $google_settings['scopes'] );
+    }
+
+    $this->setAccessType( 'offline' );
+
+    // Client name will be `pro`, `lite`, or `support`
+    $this->option_refresh_token = 'monsterinsights_' . $client_name . '_refresh_token';
+    $this->option_access_token  = 'monsterinsights_' . $client_name . '_access_token';
+
+    // Let's get an access token if we've got a refresh token.
+    $this->refresh_tokens();
+  }
+
+  /**
+   * Authenticate the client. If $authorization_code is empty it will lead the user through the validation process of
+   * Google. If set it will be get the access token for current session and save the refresh_token for future use
+   *
+   * @param mixed $authorization_code
+   *
+   * @return bool
+   */
+  public function authenticate_client( $authorization_code = null ) {
+    static $has_retried;
+
+    // Authenticate client.
+    try {
+      $this->authenticate( $authorization_code );
+
+      // Get access response.
+      $response = $this->getAccessToken();
+
+      // Check if there is a response body.
+      if ( ! empty( $response ) ) {
+        $response = json_decode( $response );
+
+        if ( is_object( $response ) ) {
+          // Save the refresh token.
+          $this->save_refresh_token( $response->refresh_token );
+          $this->save_initial_access_token( $response );
+          return true;
+        }
+      }
+    } catch ( MonsterInsights_GA_Lib_Auth_Exception $exception ) {
+      // If there aren't any attempts before, try again and set attempts on true, to prevent further attempts.
+      if ( empty( $has_retried ) ) {
+        $has_retried = true;
+
+        return $this->authenticate_client( $authorization_code );
+      }
+      //error_log( $exception ); // @todo proper logging and handling of already used oauth token
+    }
+
+    return false;
+  }
+
+  /**
+   * Doing a request to the API
+   *
+   * @param string $target_request_url
+   * @param bool   $decode_response
+   * @param string $request_method
+   *
+   * @return array
+   */
+  public function do_request( $target_request_url, $decode_response = false, $request_method = 'GET', $body = array() ) {
+    // Get response.
+    $request  = new MonsterInsights_GA_Lib_Http_Request( $target_request_url, $request_method );
+    if ( ! empty( $body ) ) {
+      $request->setPostBody( $body ); // used exclusively for auth profiles
+    }
+
+    $response = $this->getAuth()->authenticatedRequest( $request );
+
+    // Storing the response code.
+    $this->http_response_code = $response->getResponseHttpCode();
+
+    if ( $decode_response ) {
+      return $this->decode_response( $response );
+    }
+
+    return $response;
+  }
+
+  /**
+   * Decode the JSON response
+   *
+   * @param object $response
+   * @param int    $accepted_response_code
+   *
+   * @return mixed
+   */
+  public function decode_response( $response, $accepted_response_code = 200 ) {
+    if ( $accepted_response_code === $response->getResponseHttpCode() ) {
+      return json_decode( $response->getResponseBody() );
+    }
+  }
+
+  /**
+   * Getting the response code, saved from latest request to Google
+   *
+   * @return mixed
+   */
+  public function get_http_response_code() {
+    return $this->http_response_code;
+  }
+
+  /**
+   * Clears the options and revokes the token
+   */
+  public function clear_data() {
+    $this->revokeToken();
+    delete_option( $this->option_access_token );
+    delete_option( $this->option_refresh_token );
+  }
+
+  /**
+   * Moves test options to live
+   */
+  public function move_test_to_live() {
+    $new_option_access_token  = str_replace( 'test_', '', $this->option_access_token );
+    $new_option_refresh_token = str_replace( 'test_', '', $this->option_refresh_token );
+
+    update_option( $new_option_access_token,  get_option( $this->option_access_token,  '' ) );
+    update_option( $new_option_refresh_token, get_option( $this->option_refresh_token, '' ) );
+
+    delete_option( $this->option_access_token );
+    delete_option( $this->option_refresh_token );
+  }
+
+  /**
+   * Check if user is authenticated
+   *
+   * @return bool
+   */
+  public function is_authenticated() {
+    $has_refresh_token    = ( $this->get_refresh_token() !== '' );
+    $access_token_expired = $this->access_token_expired();
+
+    return $has_refresh_token && ! $access_token_expired;
+  }
+
+  /**
+   * Initialize the config, will merge given config with default config to be sure all settings are available
+   *
+   * @param array $settings
+   */
+  protected function init_config( array $google_config ) {
+
+    // Load MI io
+    require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/class-ga-io.php';
+
+    // Load MI cache
+    require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/class-ga-cache.php';
+
+    // Load MI logger
+    require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/class-ga-logger.php';
+
+    $config = new MonsterInsights_GA_Lib_Config();
+
+    $config->setIoClass( 'MonsterInsights_GA_IO' );
+    $config->setCacheClass( 'MonsterInsights_GA_Cache' );
+    $config->setLoggerClass( 'MonsterInsights_GA_Logger' );
+
+    if ( ! empty( $google_config['application_name'] ) ) {
+      $config->setApplicationName( $google_config['application_name'] );
+    }
+
+    if ( ! empty( $google_config['client_id'] ) ) {
+      $config->setClientId( $google_config['client_id'] );
+    }
+
+    if ( ! empty( $google_config['client_secret'] ) ) {
+      $config->setClientSecret( $google_config['client_secret'] );
+    }
+
+    if ( ! empty( $google_config['redirect_uri'] ) ) {
+      $config->setRedirectUri( $google_config['redirect_uri'] );
+    }
+
+    return $config;
+  }
+
+  /**
+   * Refreshing the tokens
+   */
+  protected function refresh_tokens() {
+    if ( ( $refresh_token = $this->get_refresh_token() ) !== '' && $this->access_token_expired() ) {
+      try {
+        // Refresh the token.
+        $this->refreshToken( $refresh_token );
+
+        $response = $this->getAuth()->getAccessToken();
+        $response = json_decode( $response );
+
+        // Check response and if there is an access_token.
+        if ( ! empty( $response ) && ! empty ( $response->access_token ) ) {
+          $this->save_access_token( $response );
+        }
+      }
+      catch ( Exception $e ) {
+        return false;
+      }
+    }
+  }
+
+  /**
+   * Save the refresh token
+   *
+   * @param string $refresh_token
+   */
+  protected function save_refresh_token( $refresh_token ) {
+    update_option( $this->option_refresh_token, trim( $refresh_token ) );
+  }
+
+  /**
+   * Return refresh token
+   *
+   * @return string
+   */
+  protected function get_refresh_token() {
+    return get_option( $this->option_refresh_token, '' );
+  }
+
+
+  /**
+   * Saving the access token as an option for further use till it expires.
+   *
+   * @param array $response
+   */
+  protected function save_initial_access_token( $response ) {
+    update_option(
+      $this->option_access_token,
+      array(
+        'refresh_token' => $response->refresh_token,
+        'access_token'  => $response->access_token,
+        'expires'       => current_time( 'timestamp' ) + $response->expires_in,
+        'expires_in'    => $response->expires_in,
+        'created'       => $response->created,
+      )
+    );
+
+    try {
+      $this->setAccessToken( json_encode( $response ) );
+    } catch ( MonsterInsights_GA_Lib_Auth_Exception $exception ) {
+
+    }
+  }
+
+  /**
+   * Saving the access token as an option for further use till it expires.
+   *
+   * @param array $response
+   */
+  protected function save_access_token( $response ) {
+    update_option(
+      $this->option_access_token,
+      array(
+        'refresh_token' => $this->get_refresh_token(),
+        'access_token'  => $response->access_token,
+        'expires'       => current_time( 'timestamp' ) + $response->expires_in,
+        'expires_in'    => $response->expires_in,
+        'created'       => $response->created,
+      )
+    );
+
+    try {
+      $this->setAccessToken( json_encode( $response ) );
+    } catch ( MonsterInsights_GA_Lib_Auth_Exception $exception ) {
+
+    }
+  }
+
+  /**
+   * Check if current access token is expired.
+   *
+   * @return bool
+   */
+  private function access_token_expired() {
+    $access_token = $this->get_access_token();
+
+    if ( empty( $access_token ) || empty( $access_token['expires'] ) || current_time( 'timestamp' ) >= $access_token['expires'] ) {
+      return true;
+    }
+
+    try {
+      $this->setAccessToken( json_encode( $access_token ) );
+    } catch ( MonsterInsights_GA_Lib_Auth_Exception $exception ) {
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Getting the current access token from the options
+   *
+   * @return mixed
+   */
+  public function get_access_token() {
+    return get_option( $this->option_access_token, array( 'access_token' => false, 'expires' => 0 ) );
+  }
 
 }
\ No newline at end of file

Spacing +70 added lines, -70 removed lines

@@ -3,7 +3,7 @@ 
  * Class MonsterInsights_GA_Client
  */
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 class MonsterInsights_GA_Client extends MonsterInsights_GA_Lib_Client {
@@ -34,20 +34,20 @@ 
 	 * @param array  $config
 	 * @param string $option_prefix
 	 */
-	public function __construct( $google_settings, $client_name ) {
+	public function __construct($google_settings, $client_name) {
 
 		// Initialize the config to set all properties properly.
-		$config = $this->init_config( $google_settings );
+		$config = $this->init_config($google_settings);
 
-		parent::__construct( $config );
+		parent::__construct($config);
 
-		$this->client = new MonsterInsights_GA_Lib_Client( $config );
+		$this->client = new MonsterInsights_GA_Lib_Client($config);
 
-		if ( ! empty( $google_settings['scopes'] ) ) {
-			$this->setScopes( $google_settings['scopes'] );
+		if ( ! empty($google_settings['scopes'])) {
+			$this->setScopes($google_settings['scopes']);
 		}
 
-		$this->setAccessType( 'offline' );
+		$this->setAccessType('offline');
 
 		// Client name will be `pro`, `lite`, or `support`
 		$this->option_refresh_token = 'monsterinsights_' . $client_name . '_refresh_token';
@@ -65,33 +65,33 @@ 
 	 *
 	 * @return bool
 	 */
-	public function authenticate_client( $authorization_code = null ) {
+	public function authenticate_client($authorization_code = null) {
 		static $has_retried;
 
 		// Authenticate client.
 		try {
-			$this->authenticate( $authorization_code );
+			$this->authenticate($authorization_code);
 
 			// Get access response.
 			$response = $this->getAccessToken();
 
 			// Check if there is a response body.
-			if ( ! empty( $response ) ) {
-				$response = json_decode( $response );
+			if ( ! empty($response)) {
+				$response = json_decode($response);
 
-				if ( is_object( $response ) ) {
+				if (is_object($response)) {
 					// Save the refresh token.
-					$this->save_refresh_token( $response->refresh_token );
-					$this->save_initial_access_token( $response );
+					$this->save_refresh_token($response->refresh_token);
+					$this->save_initial_access_token($response);
 					return true;
 				}
 			}
-		} catch ( MonsterInsights_GA_Lib_Auth_Exception $exception ) {
+		} catch (MonsterInsights_GA_Lib_Auth_Exception $exception) {
 			// If there aren't any attempts before, try again and set attempts on true, to prevent further attempts.
-			if ( empty( $has_retried ) ) {
+			if (empty($has_retried)) {
 				$has_retried = true;
 
-				return $this->authenticate_client( $authorization_code );
+				return $this->authenticate_client($authorization_code);
 			}
 			//error_log( $exception ); // @todo proper logging and handling of already used oauth token
 		}
@@ -108,20 +108,20 @@ 
 	 *
 	 * @return array
 	 */
-	public function do_request( $target_request_url, $decode_response = false, $request_method = 'GET', $body = array() ) {
+	public function do_request($target_request_url, $decode_response = false, $request_method = 'GET', $body = array()) {
 		// Get response.
-		$request  = new MonsterInsights_GA_Lib_Http_Request( $target_request_url, $request_method );
-		if ( ! empty( $body ) ) {
-			$request->setPostBody( $body ); // used exclusively for auth profiles
+		$request = new MonsterInsights_GA_Lib_Http_Request($target_request_url, $request_method);
+		if ( ! empty($body)) {
+			$request->setPostBody($body); // used exclusively for auth profiles
 		}
 
-		$response = $this->getAuth()->authenticatedRequest( $request );
+		$response = $this->getAuth()->authenticatedRequest($request);
 
 		// Storing the response code.
 		$this->http_response_code = $response->getResponseHttpCode();
 
-		if ( $decode_response ) {
-			return $this->decode_response( $response );
+		if ($decode_response) {
+			return $this->decode_response($response);
 		}
 
 		return $response;
@@ -135,9 +135,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function decode_response( $response, $accepted_response_code = 200 ) {
-		if ( $accepted_response_code === $response->getResponseHttpCode() ) {
-			return json_decode( $response->getResponseBody() );
+	public function decode_response($response, $accepted_response_code = 200) {
+		if ($accepted_response_code === $response->getResponseHttpCode()) {
+			return json_decode($response->getResponseBody());
 		}
 	}
 
@@ -155,22 +155,22 @@ 
 	 */
 	public function clear_data() {
 		$this->revokeToken();
-		delete_option( $this->option_access_token );
-		delete_option( $this->option_refresh_token );
+		delete_option($this->option_access_token);
+		delete_option($this->option_refresh_token);
 	}
 
 	/**
 	 * Moves test options to live
 	 */
 	public function move_test_to_live() {
-		$new_option_access_token  = str_replace( 'test_', '', $this->option_access_token );
-		$new_option_refresh_token = str_replace( 'test_', '', $this->option_refresh_token );
+		$new_option_access_token  = str_replace('test_', '', $this->option_access_token);
+		$new_option_refresh_token = str_replace('test_', '', $this->option_refresh_token);
 
-		update_option( $new_option_access_token,  get_option( $this->option_access_token,  '' ) );
-		update_option( $new_option_refresh_token, get_option( $this->option_refresh_token, '' ) );
+		update_option($new_option_access_token, get_option($this->option_access_token, ''));
+		update_option($new_option_refresh_token, get_option($this->option_refresh_token, ''));
 
-		delete_option( $this->option_access_token );
-		delete_option( $this->option_refresh_token );
+		delete_option($this->option_access_token);
+		delete_option($this->option_refresh_token);
 	}
 
 	/**
@@ -179,7 +179,7 @@ 
 	 * @return bool
 	 */
 	public function is_authenticated() {
-		$has_refresh_token    = ( $this->get_refresh_token() !== '' );
+		$has_refresh_token    = ($this->get_refresh_token() !== '');
 		$access_token_expired = $this->access_token_expired();
 
 		return $has_refresh_token && ! $access_token_expired;
@@ -190,7 +190,7 @@ 
 	 *
 	 * @param array $settings
 	 */
-	protected function init_config( array $google_config ) {
+	protected function init_config(array $google_config) {
 
 		// Load MI io
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/google/class-ga-io.php';
@@ -203,24 +203,24 @@ 
 
 		$config = new MonsterInsights_GA_Lib_Config();
 
-		$config->setIoClass( 'MonsterInsights_GA_IO' );
-		$config->setCacheClass( 'MonsterInsights_GA_Cache' );
-		$config->setLoggerClass( 'MonsterInsights_GA_Logger' );
+		$config->setIoClass('MonsterInsights_GA_IO');
+		$config->setCacheClass('MonsterInsights_GA_Cache');
+		$config->setLoggerClass('MonsterInsights_GA_Logger');
 
-		if ( ! empty( $google_config['application_name'] ) ) {
-			$config->setApplicationName( $google_config['application_name'] );
+		if ( ! empty($google_config['application_name'])) {
+			$config->setApplicationName($google_config['application_name']);
 		}
 
-		if ( ! empty( $google_config['client_id'] ) ) {
-			$config->setClientId( $google_config['client_id'] );
+		if ( ! empty($google_config['client_id'])) {
+			$config->setClientId($google_config['client_id']);
 		}
 
-		if ( ! empty( $google_config['client_secret'] ) ) {
-			$config->setClientSecret( $google_config['client_secret'] );
+		if ( ! empty($google_config['client_secret'])) {
+			$config->setClientSecret($google_config['client_secret']);
 		}
 
-		if ( ! empty( $google_config['redirect_uri'] ) ) {
-			$config->setRedirectUri( $google_config['redirect_uri'] );
+		if ( ! empty($google_config['redirect_uri'])) {
+			$config->setRedirectUri($google_config['redirect_uri']);
 		}
 
 		return $config;
@@ -230,20 +230,20 @@ 
 	 * Refreshing the tokens
 	 */
 	protected function refresh_tokens() {
-		if ( ( $refresh_token = $this->get_refresh_token() ) !== '' && $this->access_token_expired() ) {
+		if (($refresh_token = $this->get_refresh_token()) !== '' && $this->access_token_expired()) {
 			try {
 				// Refresh the token.
-				$this->refreshToken( $refresh_token );
+				$this->refreshToken($refresh_token);
 
 				$response = $this->getAuth()->getAccessToken();
-				$response = json_decode( $response );
+				$response = json_decode($response);
 
 				// Check response and if there is an access_token.
-				if ( ! empty( $response ) && ! empty ( $response->access_token ) ) {
-					$this->save_access_token( $response );
+				if ( ! empty($response) && ! empty ($response->access_token)) {
+					$this->save_access_token($response);
 				}
 			}
-			catch ( Exception $e ) {
+			catch (Exception $e) {
 				return false;
 			}
 		}
@@ -254,8 +254,8 @@ 
 	 *
 	 * @param string $refresh_token
 	 */
-	protected function save_refresh_token( $refresh_token ) {
-		update_option( $this->option_refresh_token, trim( $refresh_token ) );
+	protected function save_refresh_token($refresh_token) {
+		update_option($this->option_refresh_token, trim($refresh_token));
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 * @return string
 	 */
 	protected function get_refresh_token() {
-		return get_option( $this->option_refresh_token, '' );
+		return get_option($this->option_refresh_token, '');
 	}
 
 
@@ -273,21 +273,21 @@ 
 	 *
 	 * @param array $response
 	 */
-	protected function save_initial_access_token( $response ) {
+	protected function save_initial_access_token($response) {
 		update_option(
 			$this->option_access_token,
 			array(
 				'refresh_token' => $response->refresh_token,
 				'access_token'  => $response->access_token,
-				'expires'       => current_time( 'timestamp' ) + $response->expires_in,
+				'expires'       => current_time('timestamp') + $response->expires_in,
 				'expires_in'    => $response->expires_in,
 				'created'       => $response->created,
 			)
 		);
 
 		try {
-			$this->setAccessToken( json_encode( $response ) );
-		} catch ( MonsterInsights_GA_Lib_Auth_Exception $exception ) {
+			$this->setAccessToken(json_encode($response));
+		} catch (MonsterInsights_GA_Lib_Auth_Exception $exception) {
 
 		}
 	}
@@ -297,21 +297,21 @@ 
 	 *
 	 * @param array $response
 	 */
-	protected function save_access_token( $response ) {
+	protected function save_access_token($response) {
 		update_option(
 			$this->option_access_token,
 			array(
 				'refresh_token' => $this->get_refresh_token(),
 				'access_token'  => $response->access_token,
-				'expires'       => current_time( 'timestamp' ) + $response->expires_in,
+				'expires'       => current_time('timestamp') + $response->expires_in,
 				'expires_in'    => $response->expires_in,
 				'created'       => $response->created,
 			)
 		);
 
 		try {
-			$this->setAccessToken( json_encode( $response ) );
-		} catch ( MonsterInsights_GA_Lib_Auth_Exception $exception ) {
+			$this->setAccessToken(json_encode($response));
+		} catch (MonsterInsights_GA_Lib_Auth_Exception $exception) {
 
 		}
 	}
@@ -324,13 +324,13 @@ 
 	private function access_token_expired() {
 		$access_token = $this->get_access_token();
 
-		if ( empty( $access_token ) || empty( $access_token['expires'] ) || current_time( 'timestamp' ) >= $access_token['expires'] ) {
+		if (empty($access_token) || empty($access_token['expires']) || current_time('timestamp') >= $access_token['expires']) {
 			return true;
 		}
 
 		try {
-			$this->setAccessToken( json_encode( $access_token ) );
-		} catch ( MonsterInsights_GA_Lib_Auth_Exception $exception ) {
+			$this->setAccessToken(json_encode($access_token));
+		} catch (MonsterInsights_GA_Lib_Auth_Exception $exception) {
 			return true;
 		}
 		return false;
@@ -342,7 +342,7 @@ 
 	 * @return mixed
 	 */
 	public function get_access_token() {
-		return get_option( $this->option_access_token, array( 'access_token' => false, 'expires' => 0 ) );
+		return get_option($this->option_access_token, array('access_token' => false, 'expires' => 0));
 	}
 
 }
\ No newline at end of file

Braces +1 added lines, -2 removed lines

@@ -242,8 +242,7 @@
 				if ( ! empty( $response ) && ! empty ( $response->access_token ) ) {
 					$this->save_access_token( $response );
 				}
-			}
-			catch ( Exception $e ) {
+			} catch ( Exception $e ) {
 				return false;
 			}
 		}