hybridauth / hybridauth

src/Provider/MicrosoftGraph.php

Indentation +123 added lines, -123 removed lines

@@ -43,127 +43,127 @@
  */
 class MicrosoftGraph extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'openid user.read contacts.read';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://graph.microsoft.com/v1.0/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://login.microsoftonline.com/common/oauth2/v2.0/token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developer.microsoft.com/en-us/graph/docs/concepts/php';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-
-        $tenant = $this->config->get('tenant');
-        if (!empty($tenant)) {
-            $adjustedEndpoints = [
-                'authorize_url' => str_replace('/common/', '/' . $tenant . '/', $this->authorizeUrl),
-                'access_token_url' => str_replace('/common/', '/' . $tenant . '/', $this->accessTokenUrl),
-            ];
-
-            $this->setApiEndpoints($adjustedEndpoints);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('me');
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new User\Profile();
-
-        $userProfile->identifier = $data->get('id');
-        $userProfile->displayName = $data->get('displayName');
-        $userProfile->firstName = $data->get('givenName');
-        $userProfile->lastName = $data->get('surname');
-        $userProfile->language = $data->get('preferredLanguage');
-
-        $userProfile->phone = $data->get('mobilePhone');
-        if (empty($userProfile->phone)) {
-            $businessPhones = $data->get('businessPhones');
-            if (isset($businessPhones[0])) {
-                $userProfile->phone = $businessPhones[0];
-            }
-        }
-
-        $userProfile->email = $data->get('mail');
-        if (empty($userProfile->email)) {
-            $email = $data->get('userPrincipalName');
-            if (strpos($email, '@') !== false) {
-                $userProfile->email = $email;
-            }
-        }
-
-        return $userProfile;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserContacts()
-    {
-        $apiUrl = 'me/contacts?$top=50';
-        $contacts = [];
-
-        do {
-            $response = $this->apiRequest($apiUrl);
-            $data = new Data\Collection($response);
-            if (!$data->exists('value')) {
-                throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-            }
-            foreach ($data->filter('value')->toArray() as $entry) {
-                $entry = new Data\Collection($entry);
-                $userContact = new User\Contact();
-                $userContact->identifier = $entry->get('id');
-                $userContact->displayName = $entry->get('displayName');
-                $emailAddresses = $entry->get('emailAddresses');
-                if (!empty($emailAddresses)) {
-                    $userContact->email = $emailAddresses[0]->address;
-                }
-                // only add to collection if we have usefull data
-                if (!empty($userContact->displayName) || !empty($userContact->email)) {
-                    $contacts[] = $userContact;
-                }
-            }
-
-            if ($data->exists('@odata.nextLink')) {
-                $apiUrl = $data->get('@odata.nextLink');
-
-                $pagedList = true;
-            } else {
-                $pagedList = false;
-            }
-        } while ($pagedList);
-
-        return $contacts;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'openid user.read contacts.read';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://graph.microsoft.com/v1.0/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://login.microsoftonline.com/common/oauth2/v2.0/token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developer.microsoft.com/en-us/graph/docs/concepts/php';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+
+		$tenant = $this->config->get('tenant');
+		if (!empty($tenant)) {
+			$adjustedEndpoints = [
+				'authorize_url' => str_replace('/common/', '/' . $tenant . '/', $this->authorizeUrl),
+				'access_token_url' => str_replace('/common/', '/' . $tenant . '/', $this->accessTokenUrl),
+			];
+
+			$this->setApiEndpoints($adjustedEndpoints);
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('me');
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new User\Profile();
+
+		$userProfile->identifier = $data->get('id');
+		$userProfile->displayName = $data->get('displayName');
+		$userProfile->firstName = $data->get('givenName');
+		$userProfile->lastName = $data->get('surname');
+		$userProfile->language = $data->get('preferredLanguage');
+
+		$userProfile->phone = $data->get('mobilePhone');
+		if (empty($userProfile->phone)) {
+			$businessPhones = $data->get('businessPhones');
+			if (isset($businessPhones[0])) {
+				$userProfile->phone = $businessPhones[0];
+			}
+		}
+
+		$userProfile->email = $data->get('mail');
+		if (empty($userProfile->email)) {
+			$email = $data->get('userPrincipalName');
+			if (strpos($email, '@') !== false) {
+				$userProfile->email = $email;
+			}
+		}
+
+		return $userProfile;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserContacts()
+	{
+		$apiUrl = 'me/contacts?$top=50';
+		$contacts = [];
+
+		do {
+			$response = $this->apiRequest($apiUrl);
+			$data = new Data\Collection($response);
+			if (!$data->exists('value')) {
+				throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+			}
+			foreach ($data->filter('value')->toArray() as $entry) {
+				$entry = new Data\Collection($entry);
+				$userContact = new User\Contact();
+				$userContact->identifier = $entry->get('id');
+				$userContact->displayName = $entry->get('displayName');
+				$emailAddresses = $entry->get('emailAddresses');
+				if (!empty($emailAddresses)) {
+					$userContact->email = $emailAddresses[0]->address;
+				}
+				// only add to collection if we have usefull data
+				if (!empty($userContact->displayName) || !empty($userContact->email)) {
+					$contacts[] = $userContact;
+				}
+			}
+
+			if ($data->exists('@odata.nextLink')) {
+				$apiUrl = $data->get('@odata.nextLink');
+
+				$pagedList = true;
+			} else {
+				$pagedList = false;
+			}
+		} while ($pagedList);
+
+		return $contacts;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -76,10 +76,10 @@ 
         parent::initialize();
 
         $tenant = $this->config->get('tenant');
-        if (!empty($tenant)) {
+        if ( ! empty($tenant)) {
             $adjustedEndpoints = [
-                'authorize_url' => str_replace('/common/', '/' . $tenant . '/', $this->authorizeUrl),
-                'access_token_url' => str_replace('/common/', '/' . $tenant . '/', $this->accessTokenUrl),
+                'authorize_url' => str_replace('/common/', '/'.$tenant.'/', $this->authorizeUrl),
+                'access_token_url' => str_replace('/common/', '/'.$tenant.'/', $this->accessTokenUrl),
             ];
 
             $this->setApiEndpoints($adjustedEndpoints);
@@ -95,7 +95,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('id')) {
+        if ( ! $data->exists('id')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -137,7 +137,7 @@ 
         do {
             $response = $this->apiRequest($apiUrl);
             $data = new Data\Collection($response);
-            if (!$data->exists('value')) {
+            if ( ! $data->exists('value')) {
                 throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
             }
             foreach ($data->filter('value')->toArray() as $entry) {
@@ -146,11 +146,11 @@ 
                 $userContact->identifier = $entry->get('id');
                 $userContact->displayName = $entry->get('displayName');
                 $emailAddresses = $entry->get('emailAddresses');
-                if (!empty($emailAddresses)) {
+                if ( ! empty($emailAddresses)) {
                     $userContact->email = $emailAddresses[0]->address;
                 }
                 // only add to collection if we have usefull data
-                if (!empty($userContact->displayName) || !empty($userContact->email)) {
+                if ( ! empty($userContact->displayName) || ! empty($userContact->email)) {
                     $contacts[] = $userContact;
                 }
             }

src/Provider/Apple.php

Indentation +225 added lines, -225 removed lines

@@ -60,229 +60,229 @@
  */
 class Apple extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'name email';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://appleid.apple.com/auth/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://appleid.apple.com/auth/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://appleid.apple.com/auth/token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developer.apple.com/documentation/sign_in_with_apple';
-
-    /**
-     * {@inheritdoc}
-     * The Sign in with Apple servers require percent encoding (or URL encoding)
-     * for its query parameters. If you are using the Sign in with Apple REST API,
-     * you must provide values with encoded spaces (`%20`) instead of plus (`+`) signs.
-     */
-    protected $AuthorizeUrlParametersEncType = PHP_QUERY_RFC3986;
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-        $this->AuthorizeUrlParameters['response_mode'] = 'form_post';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $keys = $this->config->get('keys');
-        $keys['secret'] = $this->getSecret();
-        $this->config->set('keys', $keys);
-        return parent::configure();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * include id_token $tokenNames
-     */
-    public function getAccessToken()
-    {
-        $tokenNames = [
-            'access_token',
-            'id_token',
-            'access_token_secret',
-            'token_type',
-            'refresh_token',
-            'expires_in',
-            'expires_at',
-        ];
-
-        $tokens = [];
-
-        foreach ($tokenNames as $name) {
-            if ($this->getStoredData($name)) {
-                $tokens[$name] = $this->getStoredData($name);
-            }
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function validateAccessTokenExchange($response)
-    {
-        $collection = parent::validateAccessTokenExchange($response);
-
-        $this->storeData('id_token', $collection->get('id_token'));
-
-        return $collection;
-    }
-
-    public function getUserProfile()
-    {
-        $id_token = $this->getStoredData('id_token');
-
-        $verifyTokenSignature =
-            ($this->config->exists('verifyTokenSignature')) ? $this->config->get('verifyTokenSignature') : true;
-
-        if (!$verifyTokenSignature) {
-            // payload extraction by https://github.com/omidborjian
-            // https://github.com/hybridauth/hybridauth/issues/1095#issuecomment-626479263
-            // JWT splits the string to 3 components 1) first is header 2) is payload 3) is signature
-            $payload = explode('.', $id_token)[1];
-            $payload = json_decode(base64_decode($payload));
-        } else {
-            // validate the token signature and get the payload
-            $publicKeys = $this->apiRequest('keys');
-
-            \Firebase\JWT\JWT::$leeway = 120;
-
-            $error = false;
-            $payload = null;
-
-            foreach ($publicKeys->keys as $publicKey) {
-                try {
-                    $rsa = new RSA();
-                    $jwk = (array)$publicKey;
-
-                    $rsa->loadKey(
-                        [
-                            'e' => new BigInteger(base64_decode($jwk['e']), 256),
-                            'n' => new BigInteger(base64_decode(strtr($jwk['n'], '-_', '+/'), true), 256)
-                        ]
-                    );
-                    $pem = $rsa->getPublicKey();
-
-                    $payload = JWT::decode($id_token, $pem, ['RS256']);
-                    break;
-                } catch (\Exception $e) {
-                    $error = $e->getMessage();
-                    if ($e instanceof \Firebase\JWT\ExpiredException) {
-                        break;
-                    }
-                }
-            }
-            if ($error) {
-                throw new \Exception($error);
-            }
-        }
-
-        $data = new Data\Collection($payload);
-
-        if (!$data->exists('sub')) {
-            throw new UnexpectedValueException('Missing token payload.');
-        }
-
-        $userProfile = new User\Profile();
-        $userProfile->identifier = $data->get('sub');
-        $userProfile->email = $data->get('email');
-        $this->storeData('expires_at', $data->get('exp'));
-
-        if (!empty($_REQUEST['user'])) {
-            $objUser = json_decode($_REQUEST['user']);
-            $user = new Data\Collection($objUser);
-            if (!$user->isEmpty()) {
-                $name = $user->get('name');
-                $userProfile->firstName = $name->firstName;
-                $userProfile->lastName = $name->lastName;
-                $userProfile->displayName = join(' ', [$userProfile->firstName, $userProfile->lastName]);
-            }
-        }
-
-        return $userProfile;
-    }
-
-    /**
-     * @return string secret token
-     */
-    private function getSecret()
-    {
-        // Your 10-character Team ID
-        if (!$team_id = $this->config->filter('keys')->get('team_id')) {
-            throw new InvalidApplicationCredentialsException(
-                'Missing parameter team_id: your team id is required to generate the JWS token.'
-            );
-        }
-
-        // Your Services ID, e.g. com.aaronparecki.services
-        if (!$client_id = $this->config->filter('keys')->get('id') ?: $this->config->filter('keys')->get('key')) {
-            throw new InvalidApplicationCredentialsException(
-                'Missing parameter id: your client id is required to generate the JWS token.'
-            );
-        }
-
-        // Find the 10-char Key ID value from the portal
-        if (!$key_id = $this->config->filter('keys')->get('key_id')) {
-            throw new InvalidApplicationCredentialsException(
-                'Missing parameter key_id: your key id is required to generate the JWS token.'
-            );
-        }
-
-        // Find the 10-char Key ID value from the portal
-        $key_content = $this->config->filter('keys')->get('key_content');
-
-        // Save your private key from Apple in a file called `key.txt`
-        if (!$key_content) {
-            if (!$key_file = $this->config->filter('keys')->get('key_file')) {
-                throw new InvalidApplicationCredentialsException(
-                    'Missing parameter key_content or key_file: your key is required to generate the JWS token.'
-                );
-            }
-
-            if (!file_exists($key_file)) {
-                throw new InvalidApplicationCredentialsException(
-                    "Your key file $key_file does not exist."
-                );
-            }
-
-            $key_content = file_get_contents($key_file);
-        }
-
-        $data = [
-            'iat' => time(),
-            'exp' => time() + 86400 * 180,
-            'iss' => $team_id,
-            'aud' => 'https://appleid.apple.com',
-            'sub' => $client_id
-        ];
-
-        $secret = JWT::encode($data, $key_content, 'ES256', $key_id);
-
-        return $secret;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'name email';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://appleid.apple.com/auth/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://appleid.apple.com/auth/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://appleid.apple.com/auth/token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developer.apple.com/documentation/sign_in_with_apple';
+
+	/**
+	 * {@inheritdoc}
+	 * The Sign in with Apple servers require percent encoding (or URL encoding)
+	 * for its query parameters. If you are using the Sign in with Apple REST API,
+	 * you must provide values with encoded spaces (`%20`) instead of plus (`+`) signs.
+	 */
+	protected $AuthorizeUrlParametersEncType = PHP_QUERY_RFC3986;
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+		$this->AuthorizeUrlParameters['response_mode'] = 'form_post';
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		$keys = $this->config->get('keys');
+		$keys['secret'] = $this->getSecret();
+		$this->config->set('keys', $keys);
+		return parent::configure();
+	}
+
+	/**
+	 * {@inheritdoc}
+	 *
+	 * include id_token $tokenNames
+	 */
+	public function getAccessToken()
+	{
+		$tokenNames = [
+			'access_token',
+			'id_token',
+			'access_token_secret',
+			'token_type',
+			'refresh_token',
+			'expires_in',
+			'expires_at',
+		];
+
+		$tokens = [];
+
+		foreach ($tokenNames as $name) {
+			if ($this->getStoredData($name)) {
+				$tokens[$name] = $this->getStoredData($name);
+			}
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function validateAccessTokenExchange($response)
+	{
+		$collection = parent::validateAccessTokenExchange($response);
+
+		$this->storeData('id_token', $collection->get('id_token'));
+
+		return $collection;
+	}
+
+	public function getUserProfile()
+	{
+		$id_token = $this->getStoredData('id_token');
+
+		$verifyTokenSignature =
+			($this->config->exists('verifyTokenSignature')) ? $this->config->get('verifyTokenSignature') : true;
+
+		if (!$verifyTokenSignature) {
+			// payload extraction by https://github.com/omidborjian
+			// https://github.com/hybridauth/hybridauth/issues/1095#issuecomment-626479263
+			// JWT splits the string to 3 components 1) first is header 2) is payload 3) is signature
+			$payload = explode('.', $id_token)[1];
+			$payload = json_decode(base64_decode($payload));
+		} else {
+			// validate the token signature and get the payload
+			$publicKeys = $this->apiRequest('keys');
+
+			\Firebase\JWT\JWT::$leeway = 120;
+
+			$error = false;
+			$payload = null;
+
+			foreach ($publicKeys->keys as $publicKey) {
+				try {
+					$rsa = new RSA();
+					$jwk = (array)$publicKey;
+
+					$rsa->loadKey(
+						[
+							'e' => new BigInteger(base64_decode($jwk['e']), 256),
+							'n' => new BigInteger(base64_decode(strtr($jwk['n'], '-_', '+/'), true), 256)
+						]
+					);
+					$pem = $rsa->getPublicKey();
+
+					$payload = JWT::decode($id_token, $pem, ['RS256']);
+					break;
+				} catch (\Exception $e) {
+					$error = $e->getMessage();
+					if ($e instanceof \Firebase\JWT\ExpiredException) {
+						break;
+					}
+				}
+			}
+			if ($error) {
+				throw new \Exception($error);
+			}
+		}
+
+		$data = new Data\Collection($payload);
+
+		if (!$data->exists('sub')) {
+			throw new UnexpectedValueException('Missing token payload.');
+		}
+
+		$userProfile = new User\Profile();
+		$userProfile->identifier = $data->get('sub');
+		$userProfile->email = $data->get('email');
+		$this->storeData('expires_at', $data->get('exp'));
+
+		if (!empty($_REQUEST['user'])) {
+			$objUser = json_decode($_REQUEST['user']);
+			$user = new Data\Collection($objUser);
+			if (!$user->isEmpty()) {
+				$name = $user->get('name');
+				$userProfile->firstName = $name->firstName;
+				$userProfile->lastName = $name->lastName;
+				$userProfile->displayName = join(' ', [$userProfile->firstName, $userProfile->lastName]);
+			}
+		}
+
+		return $userProfile;
+	}
+
+	/**
+	 * @return string secret token
+	 */
+	private function getSecret()
+	{
+		// Your 10-character Team ID
+		if (!$team_id = $this->config->filter('keys')->get('team_id')) {
+			throw new InvalidApplicationCredentialsException(
+				'Missing parameter team_id: your team id is required to generate the JWS token.'
+			);
+		}
+
+		// Your Services ID, e.g. com.aaronparecki.services
+		if (!$client_id = $this->config->filter('keys')->get('id') ?: $this->config->filter('keys')->get('key')) {
+			throw new InvalidApplicationCredentialsException(
+				'Missing parameter id: your client id is required to generate the JWS token.'
+			);
+		}
+
+		// Find the 10-char Key ID value from the portal
+		if (!$key_id = $this->config->filter('keys')->get('key_id')) {
+			throw new InvalidApplicationCredentialsException(
+				'Missing parameter key_id: your key id is required to generate the JWS token.'
+			);
+		}
+
+		// Find the 10-char Key ID value from the portal
+		$key_content = $this->config->filter('keys')->get('key_content');
+
+		// Save your private key from Apple in a file called `key.txt`
+		if (!$key_content) {
+			if (!$key_file = $this->config->filter('keys')->get('key_file')) {
+				throw new InvalidApplicationCredentialsException(
+					'Missing parameter key_content or key_file: your key is required to generate the JWS token.'
+				);
+			}
+
+			if (!file_exists($key_file)) {
+				throw new InvalidApplicationCredentialsException(
+					"Your key file $key_file does not exist."
+				);
+			}
+
+			$key_content = file_get_contents($key_file);
+		}
+
+		$data = [
+			'iat' => time(),
+			'exp' => time() + 86400 * 180,
+			'iss' => $team_id,
+			'aud' => 'https://appleid.apple.com',
+			'sub' => $client_id
+		];
+
+		$secret = JWT::encode($data, $key_content, 'ES256', $key_id);
+
+		return $secret;
+	}
 }

src/Provider/Facebook.php

Indentation +400 added lines, -400 removed lines

@@ -45,405 +45,405 @@
  */
 class Facebook extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'email, public_profile';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://graph.facebook.com/v8.0/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://www.facebook.com/dialog/oauth';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://graph.facebook.com/oauth/access_token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developers.facebook.com/docs/facebook-login/overview';
-
-    /**
-     * @var string Profile URL template as the fallback when no `link` returned from the API.
-     */
-    protected $profileUrlTemplate = 'https://www.facebook.com/%s';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-
-        // Require proof on all Facebook api calls
-        // https://developers.facebook.com/docs/graph-api/securing-requests#appsecret_proof
-        if ($accessToken = $this->getStoredData('access_token')) {
-            $this->apiRequestParameters['appsecret_proof'] = hash_hmac('sha256', $accessToken, $this->clientSecret);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function apiRequest($url, $method = 'GET', $parameters = [], $headers = [], $multipart = false)
-    {
-        // Handle token exchange prior to the standard handler for an API request
-        $exchange_by_expiry_days = $this->config->get('exchange_by_expiry_days') ?: 45;
-        if ($exchange_by_expiry_days !== null) {
-            $projected_timestamp = time() + 60 * 60 * 24 * $exchange_by_expiry_days;
-            if (!$this->hasAccessTokenExpired() && $this->hasAccessTokenExpired($projected_timestamp)) {
-                $this->exchangeAccessToken();
-            }
-        }
-
-        return parent::apiRequest($url, $method, $parameters, $headers, $multipart);
-    }
-
-    /**
-     * Exchange the Access Token with one that expires further in the future.
-     *
-     * @return string Raw Provider API response
-     * @throws \Hybridauth\Exception\HttpClientFailureException
-     * @throws \Hybridauth\Exception\HttpRequestFailedException
-     * @throws \Hybridauth\Exception\InvalidAccessTokenException
-     */
-    public function exchangeAccessToken()
-    {
-        $exchangeTokenParameters = [
-            'grant_type' => 'fb_exchange_token',
-            'client_id' => $this->clientId,
-            'client_secret' => $this->clientSecret,
-            'fb_exchange_token' => $this->getStoredData('access_token'),
-        ];
-
-        $response = $this->httpClient->request(
-            $this->accessTokenUrl,
-            'GET',
-            $exchangeTokenParameters
-        );
-
-        $this->validateApiResponse('Unable to exchange the access token');
-
-        $this->validateAccessTokenExchange($response);
-
-        return $response;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $fields = [
-            'id',
-            'name',
-            'first_name',
-            'last_name',
-            'website',
-            'locale',
-            'about',
-            'email',
-            'hometown',
-            'birthday',
-        ];
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'email, public_profile';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://graph.facebook.com/v8.0/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://www.facebook.com/dialog/oauth';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://graph.facebook.com/oauth/access_token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developers.facebook.com/docs/facebook-login/overview';
+
+	/**
+	 * @var string Profile URL template as the fallback when no `link` returned from the API.
+	 */
+	protected $profileUrlTemplate = 'https://www.facebook.com/%s';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+
+		// Require proof on all Facebook api calls
+		// https://developers.facebook.com/docs/graph-api/securing-requests#appsecret_proof
+		if ($accessToken = $this->getStoredData('access_token')) {
+			$this->apiRequestParameters['appsecret_proof'] = hash_hmac('sha256', $accessToken, $this->clientSecret);
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function apiRequest($url, $method = 'GET', $parameters = [], $headers = [], $multipart = false)
+	{
+		// Handle token exchange prior to the standard handler for an API request
+		$exchange_by_expiry_days = $this->config->get('exchange_by_expiry_days') ?: 45;
+		if ($exchange_by_expiry_days !== null) {
+			$projected_timestamp = time() + 60 * 60 * 24 * $exchange_by_expiry_days;
+			if (!$this->hasAccessTokenExpired() && $this->hasAccessTokenExpired($projected_timestamp)) {
+				$this->exchangeAccessToken();
+			}
+		}
+
+		return parent::apiRequest($url, $method, $parameters, $headers, $multipart);
+	}
+
+	/**
+	 * Exchange the Access Token with one that expires further in the future.
+	 *
+	 * @return string Raw Provider API response
+	 * @throws \Hybridauth\Exception\HttpClientFailureException
+	 * @throws \Hybridauth\Exception\HttpRequestFailedException
+	 * @throws \Hybridauth\Exception\InvalidAccessTokenException
+	 */
+	public function exchangeAccessToken()
+	{
+		$exchangeTokenParameters = [
+			'grant_type' => 'fb_exchange_token',
+			'client_id' => $this->clientId,
+			'client_secret' => $this->clientSecret,
+			'fb_exchange_token' => $this->getStoredData('access_token'),
+		];
+
+		$response = $this->httpClient->request(
+			$this->accessTokenUrl,
+			'GET',
+			$exchangeTokenParameters
+		);
+
+		$this->validateApiResponse('Unable to exchange the access token');
+
+		$this->validateAccessTokenExchange($response);
+
+		return $response;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$fields = [
+			'id',
+			'name',
+			'first_name',
+			'last_name',
+			'website',
+			'locale',
+			'about',
+			'email',
+			'hometown',
+			'birthday',
+		];
         
-        if (strpos($this->scope, 'user_link') !== false) {
-            $fields[] = 'link';
-        }
-
-        if (strpos($this->scope, 'user_gender') !== false) {
-            $fields[] = 'gender';
-        }
-
-        // Note that en_US is needed for gender fields to match convention.
-        $locale = $this->config->get('locale') ?: 'en_US';
-        $response = $this->apiRequest('me', 'GET', [
-            'fields' => implode(',', $fields),
-            'locale' => $locale,
-        ]);
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new User\Profile();
-
-        $userProfile->identifier = $data->get('id');
-        $userProfile->displayName = $data->get('name');
-        $userProfile->firstName = $data->get('first_name');
-        $userProfile->lastName = $data->get('last_name');
-        $userProfile->profileURL = $data->get('link');
-        $userProfile->webSiteURL = $data->get('website');
-        $userProfile->gender = $data->get('gender');
-        $userProfile->language = $data->get('locale');
-        $userProfile->description = $data->get('about');
-        $userProfile->email = $data->get('email');
-
-        // Fallback for profile URL in case Facebook does not provide "pretty" link with username (if user set it).
-        if (empty($userProfile->profileURL)) {
-            $userProfile->profileURL = $this->getProfileUrl($userProfile->identifier);
-        }
-
-        $userProfile->region = $data->filter('hometown')->get('name');
-
-        $photoSize = $this->config->get('photo_size') ?: '150';
-
-        $userProfile->photoURL = $this->apiBaseUrl . $userProfile->identifier;
-        $userProfile->photoURL .= '/picture?width=' . $photoSize . '&height=' . $photoSize;
-
-        $userProfile->emailVerified = $userProfile->email;
-
-        $userProfile = $this->fetchUserRegion($userProfile);
-
-        $userProfile = $this->fetchBirthday($userProfile, $data->get('birthday'));
-
-        return $userProfile;
-    }
-
-    /**
-     * Retrieve the user region.
-     *
-     * @param User\Profile $userProfile
-     *
-     * @return \Hybridauth\User\Profile
-     */
-    protected function fetchUserRegion(User\Profile $userProfile)
-    {
-        if (!empty($userProfile->region)) {
-            $regionArr = explode(',', $userProfile->region);
-
-            if (count($regionArr) > 1) {
-                $userProfile->city = trim($regionArr[0]);
-                $userProfile->country = trim($regionArr[1]);
-            }
-        }
-
-        return $userProfile;
-    }
-
-    /**
-     * Retrieve the user birthday.
-     *
-     * @param User\Profile $userProfile
-     * @param string $birthday
-     *
-     * @return \Hybridauth\User\Profile
-     */
-    protected function fetchBirthday(User\Profile $userProfile, $birthday)
-    {
-        $result = (new Data\Parser())->parseBirthday($birthday, '/');
-
-        $userProfile->birthYear = (int)$result[0];
-        $userProfile->birthMonth = (int)$result[1];
-        $userProfile->birthDay = (int)$result[2];
-
-        return $userProfile;
-    }
-
-    /**
-     * /v2.0/me/friends only returns the user's friends who also use the app.
-     * In the cases where you want to let people tag their friends in stories published by your app,
-     * you can use the Taggable Friends API.
-     *
-     * https://developers.facebook.com/docs/apps/faq#unable_full_friend_list
-     */
-    public function getUserContacts()
-    {
-        $contacts = [];
-
-        $apiUrl = 'me/friends?fields=link,name';
-
-        do {
-            $response = $this->apiRequest($apiUrl);
-
-            $data = new Data\Collection($response);
-
-            if (!$data->exists('data')) {
-                throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-            }
-
-            if (!$data->filter('data')->isEmpty()) {
-                foreach ($data->filter('data')->toArray() as $item) {
-                    $contacts[] = $this->fetchUserContact($item);
-                }
-            }
-
-            if ($data->filter('paging')->exists('next')) {
-                $apiUrl = $data->filter('paging')->get('next');
-
-                $pagedList = true;
-            } else {
-                $pagedList = false;
-            }
-        } while ($pagedList);
-
-        return $contacts;
-    }
-
-    /**
-     * Parse the user contact.
-     *
-     * @param array $item
-     *
-     * @return \Hybridauth\User\Contact
-     */
-    protected function fetchUserContact($item)
-    {
-        $userContact = new User\Contact();
-
-        $item = new Data\Collection($item);
-
-        $userContact->identifier = $item->get('id');
-        $userContact->displayName = $item->get('name');
-
-        $userContact->profileURL = $item->exists('link')
-            ?: $this->getProfileUrl($userContact->identifier);
-
-        $userContact->photoURL = $this->apiBaseUrl . $userContact->identifier . '/picture?width=150&height=150';
-
-        return $userContact;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setPageStatus($status, $pageId)
-    {
-        $status = is_string($status) ? ['message' => $status] : $status;
-
-        // Post on user wall.
-        if ($pageId === 'me') {
-            return $this->setUserStatus($status);
-        }
-
-        // Retrieve writable user pages and filter by given one.
-        $pages = $this->getUserPages(true);
-        $pages = array_filter($pages, function ($page) use ($pageId) {
-            return $page->id == $pageId;
-        });
-
-        if (!$pages) {
-            throw new InvalidArgumentException('Could not find a page with given id.');
-        }
-
-        $page = reset($pages);
-
-        // Use page access token instead of user access token.
-        $headers = [
-            'Authorization' => 'Bearer ' . $page->access_token,
-        ];
-
-        // Refresh proof for API call.
-        $parameters = $status + [
-                'appsecret_proof' => hash_hmac('sha256', $page->access_token, $this->clientSecret),
-            ];
-
-        $response = $this->apiRequest("{$pageId}/feed", 'POST', $parameters, $headers);
-
-        return $response;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserPages($writable = false)
-    {
-        $pages = $this->apiRequest('me/accounts');
-
-        if (!$writable) {
-            return $pages->data;
-        }
-
-        // Filter user pages by CREATE_CONTENT permission.
-        return array_filter($pages->data, function ($page) {
-            return in_array('CREATE_CONTENT', $page->tasks);
-        });
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserActivity($stream = 'me')
-    {
-        $apiUrl = $stream == 'me' ? 'me/feed' : 'me/home';
-
-        $response = $this->apiRequest($apiUrl);
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('data')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $activities = [];
-
-        foreach ($data->filter('data')->toArray() as $item) {
-            $activities[] = $this->fetchUserActivity($item);
-        }
-
-        return $activities;
-    }
-
-    /**
-     * @param $item
-     *
-     * @return User\Activity
-     */
-    protected function fetchUserActivity($item)
-    {
-        $userActivity = new User\Activity();
-
-        $item = new Data\Collection($item);
-
-        $userActivity->id = $item->get('id');
-        $userActivity->date = $item->get('created_time');
-
-        if ('video' == $item->get('type') || 'link' == $item->get('type')) {
-            $userActivity->text = $item->get('link');
-        }
-
-        if (empty($userActivity->text) && $item->exists('story')) {
-            $userActivity->text = $item->get('link');
-        }
-
-        if (empty($userActivity->text) && $item->exists('message')) {
-            $userActivity->text = $item->get('message');
-        }
-
-        if (!empty($userActivity->text) && $item->exists('from')) {
-            $userActivity->user->identifier = $item->filter('from')->get('id');
-            $userActivity->user->displayName = $item->filter('from')->get('name');
-
-            $userActivity->user->profileURL = $this->getProfileUrl($userActivity->user->identifier);
-
-            $userActivity->user->photoURL = $this->apiBaseUrl . $userActivity->user->identifier;
-            $userActivity->user->photoURL .= '/picture?width=150&height=150';
-        }
-
-        return $userActivity;
-    }
-
-    /**
-     * Get profile URL.
-     *
-     * @param int $identity User ID.
-     * @return string|null NULL when identity is not provided.
-     */
-    protected function getProfileUrl($identity)
-    {
-        if (!is_numeric($identity)) {
-            return null;
-        }
-
-        return sprintf($this->profileUrlTemplate, $identity);
-    }
+		if (strpos($this->scope, 'user_link') !== false) {
+			$fields[] = 'link';
+		}
+
+		if (strpos($this->scope, 'user_gender') !== false) {
+			$fields[] = 'gender';
+		}
+
+		// Note that en_US is needed for gender fields to match convention.
+		$locale = $this->config->get('locale') ?: 'en_US';
+		$response = $this->apiRequest('me', 'GET', [
+			'fields' => implode(',', $fields),
+			'locale' => $locale,
+		]);
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new User\Profile();
+
+		$userProfile->identifier = $data->get('id');
+		$userProfile->displayName = $data->get('name');
+		$userProfile->firstName = $data->get('first_name');
+		$userProfile->lastName = $data->get('last_name');
+		$userProfile->profileURL = $data->get('link');
+		$userProfile->webSiteURL = $data->get('website');
+		$userProfile->gender = $data->get('gender');
+		$userProfile->language = $data->get('locale');
+		$userProfile->description = $data->get('about');
+		$userProfile->email = $data->get('email');
+
+		// Fallback for profile URL in case Facebook does not provide "pretty" link with username (if user set it).
+		if (empty($userProfile->profileURL)) {
+			$userProfile->profileURL = $this->getProfileUrl($userProfile->identifier);
+		}
+
+		$userProfile->region = $data->filter('hometown')->get('name');
+
+		$photoSize = $this->config->get('photo_size') ?: '150';
+
+		$userProfile->photoURL = $this->apiBaseUrl . $userProfile->identifier;
+		$userProfile->photoURL .= '/picture?width=' . $photoSize . '&height=' . $photoSize;
+
+		$userProfile->emailVerified = $userProfile->email;
+
+		$userProfile = $this->fetchUserRegion($userProfile);
+
+		$userProfile = $this->fetchBirthday($userProfile, $data->get('birthday'));
+
+		return $userProfile;
+	}
+
+	/**
+	 * Retrieve the user region.
+	 *
+	 * @param User\Profile $userProfile
+	 *
+	 * @return \Hybridauth\User\Profile
+	 */
+	protected function fetchUserRegion(User\Profile $userProfile)
+	{
+		if (!empty($userProfile->region)) {
+			$regionArr = explode(',', $userProfile->region);
+
+			if (count($regionArr) > 1) {
+				$userProfile->city = trim($regionArr[0]);
+				$userProfile->country = trim($regionArr[1]);
+			}
+		}
+
+		return $userProfile;
+	}
+
+	/**
+	 * Retrieve the user birthday.
+	 *
+	 * @param User\Profile $userProfile
+	 * @param string $birthday
+	 *
+	 * @return \Hybridauth\User\Profile
+	 */
+	protected function fetchBirthday(User\Profile $userProfile, $birthday)
+	{
+		$result = (new Data\Parser())->parseBirthday($birthday, '/');
+
+		$userProfile->birthYear = (int)$result[0];
+		$userProfile->birthMonth = (int)$result[1];
+		$userProfile->birthDay = (int)$result[2];
+
+		return $userProfile;
+	}
+
+	/**
+	 * /v2.0/me/friends only returns the user's friends who also use the app.
+	 * In the cases where you want to let people tag their friends in stories published by your app,
+	 * you can use the Taggable Friends API.
+	 *
+	 * https://developers.facebook.com/docs/apps/faq#unable_full_friend_list
+	 */
+	public function getUserContacts()
+	{
+		$contacts = [];
+
+		$apiUrl = 'me/friends?fields=link,name';
+
+		do {
+			$response = $this->apiRequest($apiUrl);
+
+			$data = new Data\Collection($response);
+
+			if (!$data->exists('data')) {
+				throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+			}
+
+			if (!$data->filter('data')->isEmpty()) {
+				foreach ($data->filter('data')->toArray() as $item) {
+					$contacts[] = $this->fetchUserContact($item);
+				}
+			}
+
+			if ($data->filter('paging')->exists('next')) {
+				$apiUrl = $data->filter('paging')->get('next');
+
+				$pagedList = true;
+			} else {
+				$pagedList = false;
+			}
+		} while ($pagedList);
+
+		return $contacts;
+	}
+
+	/**
+	 * Parse the user contact.
+	 *
+	 * @param array $item
+	 *
+	 * @return \Hybridauth\User\Contact
+	 */
+	protected function fetchUserContact($item)
+	{
+		$userContact = new User\Contact();
+
+		$item = new Data\Collection($item);
+
+		$userContact->identifier = $item->get('id');
+		$userContact->displayName = $item->get('name');
+
+		$userContact->profileURL = $item->exists('link')
+			?: $this->getProfileUrl($userContact->identifier);
+
+		$userContact->photoURL = $this->apiBaseUrl . $userContact->identifier . '/picture?width=150&height=150';
+
+		return $userContact;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function setPageStatus($status, $pageId)
+	{
+		$status = is_string($status) ? ['message' => $status] : $status;
+
+		// Post on user wall.
+		if ($pageId === 'me') {
+			return $this->setUserStatus($status);
+		}
+
+		// Retrieve writable user pages and filter by given one.
+		$pages = $this->getUserPages(true);
+		$pages = array_filter($pages, function ($page) use ($pageId) {
+			return $page->id == $pageId;
+		});
+
+		if (!$pages) {
+			throw new InvalidArgumentException('Could not find a page with given id.');
+		}
+
+		$page = reset($pages);
+
+		// Use page access token instead of user access token.
+		$headers = [
+			'Authorization' => 'Bearer ' . $page->access_token,
+		];
+
+		// Refresh proof for API call.
+		$parameters = $status + [
+				'appsecret_proof' => hash_hmac('sha256', $page->access_token, $this->clientSecret),
+			];
+
+		$response = $this->apiRequest("{$pageId}/feed", 'POST', $parameters, $headers);
+
+		return $response;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserPages($writable = false)
+	{
+		$pages = $this->apiRequest('me/accounts');
+
+		if (!$writable) {
+			return $pages->data;
+		}
+
+		// Filter user pages by CREATE_CONTENT permission.
+		return array_filter($pages->data, function ($page) {
+			return in_array('CREATE_CONTENT', $page->tasks);
+		});
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserActivity($stream = 'me')
+	{
+		$apiUrl = $stream == 'me' ? 'me/feed' : 'me/home';
+
+		$response = $this->apiRequest($apiUrl);
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('data')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$activities = [];
+
+		foreach ($data->filter('data')->toArray() as $item) {
+			$activities[] = $this->fetchUserActivity($item);
+		}
+
+		return $activities;
+	}
+
+	/**
+	 * @param $item
+	 *
+	 * @return User\Activity
+	 */
+	protected function fetchUserActivity($item)
+	{
+		$userActivity = new User\Activity();
+
+		$item = new Data\Collection($item);
+
+		$userActivity->id = $item->get('id');
+		$userActivity->date = $item->get('created_time');
+
+		if ('video' == $item->get('type') || 'link' == $item->get('type')) {
+			$userActivity->text = $item->get('link');
+		}
+
+		if (empty($userActivity->text) && $item->exists('story')) {
+			$userActivity->text = $item->get('link');
+		}
+
+		if (empty($userActivity->text) && $item->exists('message')) {
+			$userActivity->text = $item->get('message');
+		}
+
+		if (!empty($userActivity->text) && $item->exists('from')) {
+			$userActivity->user->identifier = $item->filter('from')->get('id');
+			$userActivity->user->displayName = $item->filter('from')->get('name');
+
+			$userActivity->user->profileURL = $this->getProfileUrl($userActivity->user->identifier);
+
+			$userActivity->user->photoURL = $this->apiBaseUrl . $userActivity->user->identifier;
+			$userActivity->user->photoURL .= '/picture?width=150&height=150';
+		}
+
+		return $userActivity;
+	}
+
+	/**
+	 * Get profile URL.
+	 *
+	 * @param int $identity User ID.
+	 * @return string|null NULL when identity is not provided.
+	 */
+	protected function getProfileUrl($identity)
+	{
+		if (!is_numeric($identity)) {
+			return null;
+		}
+
+		return sprintf($this->profileUrlTemplate, $identity);
+	}
 }

src/Provider/WeChat.php

Indentation +115 added lines, -115 removed lines

@@ -17,119 +17,119 @@
  */
 class WeChat extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'snsapi_login,snsapi_userinfo,scope.userInfo';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://api.wechat.com/sns/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://open.weixin.qq.com/connect/qrconnect';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://api.wechat.com/sns/oauth2/access_token';
-
-    /**
-     * Refresh Token Endpoint
-     * @var string
-     */
-    protected $tokenRefreshUrl = 'https://api.wechat.com/sns/oauth2/refresh_token';
-
-    /**
-     * {@ịnheritdoc}
-     */
-    protected $accessTokenInfoUrl = 'https://api.wechat.com/sns/auth';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $tokenExchangeMethod = 'GET';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $tokenRefreshMethod = 'GET';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = ''; // Not available
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-
-        $this->AuthorizeUrlParameters += [
-            'appid' => $this->clientId
-        ];
-        unset($this->AuthorizeUrlParameters['client_id']);
-
-        $this->tokenExchangeParameters += [
-            'appid' => $this->clientId,
-            'secret' => $this->clientSecret
-        ];
-        unset($this->tokenExchangeParameters['client_id']);
-        unset($this->tokenExchangeParameters['client_secret']);
-
-        $this->tokenRefreshParameters += [
-            'appid' => $this->clientId
-        ];
-
-        $this->apiRequestParameters = [
-            'appid' => $this->clientId,
-            'secret' => $this->clientSecret
-        ];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function validateAccessTokenExchange($response)
-    {
-        $collection = parent::validateAccessTokenExchange($response);
-
-        $this->storeData('openid', $collection->get('openid'));
-        $this->storeData('access_token', $collection->get('access_token'));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $openid = $this->getStoredData('openid');
-        $access_token = $this->getStoredData('access_token');
-
-        $response = $this->apiRequest('userinfo', 'GET', ['openid' => $openid, 'access_token' => $access_token]);
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('openid')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new User\Profile();
-
-        $userProfile->identifier = $data->get('openid');
-        $userProfile->displayName = $data->get('nickname');
-        $userProfile->photoURL = $data->get('headimgurl');
-        $userProfile->city = $data->get('city');
-        $userProfile->region = $data->get('province');
-        $userProfile->country = $data->get('country');
-        $genders = ['', 'male', 'female'];
-        $userProfile->gender = $genders[(int)$data->get('sex')];
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'snsapi_login,snsapi_userinfo,scope.userInfo';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://api.wechat.com/sns/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://open.weixin.qq.com/connect/qrconnect';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://api.wechat.com/sns/oauth2/access_token';
+
+	/**
+	 * Refresh Token Endpoint
+	 * @var string
+	 */
+	protected $tokenRefreshUrl = 'https://api.wechat.com/sns/oauth2/refresh_token';
+
+	/**
+	 * {@ịnheritdoc}
+	 */
+	protected $accessTokenInfoUrl = 'https://api.wechat.com/sns/auth';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $tokenExchangeMethod = 'GET';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $tokenRefreshMethod = 'GET';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = ''; // Not available
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+
+		$this->AuthorizeUrlParameters += [
+			'appid' => $this->clientId
+		];
+		unset($this->AuthorizeUrlParameters['client_id']);
+
+		$this->tokenExchangeParameters += [
+			'appid' => $this->clientId,
+			'secret' => $this->clientSecret
+		];
+		unset($this->tokenExchangeParameters['client_id']);
+		unset($this->tokenExchangeParameters['client_secret']);
+
+		$this->tokenRefreshParameters += [
+			'appid' => $this->clientId
+		];
+
+		$this->apiRequestParameters = [
+			'appid' => $this->clientId,
+			'secret' => $this->clientSecret
+		];
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function validateAccessTokenExchange($response)
+	{
+		$collection = parent::validateAccessTokenExchange($response);
+
+		$this->storeData('openid', $collection->get('openid'));
+		$this->storeData('access_token', $collection->get('access_token'));
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$openid = $this->getStoredData('openid');
+		$access_token = $this->getStoredData('access_token');
+
+		$response = $this->apiRequest('userinfo', 'GET', ['openid' => $openid, 'access_token' => $access_token]);
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('openid')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new User\Profile();
+
+		$userProfile->identifier = $data->get('openid');
+		$userProfile->displayName = $data->get('nickname');
+		$userProfile->photoURL = $data->get('headimgurl');
+		$userProfile->city = $data->get('city');
+		$userProfile->region = $data->get('province');
+		$userProfile->country = $data->get('country');
+		$genders = ['', 'male', 'female'];
+		$userProfile->gender = $genders[(int)$data->get('sex')];
+
+		return $userProfile;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -115,7 +115,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('openid')) {
+        if ( ! $data->exists('openid')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -128,7 +128,7 @@ 
         $userProfile->region = $data->get('province');
         $userProfile->country = $data->get('country');
         $genders = ['', 'male', 'female'];
-        $userProfile->gender = $genders[(int)$data->get('sex')];
+        $userProfile->gender = $genders[(int) $data->get('sex')];
 
         return $userProfile;
     }

src/Provider/Telegram.php

Indentation +164 added lines, -164 removed lines

@@ -44,143 +44,143 @@ 
  */
 class Telegram extends AbstractAdapter implements AdapterInterface
 {
-    protected $botId = '';
-
-    protected $botSecret = '';
-
-    protected $callbackUrl = '';
-
-    /**
-     * IPD API Documentation
-     *
-     * OPTIONAL.
-     *
-     * @var string
-     */
-    protected $apiDocumentation = 'https://core.telegram.org/bots';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        $this->botId = $this->config->filter('keys')->get('id');
-        $this->botSecret = $this->config->filter('keys')->get('secret');
-        $this->callbackUrl = $this->config->get('callback');
-
-        if (!$this->botId || !$this->botSecret) {
-            throw new InvalidApplicationCredentialsException(
-                'Your application id is required in order to connect to ' . $this->providerId
-            );
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function authenticate()
-    {
-        $this->logger->info(sprintf('%s::authenticate()', get_class($this)));
-        if (!filter_input(INPUT_GET, 'hash')) {
-            $this->authenticateBegin();
-        } else {
-            $this->authenticateCheckError();
-            $this->authenticateFinish();
-        }
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isConnected()
-    {
-        $authData = $this->getStoredData('auth_data');
-        return !empty($authData);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $data = new Collection($this->getStoredData('auth_data'));
-
-        if (!$data->exists('id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new Profile();
-
-        $userProfile->identifier = $data->get('id');
-        $userProfile->firstName = $data->get('first_name');
-        $userProfile->lastName = $data->get('last_name');
-        $userProfile->displayName = $data->get('username');
-        $userProfile->photoURL = $data->get('photo_url');
-        $username = $data->get('username');
-        if (!empty($username)) {
-            // Only some accounts have usernames.
-            $userProfile->profileURL = "https://t.me/{$username}";
-        }
-
-        return $userProfile;
-    }
-
-    /**
-     * See: https://telegram.im/widget-login.php
-     * See: https://gist.github.com/anonymous/6516521b1fb3b464534fbc30ea3573c2
-     */
-    protected function authenticateCheckError()
-    {
-        $auth_data = $this->parseAuthData();
-
-        $check_hash = $auth_data['hash'];
-        unset($auth_data['hash']);
-        $data_check_arr = [];
-
-        foreach ($auth_data as $key => $value) {
-            if (!empty($value)) {
-                $data_check_arr[] = $key . '=' . $value;
-            }
-        }
-        sort($data_check_arr);
-
-        $data_check_string = implode("\n", $data_check_arr);
-        $secret_key = hash('sha256', $this->botSecret, true);
-        $hash = hash_hmac('sha256', $data_check_string, $secret_key);
-
-        if (strcmp($hash, $check_hash) !== 0) {
-            throw new InvalidAuthorizationCodeException(
-                sprintf('Provider returned an error: %s', 'Data is NOT from Telegram')
-            );
-        }
-
-        if ((time() - $auth_data['auth_date']) > 86400) {
-            throw new InvalidAuthorizationCodeException(
-                sprintf('Provider returned an error: %s', 'Data is outdated')
-            );
-        }
-    }
-
-    /**
-     * See: https://telegram.im/widget-login.php
-     */
-    protected function authenticateBegin()
-    {
-        $this->logger->debug(sprintf('%s::authenticateBegin(), redirecting user to:', get_class($this)));
-
-        $nonce = $this->config->get('nonce');
-        $nonce_code = empty($nonce) ? '' : "nonce=\"{$nonce}\"";
-
-        exit(
-            <<<HTML
+	protected $botId = '';
+
+	protected $botSecret = '';
+
+	protected $callbackUrl = '';
+
+	/**
+	 * IPD API Documentation
+	 *
+	 * OPTIONAL.
+	 *
+	 * @var string
+	 */
+	protected $apiDocumentation = 'https://core.telegram.org/bots';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		$this->botId = $this->config->filter('keys')->get('id');
+		$this->botSecret = $this->config->filter('keys')->get('secret');
+		$this->callbackUrl = $this->config->get('callback');
+
+		if (!$this->botId || !$this->botSecret) {
+			throw new InvalidApplicationCredentialsException(
+				'Your application id is required in order to connect to ' . $this->providerId
+			);
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function authenticate()
+	{
+		$this->logger->info(sprintf('%s::authenticate()', get_class($this)));
+		if (!filter_input(INPUT_GET, 'hash')) {
+			$this->authenticateBegin();
+		} else {
+			$this->authenticateCheckError();
+			$this->authenticateFinish();
+		}
+		return null;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isConnected()
+	{
+		$authData = $this->getStoredData('auth_data');
+		return !empty($authData);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$data = new Collection($this->getStoredData('auth_data'));
+
+		if (!$data->exists('id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new Profile();
+
+		$userProfile->identifier = $data->get('id');
+		$userProfile->firstName = $data->get('first_name');
+		$userProfile->lastName = $data->get('last_name');
+		$userProfile->displayName = $data->get('username');
+		$userProfile->photoURL = $data->get('photo_url');
+		$username = $data->get('username');
+		if (!empty($username)) {
+			// Only some accounts have usernames.
+			$userProfile->profileURL = "https://t.me/{$username}";
+		}
+
+		return $userProfile;
+	}
+
+	/**
+	 * See: https://telegram.im/widget-login.php
+	 * See: https://gist.github.com/anonymous/6516521b1fb3b464534fbc30ea3573c2
+	 */
+	protected function authenticateCheckError()
+	{
+		$auth_data = $this->parseAuthData();
+
+		$check_hash = $auth_data['hash'];
+		unset($auth_data['hash']);
+		$data_check_arr = [];
+
+		foreach ($auth_data as $key => $value) {
+			if (!empty($value)) {
+				$data_check_arr[] = $key . '=' . $value;
+			}
+		}
+		sort($data_check_arr);
+
+		$data_check_string = implode("\n", $data_check_arr);
+		$secret_key = hash('sha256', $this->botSecret, true);
+		$hash = hash_hmac('sha256', $data_check_string, $secret_key);
+
+		if (strcmp($hash, $check_hash) !== 0) {
+			throw new InvalidAuthorizationCodeException(
+				sprintf('Provider returned an error: %s', 'Data is NOT from Telegram')
+			);
+		}
+
+		if ((time() - $auth_data['auth_date']) > 86400) {
+			throw new InvalidAuthorizationCodeException(
+				sprintf('Provider returned an error: %s', 'Data is outdated')
+			);
+		}
+	}
+
+	/**
+	 * See: https://telegram.im/widget-login.php
+	 */
+	protected function authenticateBegin()
+	{
+		$this->logger->debug(sprintf('%s::authenticateBegin(), redirecting user to:', get_class($this)));
+
+		$nonce = $this->config->get('nonce');
+		$nonce_code = empty($nonce) ? '' : "nonce=\"{$nonce}\"";
+
+		exit(
+			<<<HTML
 <center>
     <script async src="https://telegram.org/js/telegram-widget.js?7"
             {$nonce_code}
@@ -191,31 +191,31 @@ 
     </script>
 </center>
 HTML
-        );
-    }
-
-    protected function authenticateFinish()
-    {
-        $this->logger->debug(
-            sprintf('%s::authenticateFinish(), callback url:', get_class($this)),
-            [Util::getCurrentUrl(true)]
-        );
-
-        $this->storeData('auth_data', $this->parseAuthData());
-
-        $this->initialize();
-    }
-
-    protected function parseAuthData()
-    {
-        return [
-            'id' => filter_input(INPUT_GET, 'id'),
-            'first_name' => filter_input(INPUT_GET, 'first_name'),
-            'last_name' => filter_input(INPUT_GET, 'last_name'),
-            'username' => filter_input(INPUT_GET, 'username'),
-            'photo_url' => filter_input(INPUT_GET, 'photo_url'),
-            'auth_date' => filter_input(INPUT_GET, 'auth_date'),
-            'hash' => filter_input(INPUT_GET, 'hash'),
-        ];
-    }
+		);
+	}
+
+	protected function authenticateFinish()
+	{
+		$this->logger->debug(
+			sprintf('%s::authenticateFinish(), callback url:', get_class($this)),
+			[Util::getCurrentUrl(true)]
+		);
+
+		$this->storeData('auth_data', $this->parseAuthData());
+
+		$this->initialize();
+	}
+
+	protected function parseAuthData()
+	{
+		return [
+			'id' => filter_input(INPUT_GET, 'id'),
+			'first_name' => filter_input(INPUT_GET, 'first_name'),
+			'last_name' => filter_input(INPUT_GET, 'last_name'),
+			'username' => filter_input(INPUT_GET, 'username'),
+			'photo_url' => filter_input(INPUT_GET, 'photo_url'),
+			'auth_date' => filter_input(INPUT_GET, 'auth_date'),
+			'hash' => filter_input(INPUT_GET, 'hash'),
+		];
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -68,9 +68,9 @@ 
         $this->botSecret = $this->config->filter('keys')->get('secret');
         $this->callbackUrl = $this->config->get('callback');
 
-        if (!$this->botId || !$this->botSecret) {
+        if ( ! $this->botId || ! $this->botSecret) {
             throw new InvalidApplicationCredentialsException(
-                'Your application id is required in order to connect to ' . $this->providerId
+                'Your application id is required in order to connect to '.$this->providerId
             );
         }
     }
@@ -88,7 +88,7 @@ 
     public function authenticate()
     {
         $this->logger->info(sprintf('%s::authenticate()', get_class($this)));
-        if (!filter_input(INPUT_GET, 'hash')) {
+        if ( ! filter_input(INPUT_GET, 'hash')) {
             $this->authenticateBegin();
         } else {
             $this->authenticateCheckError();
@@ -103,7 +103,7 @@ 
     public function isConnected()
     {
         $authData = $this->getStoredData('auth_data');
-        return !empty($authData);
+        return ! empty($authData);
     }
 
     /**
@@ -113,7 +113,7 @@ 
     {
         $data = new Collection($this->getStoredData('auth_data'));
 
-        if (!$data->exists('id')) {
+        if ( ! $data->exists('id')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -125,7 +125,7 @@ 
         $userProfile->displayName = $data->get('username');
         $userProfile->photoURL = $data->get('photo_url');
         $username = $data->get('username');
-        if (!empty($username)) {
+        if ( ! empty($username)) {
             // Only some accounts have usernames.
             $userProfile->profileURL = "https://t.me/{$username}";
         }
@@ -146,8 +146,8 @@ 
         $data_check_arr = [];
 
         foreach ($auth_data as $key => $value) {
-            if (!empty($value)) {
-                $data_check_arr[] = $key . '=' . $value;
+            if ( ! empty($value)) {
+                $data_check_arr[] = $key.'='.$value;
             }
         }
         sort($data_check_arr);

src/Adapter/OpenID.php

Indentation +257 added lines, -257 removed lines

@@ -23,261 +23,261 @@
  */
 abstract class OpenID extends AbstractAdapter implements AdapterInterface
 {
-    /**
-     * LightOpenID instance
-     *
-     * @var object
-     */
-    protected $openIdClient = null;
-
-    /**
-     * Openid provider identifier
-     *
-     * @var string
-     */
-    protected $openidIdentifier = '';
-
-    /**
-     * IPD API Documentation
-     *
-     * OPTIONAL.
-     *
-     * @var string
-     */
-    protected $apiDocumentation = '';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function configure()
-    {
-        if ($this->config->exists('openid_identifier')) {
-            $this->openidIdentifier = $this->config->get('openid_identifier');
-        }
-
-        if (empty($this->openidIdentifier)) {
-            throw new InvalidOpenidIdentifierException('OpenID adapter requires an openid_identifier.', 4);
-        }
-
-        $this->setCallback($this->config->get('callback'));
-        $this->setApiEndpoints($this->config->get('endpoints'));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        $hostPort = parse_url($this->callback, PHP_URL_PORT);
-        $hostUrl = parse_url($this->callback, PHP_URL_HOST);
-
-        if ($hostPort) {
-            $hostUrl .= ':' . $hostPort;
-        }
-
-        // @fixme: add proxy
-        $this->openIdClient = new LightOpenID($hostUrl, null);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function authenticate()
-    {
-        $this->logger->info(sprintf('%s::authenticate()', get_class($this)));
-
-        if ($this->isConnected()) {
-            return true;
-        }
-
-        if (empty($_REQUEST['openid_mode'])) {
-            $this->authenticateBegin();
-        } else {
-            return $this->authenticateFinish();
-        }
-
-        return null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isConnected()
-    {
-        return (bool)$this->storage->get($this->providerId . '.user');
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function disconnect()
-    {
-        $this->storage->delete($this->providerId . '.user');
-
-        return true;
-    }
-
-    /**
-     * Initiate the authorization protocol
-     *
-     * Include and instantiate LightOpenID
-     */
-    protected function authenticateBegin()
-    {
-        $this->openIdClient->identity = $this->openidIdentifier;
-        $this->openIdClient->returnUrl = $this->callback;
-        $this->openIdClient->required = [
-            'namePerson/first',
-            'namePerson/last',
-            'namePerson/friendly',
-            'namePerson',
-            'contact/email',
-            'birthDate',
-            'birthDate/birthDay',
-            'birthDate/birthMonth',
-            'birthDate/birthYear',
-            'person/gender',
-            'pref/language',
-            'contact/postalCode/home',
-            'contact/city/home',
-            'contact/country/home',
-
-            'media/image/default',
-        ];
-
-        $authUrl = $this->openIdClient->authUrl();
-
-        $this->logger->debug(sprintf('%s::authenticateBegin(), redirecting user to:', get_class($this)), [$authUrl]);
-
-        HttpClient\Util::redirect($authUrl);
-    }
-
-    /**
-     * Finalize the authorization process.
-     *
-     * @throws AuthorizationDeniedException
-     * @throws UnexpectedApiResponseException
-     */
-    protected function authenticateFinish()
-    {
-        $this->logger->debug(
-            sprintf('%s::authenticateFinish(), callback url:', get_class($this)),
-            [HttpClient\Util::getCurrentUrl(true)]
-        );
-
-        if ($this->openIdClient->mode == 'cancel') {
-            throw new AuthorizationDeniedException('User has cancelled the authentication.');
-        }
-
-        if (!$this->openIdClient->validate()) {
-            throw new UnexpectedApiResponseException('Invalid response received.');
-        }
-
-        $openidAttributes = $this->openIdClient->getAttributes();
-
-        if (!$this->openIdClient->identity) {
-            throw new UnexpectedApiResponseException('Provider returned an unexpected response.');
-        }
-
-        $userProfile = $this->fetchUserProfile($openidAttributes);
-
-        /* with openid providers we only get user profiles once, so we store it */
-        $this->storage->set($this->providerId . '.user', $userProfile);
-    }
-
-    /**
-     * Fetch user profile from received openid attributes
-     *
-     * @param array $openidAttributes
-     *
-     * @return User\Profile
-     */
-    protected function fetchUserProfile($openidAttributes)
-    {
-        $data = new Data\Collection($openidAttributes);
-
-        $userProfile = new User\Profile();
-
-        $userProfile->identifier = $this->openIdClient->identity;
-
-        $userProfile->firstName = $data->get('namePerson/first');
-        $userProfile->lastName = $data->get('namePerson/last');
-        $userProfile->email = $data->get('contact/email');
-        $userProfile->language = $data->get('pref/language');
-        $userProfile->country = $data->get('contact/country/home');
-        $userProfile->zip = $data->get('contact/postalCode/home');
-        $userProfile->gender = $data->get('person/gender');
-        $userProfile->photoURL = $data->get('media/image/default');
-        $userProfile->birthDay = $data->get('birthDate/birthDay');
-        $userProfile->birthMonth = $data->get('birthDate/birthMonth');
-        $userProfile->birthYear = $data->get('birthDate/birthDate');
-
-        $userProfile = $this->fetchUserGender($userProfile, $data->get('person/gender'));
-
-        $userProfile = $this->fetchUserDisplayName($userProfile, $data);
-
-        return $userProfile;
-    }
-
-    /**
-     * Extract users display names
-     *
-     * @param User\Profile $userProfile
-     * @param Data\Collection $data
-     *
-     * @return User\Profile
-     */
-    protected function fetchUserDisplayName(User\Profile $userProfile, Data\Collection $data)
-    {
-        $userProfile->displayName = $data->get('namePerson');
-
-        $userProfile->displayName = $userProfile->displayName
-            ? $userProfile->displayName
-            : $data->get('namePerson/friendly');
-
-        $userProfile->displayName = $userProfile->displayName
-            ? $userProfile->displayName
-            : trim($userProfile->firstName . ' ' . $userProfile->lastName);
-
-        return $userProfile;
-    }
-
-    /**
-     * Extract users gender
-     *
-     * @param User\Profile $userProfile
-     * @param string $gender
-     *
-     * @return User\Profile
-     */
-    protected function fetchUserGender(User\Profile $userProfile, $gender)
-    {
-        $gender = strtolower($gender);
-
-        if ('f' == $gender) {
-            $gender = 'female';
-        }
-
-        if ('m' == $gender) {
-            $gender = 'male';
-        }
-
-        $userProfile->gender = $gender;
-
-        return $userProfile;
-    }
-
-    /**
-     * OpenID only provide the user profile one. This method will attempt to retrieve the profile from storage.
-     */
-    public function getUserProfile()
-    {
-        $userProfile = $this->storage->get($this->providerId . '.user');
-
-        if (!is_object($userProfile)) {
-            throw new UnexpectedApiResponseException('Provider returned an unexpected response.');
-        }
-
-        return $userProfile;
-    }
+	/**
+	 * LightOpenID instance
+	 *
+	 * @var object
+	 */
+	protected $openIdClient = null;
+
+	/**
+	 * Openid provider identifier
+	 *
+	 * @var string
+	 */
+	protected $openidIdentifier = '';
+
+	/**
+	 * IPD API Documentation
+	 *
+	 * OPTIONAL.
+	 *
+	 * @var string
+	 */
+	protected $apiDocumentation = '';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function configure()
+	{
+		if ($this->config->exists('openid_identifier')) {
+			$this->openidIdentifier = $this->config->get('openid_identifier');
+		}
+
+		if (empty($this->openidIdentifier)) {
+			throw new InvalidOpenidIdentifierException('OpenID adapter requires an openid_identifier.', 4);
+		}
+
+		$this->setCallback($this->config->get('callback'));
+		$this->setApiEndpoints($this->config->get('endpoints'));
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		$hostPort = parse_url($this->callback, PHP_URL_PORT);
+		$hostUrl = parse_url($this->callback, PHP_URL_HOST);
+
+		if ($hostPort) {
+			$hostUrl .= ':' . $hostPort;
+		}
+
+		// @fixme: add proxy
+		$this->openIdClient = new LightOpenID($hostUrl, null);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function authenticate()
+	{
+		$this->logger->info(sprintf('%s::authenticate()', get_class($this)));
+
+		if ($this->isConnected()) {
+			return true;
+		}
+
+		if (empty($_REQUEST['openid_mode'])) {
+			$this->authenticateBegin();
+		} else {
+			return $this->authenticateFinish();
+		}
+
+		return null;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isConnected()
+	{
+		return (bool)$this->storage->get($this->providerId . '.user');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function disconnect()
+	{
+		$this->storage->delete($this->providerId . '.user');
+
+		return true;
+	}
+
+	/**
+	 * Initiate the authorization protocol
+	 *
+	 * Include and instantiate LightOpenID
+	 */
+	protected function authenticateBegin()
+	{
+		$this->openIdClient->identity = $this->openidIdentifier;
+		$this->openIdClient->returnUrl = $this->callback;
+		$this->openIdClient->required = [
+			'namePerson/first',
+			'namePerson/last',
+			'namePerson/friendly',
+			'namePerson',
+			'contact/email',
+			'birthDate',
+			'birthDate/birthDay',
+			'birthDate/birthMonth',
+			'birthDate/birthYear',
+			'person/gender',
+			'pref/language',
+			'contact/postalCode/home',
+			'contact/city/home',
+			'contact/country/home',
+
+			'media/image/default',
+		];
+
+		$authUrl = $this->openIdClient->authUrl();
+
+		$this->logger->debug(sprintf('%s::authenticateBegin(), redirecting user to:', get_class($this)), [$authUrl]);
+
+		HttpClient\Util::redirect($authUrl);
+	}
+
+	/**
+	 * Finalize the authorization process.
+	 *
+	 * @throws AuthorizationDeniedException
+	 * @throws UnexpectedApiResponseException
+	 */
+	protected function authenticateFinish()
+	{
+		$this->logger->debug(
+			sprintf('%s::authenticateFinish(), callback url:', get_class($this)),
+			[HttpClient\Util::getCurrentUrl(true)]
+		);
+
+		if ($this->openIdClient->mode == 'cancel') {
+			throw new AuthorizationDeniedException('User has cancelled the authentication.');
+		}
+
+		if (!$this->openIdClient->validate()) {
+			throw new UnexpectedApiResponseException('Invalid response received.');
+		}
+
+		$openidAttributes = $this->openIdClient->getAttributes();
+
+		if (!$this->openIdClient->identity) {
+			throw new UnexpectedApiResponseException('Provider returned an unexpected response.');
+		}
+
+		$userProfile = $this->fetchUserProfile($openidAttributes);
+
+		/* with openid providers we only get user profiles once, so we store it */
+		$this->storage->set($this->providerId . '.user', $userProfile);
+	}
+
+	/**
+	 * Fetch user profile from received openid attributes
+	 *
+	 * @param array $openidAttributes
+	 *
+	 * @return User\Profile
+	 */
+	protected function fetchUserProfile($openidAttributes)
+	{
+		$data = new Data\Collection($openidAttributes);
+
+		$userProfile = new User\Profile();
+
+		$userProfile->identifier = $this->openIdClient->identity;
+
+		$userProfile->firstName = $data->get('namePerson/first');
+		$userProfile->lastName = $data->get('namePerson/last');
+		$userProfile->email = $data->get('contact/email');
+		$userProfile->language = $data->get('pref/language');
+		$userProfile->country = $data->get('contact/country/home');
+		$userProfile->zip = $data->get('contact/postalCode/home');
+		$userProfile->gender = $data->get('person/gender');
+		$userProfile->photoURL = $data->get('media/image/default');
+		$userProfile->birthDay = $data->get('birthDate/birthDay');
+		$userProfile->birthMonth = $data->get('birthDate/birthMonth');
+		$userProfile->birthYear = $data->get('birthDate/birthDate');
+
+		$userProfile = $this->fetchUserGender($userProfile, $data->get('person/gender'));
+
+		$userProfile = $this->fetchUserDisplayName($userProfile, $data);
+
+		return $userProfile;
+	}
+
+	/**
+	 * Extract users display names
+	 *
+	 * @param User\Profile $userProfile
+	 * @param Data\Collection $data
+	 *
+	 * @return User\Profile
+	 */
+	protected function fetchUserDisplayName(User\Profile $userProfile, Data\Collection $data)
+	{
+		$userProfile->displayName = $data->get('namePerson');
+
+		$userProfile->displayName = $userProfile->displayName
+			? $userProfile->displayName
+			: $data->get('namePerson/friendly');
+
+		$userProfile->displayName = $userProfile->displayName
+			? $userProfile->displayName
+			: trim($userProfile->firstName . ' ' . $userProfile->lastName);
+
+		return $userProfile;
+	}
+
+	/**
+	 * Extract users gender
+	 *
+	 * @param User\Profile $userProfile
+	 * @param string $gender
+	 *
+	 * @return User\Profile
+	 */
+	protected function fetchUserGender(User\Profile $userProfile, $gender)
+	{
+		$gender = strtolower($gender);
+
+		if ('f' == $gender) {
+			$gender = 'female';
+		}
+
+		if ('m' == $gender) {
+			$gender = 'male';
+		}
+
+		$userProfile->gender = $gender;
+
+		return $userProfile;
+	}
+
+	/**
+	 * OpenID only provide the user profile one. This method will attempt to retrieve the profile from storage.
+	 */
+	public function getUserProfile()
+	{
+		$userProfile = $this->storage->get($this->providerId . '.user');
+
+		if (!is_object($userProfile)) {
+			throw new UnexpectedApiResponseException('Provider returned an unexpected response.');
+		}
+
+		return $userProfile;
+	}
 }

src/HttpClient/Curl.php

Indentation +301 added lines, -301 removed lines

@@ -12,305 +12,305 @@
  */
 class Curl implements HttpClientInterface
 {
-    /**
-     * Default curl options
-     *
-     * These defaults options can be overwritten when sending requests.
-     *
-     * See setCurlOptions()
-     *
-     * @var array
-     */
-    protected $curlOptions = [
-        CURLOPT_TIMEOUT => 30,
-        CURLOPT_CONNECTTIMEOUT => 30,
-        CURLOPT_SSL_VERIFYPEER => false,
-        CURLOPT_SSL_VERIFYHOST => false,
-        CURLOPT_RETURNTRANSFER => true,
-        CURLOPT_FOLLOWLOCATION => true,
-        CURLOPT_MAXREDIRS => 5,
-        CURLINFO_HEADER_OUT => true,
-        CURLOPT_ENCODING => 'identity',
-        // phpcs:ignore
-        CURLOPT_USERAGENT => 'Hybridauth, PHP Social Authentication Library (https://github.com/hybridauth/hybridauth)',
-    ];
-
-    /**
-     * Method request() arguments
-     *
-     * This is used for debugging.
-     *
-     * @var array
-     */
-    protected $requestArguments = [];
-
-    /**
-     * Default request headers
-     *
-     * @var array
-     */
-    protected $requestHeader = [
-        'Accept' => '*/*',
-        'Cache-Control' => 'max-age=0',
-        'Connection' => 'keep-alive',
-        'Expect' => '',
-        'Pragma' => '',
-    ];
-
-    /**
-     * Raw response returned by server
-     *
-     * @var string
-     */
-    protected $responseBody = '';
-
-    /**
-     * Headers returned in the response
-     *
-     * @var array
-     */
-    protected $responseHeader = [];
-
-    /**
-     * Response HTTP status code
-     *
-     * @var int
-     */
-    protected $responseHttpCode = 0;
-
-    /**
-     * Last curl error number
-     *
-     * @var mixed
-     */
-    protected $responseClientError = null;
-
-    /**
-     * Information about the last transfer
-     *
-     * @var mixed
-     */
-    protected $responseClientInfo = [];
-
-    /**
-     * Hybridauth logger instance
-     *
-     * @var object
-     */
-    protected $logger = null;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function request($uri, $method = 'GET', $parameters = [], $headers = [], $multipart = false)
-    {
-        $this->requestHeader = array_replace($this->requestHeader, (array)$headers);
-
-        $this->requestArguments = [
-            'uri' => $uri,
-            'method' => $method,
-            'parameters' => $parameters,
-            'headers' => $this->requestHeader,
-        ];
-
-        $curl = curl_init();
-
-        switch ($method) {
-            case 'GET':
-            case 'DELETE':
-                unset($this->curlOptions[CURLOPT_POST]);
-                unset($this->curlOptions[CURLOPT_POSTFIELDS]);
-
-                $uri = $uri . (strpos($uri, '?') ? '&' : '?') . http_build_query($parameters);
-                if ($method === 'DELETE') {
-                    $this->curlOptions[CURLOPT_CUSTOMREQUEST] = 'DELETE';
-                }
-                break;
-            case 'PUT':
-            case 'POST':
-            case 'PATCH':
-                $body_content = $multipart ? $parameters : http_build_query($parameters);
-                if (isset($this->requestHeader['Content-Type'])
-                    && $this->requestHeader['Content-Type'] == 'application/json'
-                ) {
-                    $body_content = json_encode($parameters);
-                }
-
-                if ($method === 'POST') {
-                    $this->curlOptions[CURLOPT_POST] = true;
-                } else {
-                    $this->curlOptions[CURLOPT_CUSTOMREQUEST] = $method;
-                }
-                $this->curlOptions[CURLOPT_POSTFIELDS] = $body_content;
-                break;
-        }
-
-        $this->curlOptions[CURLOPT_URL] = $uri;
-        $this->curlOptions[CURLOPT_HTTPHEADER] = $this->prepareRequestHeaders();
-        $this->curlOptions[CURLOPT_HEADERFUNCTION] = [$this, 'fetchResponseHeader'];
-
-        foreach ($this->curlOptions as $opt => $value) {
-            curl_setopt($curl, $opt, $value);
-        }
-
-        $response = curl_exec($curl);
-
-        $this->responseBody = $response;
-        $this->responseHttpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-        $this->responseClientError = curl_error($curl);
-        $this->responseClientInfo = curl_getinfo($curl);
-
-        if ($this->logger) {
-            // phpcs:ignore
-            $this->logger->debug(sprintf('%s::request( %s, %s ), response:', get_class($this), $uri, $method), $this->getResponse());
-
-            if (false === $response) {
-                // phpcs:ignore
-                $this->logger->error(sprintf('%s::request( %s, %s ), error:', get_class($this), $uri, $method), [$this->responseClientError]);
-            }
-        }
-
-        curl_close($curl);
-
-        return $this->responseBody;
-    }
-
-    /**
-     * Get response details
-     *
-     * @return array Map structure of details
-     */
-    public function getResponse()
-    {
-        $curlOptions = $this->curlOptions;
-
-        $curlOptions[CURLOPT_HEADERFUNCTION] = '*omitted';
-
-        return [
-            'request' => $this->getRequestArguments(),
-            'response' => [
-                'code' => $this->getResponseHttpCode(),
-                'headers' => $this->getResponseHeader(),
-                'body' => $this->getResponseBody(),
-            ],
-            'client' => [
-                'error' => $this->getResponseClientError(),
-                'info' => $this->getResponseClientInfo(),
-                'opts' => $curlOptions,
-            ],
-        ];
-    }
-
-    /**
-     * Reset curl options
-     *
-     * @param array $curlOptions
-     */
-    public function setCurlOptions($curlOptions)
-    {
-        foreach ($curlOptions as $opt => $value) {
-            $this->curlOptions[$opt] = $value;
-        }
-    }
-
-    /**
-     * Set logger instance
-     *
-     * @param object $logger
-     */
-    public function setLogger($logger)
-    {
-        $this->logger = $logger;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseBody()
-    {
-        return $this->responseBody;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseHeader()
-    {
-        return $this->responseHeader;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseHttpCode()
-    {
-        return $this->responseHttpCode;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseClientError()
-    {
-        return $this->responseClientError;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getResponseClientInfo()
-    {
-        return $this->responseClientInfo;
-    }
-
-    /**
-     * Returns method request() arguments
-     *
-     * This is used for debugging.
-     *
-     * @return array
-     */
-    protected function getRequestArguments()
-    {
-        return $this->requestArguments;
-    }
-
-    /**
-     * Fetch server response headers
-     *
-     * @param mixed $curl
-     * @param string $header
-     *
-     * @return int
-     */
-    protected function fetchResponseHeader($curl, $header)
-    {
-        $pos = strpos($header, ':');
-
-        if (!empty($pos)) {
-            $key = str_replace('-', '_', strtolower(substr($header, 0, $pos)));
-
-            $value = trim(substr($header, $pos + 2));
-
-            $this->responseHeader[$key] = $value;
-        }
-
-        return strlen($header);
-    }
-
-    /**
-     * Convert request headers to the expect curl format
-     *
-     * @return array
-     */
-    protected function prepareRequestHeaders()
-    {
-        $headers = [];
-
-        foreach ($this->requestHeader as $header => $value) {
-            $headers[] = trim($header) . ': ' . trim($value);
-        }
-
-        return $headers;
-    }
+	/**
+	 * Default curl options
+	 *
+	 * These defaults options can be overwritten when sending requests.
+	 *
+	 * See setCurlOptions()
+	 *
+	 * @var array
+	 */
+	protected $curlOptions = [
+		CURLOPT_TIMEOUT => 30,
+		CURLOPT_CONNECTTIMEOUT => 30,
+		CURLOPT_SSL_VERIFYPEER => false,
+		CURLOPT_SSL_VERIFYHOST => false,
+		CURLOPT_RETURNTRANSFER => true,
+		CURLOPT_FOLLOWLOCATION => true,
+		CURLOPT_MAXREDIRS => 5,
+		CURLINFO_HEADER_OUT => true,
+		CURLOPT_ENCODING => 'identity',
+		// phpcs:ignore
+		CURLOPT_USERAGENT => 'Hybridauth, PHP Social Authentication Library (https://github.com/hybridauth/hybridauth)',
+	];
+
+	/**
+	 * Method request() arguments
+	 *
+	 * This is used for debugging.
+	 *
+	 * @var array
+	 */
+	protected $requestArguments = [];
+
+	/**
+	 * Default request headers
+	 *
+	 * @var array
+	 */
+	protected $requestHeader = [
+		'Accept' => '*/*',
+		'Cache-Control' => 'max-age=0',
+		'Connection' => 'keep-alive',
+		'Expect' => '',
+		'Pragma' => '',
+	];
+
+	/**
+	 * Raw response returned by server
+	 *
+	 * @var string
+	 */
+	protected $responseBody = '';
+
+	/**
+	 * Headers returned in the response
+	 *
+	 * @var array
+	 */
+	protected $responseHeader = [];
+
+	/**
+	 * Response HTTP status code
+	 *
+	 * @var int
+	 */
+	protected $responseHttpCode = 0;
+
+	/**
+	 * Last curl error number
+	 *
+	 * @var mixed
+	 */
+	protected $responseClientError = null;
+
+	/**
+	 * Information about the last transfer
+	 *
+	 * @var mixed
+	 */
+	protected $responseClientInfo = [];
+
+	/**
+	 * Hybridauth logger instance
+	 *
+	 * @var object
+	 */
+	protected $logger = null;
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function request($uri, $method = 'GET', $parameters = [], $headers = [], $multipart = false)
+	{
+		$this->requestHeader = array_replace($this->requestHeader, (array)$headers);
+
+		$this->requestArguments = [
+			'uri' => $uri,
+			'method' => $method,
+			'parameters' => $parameters,
+			'headers' => $this->requestHeader,
+		];
+
+		$curl = curl_init();
+
+		switch ($method) {
+			case 'GET':
+			case 'DELETE':
+				unset($this->curlOptions[CURLOPT_POST]);
+				unset($this->curlOptions[CURLOPT_POSTFIELDS]);
+
+				$uri = $uri . (strpos($uri, '?') ? '&' : '?') . http_build_query($parameters);
+				if ($method === 'DELETE') {
+					$this->curlOptions[CURLOPT_CUSTOMREQUEST] = 'DELETE';
+				}
+				break;
+			case 'PUT':
+			case 'POST':
+			case 'PATCH':
+				$body_content = $multipart ? $parameters : http_build_query($parameters);
+				if (isset($this->requestHeader['Content-Type'])
+					&& $this->requestHeader['Content-Type'] == 'application/json'
+				) {
+					$body_content = json_encode($parameters);
+				}
+
+				if ($method === 'POST') {
+					$this->curlOptions[CURLOPT_POST] = true;
+				} else {
+					$this->curlOptions[CURLOPT_CUSTOMREQUEST] = $method;
+				}
+				$this->curlOptions[CURLOPT_POSTFIELDS] = $body_content;
+				break;
+		}
+
+		$this->curlOptions[CURLOPT_URL] = $uri;
+		$this->curlOptions[CURLOPT_HTTPHEADER] = $this->prepareRequestHeaders();
+		$this->curlOptions[CURLOPT_HEADERFUNCTION] = [$this, 'fetchResponseHeader'];
+
+		foreach ($this->curlOptions as $opt => $value) {
+			curl_setopt($curl, $opt, $value);
+		}
+
+		$response = curl_exec($curl);
+
+		$this->responseBody = $response;
+		$this->responseHttpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+		$this->responseClientError = curl_error($curl);
+		$this->responseClientInfo = curl_getinfo($curl);
+
+		if ($this->logger) {
+			// phpcs:ignore
+			$this->logger->debug(sprintf('%s::request( %s, %s ), response:', get_class($this), $uri, $method), $this->getResponse());
+
+			if (false === $response) {
+				// phpcs:ignore
+				$this->logger->error(sprintf('%s::request( %s, %s ), error:', get_class($this), $uri, $method), [$this->responseClientError]);
+			}
+		}
+
+		curl_close($curl);
+
+		return $this->responseBody;
+	}
+
+	/**
+	 * Get response details
+	 *
+	 * @return array Map structure of details
+	 */
+	public function getResponse()
+	{
+		$curlOptions = $this->curlOptions;
+
+		$curlOptions[CURLOPT_HEADERFUNCTION] = '*omitted';
+
+		return [
+			'request' => $this->getRequestArguments(),
+			'response' => [
+				'code' => $this->getResponseHttpCode(),
+				'headers' => $this->getResponseHeader(),
+				'body' => $this->getResponseBody(),
+			],
+			'client' => [
+				'error' => $this->getResponseClientError(),
+				'info' => $this->getResponseClientInfo(),
+				'opts' => $curlOptions,
+			],
+		];
+	}
+
+	/**
+	 * Reset curl options
+	 *
+	 * @param array $curlOptions
+	 */
+	public function setCurlOptions($curlOptions)
+	{
+		foreach ($curlOptions as $opt => $value) {
+			$this->curlOptions[$opt] = $value;
+		}
+	}
+
+	/**
+	 * Set logger instance
+	 *
+	 * @param object $logger
+	 */
+	public function setLogger($logger)
+	{
+		$this->logger = $logger;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getResponseBody()
+	{
+		return $this->responseBody;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getResponseHeader()
+	{
+		return $this->responseHeader;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getResponseHttpCode()
+	{
+		return $this->responseHttpCode;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getResponseClientError()
+	{
+		return $this->responseClientError;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getResponseClientInfo()
+	{
+		return $this->responseClientInfo;
+	}
+
+	/**
+	 * Returns method request() arguments
+	 *
+	 * This is used for debugging.
+	 *
+	 * @return array
+	 */
+	protected function getRequestArguments()
+	{
+		return $this->requestArguments;
+	}
+
+	/**
+	 * Fetch server response headers
+	 *
+	 * @param mixed $curl
+	 * @param string $header
+	 *
+	 * @return int
+	 */
+	protected function fetchResponseHeader($curl, $header)
+	{
+		$pos = strpos($header, ':');
+
+		if (!empty($pos)) {
+			$key = str_replace('-', '_', strtolower(substr($header, 0, $pos)));
+
+			$value = trim(substr($header, $pos + 2));
+
+			$this->responseHeader[$key] = $value;
+		}
+
+		return strlen($header);
+	}
+
+	/**
+	 * Convert request headers to the expect curl format
+	 *
+	 * @return array
+	 */
+	protected function prepareRequestHeaders()
+	{
+		$headers = [];
+
+		foreach ($this->requestHeader as $header => $value) {
+			$headers[] = trim($header) . ': ' . trim($value);
+		}
+
+		return $headers;
+	}
 }

src/HttpClient/Guzzle.php

Indentation +239 added lines, -239 removed lines

@@ -33,243 +33,243 @@
  */
 class Guzzle implements HttpClientInterface
 {
-    /**
-     * Method request() arguments
-     *
-     * This is used for debugging.
-     *
-     * @var array
-     */
-    protected $requestArguments = [];
-
-    /**
-     * Default request headers
-     *
-     * @var array
-     */
-    protected $requestHeader = [];
-
-    /**
-     * Raw response returned by server
-     *
-     * @var string
-     */
-    protected $responseBody = '';
-
-    /**
-     * Headers returned in the response
-     *
-     * @var array
-     */
-    protected $responseHeader = [];
-
-    /**
-     * Response HTTP status code
-     *
-     * @var int
-     */
-    protected $responseHttpCode = 0;
-
-    /**
-     * Last curl error number
-     *
-     * @var mixed
-     */
-    protected $responseClientError = null;
-
-    /**
-     * Information about the last transfer
-     *
-     * @var mixed
-     */
-    protected $responseClientInfo = [];
-
-    /**
-     * Hybridauth logger instance
-     *
-     * @var object
-     */
-    protected $logger = null;
-
-    /**
-     * GuzzleHttp client
-     *
-     * @var \GuzzleHttp\Client
-     */
-    protected $client = null;
-
-    /**
-     * ..
-     * @param null $client
-     * @param array $config
-     */
-    public function __construct($client = null, $config = [])
-    {
-        $this->client = $client ? $client : new Client($config);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function request($uri, $method = 'GET', $parameters = [], $headers = [], $multipart = false)
-    {
-        $this->requestHeader = array_replace($this->requestHeader, (array)$headers);
-
-        $this->requestArguments = [
-            'uri' => $uri,
-            'method' => $method,
-            'parameters' => $parameters,
-            'headers' => $this->requestHeader,
-        ];
-
-        $response = null;
-
-        try {
-            switch ($method) {
-                case 'GET':
-                case 'DELETE':
-                    $response = $this->client->request($method, $uri, [
-                        'query' => $parameters,
-                        'headers' => $this->requestHeader,
-                    ]);
-                    break;
-                case 'PUT':
-                case 'POST':
-                    $body_type = $multipart ? 'multipart' : 'form_params';
-
-                    if (isset($this->requestHeader['Content-Type'])
-                        && $this->requestHeader['Content-Type'] === 'application/json'
-                    ) {
-                        $body_type = 'json';
-                    }
-
-                    $body_content = $parameters;
-                    if ($multipart) {
-                        $body_content = [];
-                        foreach ($parameters as $key => $val) {
-                            if ($val instanceof \CURLFile) {
-                                $val = fopen($val->getFilename(), 'r');
-                            }
-
-                            $body_content[] = [
-                                'name' => $key,
-                                'contents' => $val,
-                            ];
-                        }
-                    }
-
-                    $response = $this->client->request($method, $uri, [
-                        $body_type => $body_content,
-                        'headers' => $this->requestHeader,
-                    ]);
-                    break;
-            }
-        } catch (\Exception $e) {
-            $response = $e->getResponse();
-
-            $this->responseClientError = $e->getMessage();
-        }
-
-        if (!$this->responseClientError) {
-            $this->responseBody = $response->getBody();
-            $this->responseHttpCode = $response->getStatusCode();
-            $this->responseHeader = $response->getHeaders();
-        }
-
-        if ($this->logger) {
-            // phpcs:ignore
-            $this->logger->debug(sprintf('%s::request( %s, %s ), response:', get_class($this), $uri, $method), $this->getResponse());
-
-            if ($this->responseClientError) {
-                // phpcs:ignore
-                $this->logger->error(sprintf('%s::request( %s, %s ), error:', get_class($this), $uri, $method), [$this->responseClientError]);
-            }
-        }
-
-        return $this->responseBody;
-    }
-
-    /**
-     * Get response details
-     *
-     * @return array Map structure of details
-     */
-    public function getResponse()
-    {
-        return [
-            'request' => $this->getRequestArguments(),
-            'response' => [
-                'code' => $this->getResponseHttpCode(),
-                'headers' => $this->getResponseHeader(),
-                'body' => $this->getResponseBody(),
-            ],
-            'client' => [
-                'error' => $this->getResponseClientError(),
-                'info' => $this->getResponseClientInfo(),
-                'opts' => null,
-            ],
-        ];
-    }
-
-    /**
-     * Set logger instance
-     *
-     * @param object $logger
-     */
-    public function setLogger($logger)
-    {
-        $this->logger = $logger;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseBody()
-    {
-        return $this->responseBody;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseHeader()
-    {
-        return $this->responseHeader;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseHttpCode()
-    {
-        return $this->responseHttpCode;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseClientError()
-    {
-        return $this->responseClientError;
-    }
-
-    /**
-     * @return array
-     */
-    protected function getResponseClientInfo()
-    {
-        return $this->responseClientInfo;
-    }
-
-    /**
-     * Returns method request() arguments
-     *
-     * This is used for debugging.
-     *
-     * @return array
-     */
-    protected function getRequestArguments()
-    {
-        return $this->requestArguments;
-    }
+	/**
+	 * Method request() arguments
+	 *
+	 * This is used for debugging.
+	 *
+	 * @var array
+	 */
+	protected $requestArguments = [];
+
+	/**
+	 * Default request headers
+	 *
+	 * @var array
+	 */
+	protected $requestHeader = [];
+
+	/**
+	 * Raw response returned by server
+	 *
+	 * @var string
+	 */
+	protected $responseBody = '';
+
+	/**
+	 * Headers returned in the response
+	 *
+	 * @var array
+	 */
+	protected $responseHeader = [];
+
+	/**
+	 * Response HTTP status code
+	 *
+	 * @var int
+	 */
+	protected $responseHttpCode = 0;
+
+	/**
+	 * Last curl error number
+	 *
+	 * @var mixed
+	 */
+	protected $responseClientError = null;
+
+	/**
+	 * Information about the last transfer
+	 *
+	 * @var mixed
+	 */
+	protected $responseClientInfo = [];
+
+	/**
+	 * Hybridauth logger instance
+	 *
+	 * @var object
+	 */
+	protected $logger = null;
+
+	/**
+	 * GuzzleHttp client
+	 *
+	 * @var \GuzzleHttp\Client
+	 */
+	protected $client = null;
+
+	/**
+	 * ..
+	 * @param null $client
+	 * @param array $config
+	 */
+	public function __construct($client = null, $config = [])
+	{
+		$this->client = $client ? $client : new Client($config);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function request($uri, $method = 'GET', $parameters = [], $headers = [], $multipart = false)
+	{
+		$this->requestHeader = array_replace($this->requestHeader, (array)$headers);
+
+		$this->requestArguments = [
+			'uri' => $uri,
+			'method' => $method,
+			'parameters' => $parameters,
+			'headers' => $this->requestHeader,
+		];
+
+		$response = null;
+
+		try {
+			switch ($method) {
+				case 'GET':
+				case 'DELETE':
+					$response = $this->client->request($method, $uri, [
+						'query' => $parameters,
+						'headers' => $this->requestHeader,
+					]);
+					break;
+				case 'PUT':
+				case 'POST':
+					$body_type = $multipart ? 'multipart' : 'form_params';
+
+					if (isset($this->requestHeader['Content-Type'])
+						&& $this->requestHeader['Content-Type'] === 'application/json'
+					) {
+						$body_type = 'json';
+					}
+
+					$body_content = $parameters;
+					if ($multipart) {
+						$body_content = [];
+						foreach ($parameters as $key => $val) {
+							if ($val instanceof \CURLFile) {
+								$val = fopen($val->getFilename(), 'r');
+							}
+
+							$body_content[] = [
+								'name' => $key,
+								'contents' => $val,
+							];
+						}
+					}
+
+					$response = $this->client->request($method, $uri, [
+						$body_type => $body_content,
+						'headers' => $this->requestHeader,
+					]);
+					break;
+			}
+		} catch (\Exception $e) {
+			$response = $e->getResponse();
+
+			$this->responseClientError = $e->getMessage();
+		}
+
+		if (!$this->responseClientError) {
+			$this->responseBody = $response->getBody();
+			$this->responseHttpCode = $response->getStatusCode();
+			$this->responseHeader = $response->getHeaders();
+		}
+
+		if ($this->logger) {
+			// phpcs:ignore
+			$this->logger->debug(sprintf('%s::request( %s, %s ), response:', get_class($this), $uri, $method), $this->getResponse());
+
+			if ($this->responseClientError) {
+				// phpcs:ignore
+				$this->logger->error(sprintf('%s::request( %s, %s ), error:', get_class($this), $uri, $method), [$this->responseClientError]);
+			}
+		}
+
+		return $this->responseBody;
+	}
+
+	/**
+	 * Get response details
+	 *
+	 * @return array Map structure of details
+	 */
+	public function getResponse()
+	{
+		return [
+			'request' => $this->getRequestArguments(),
+			'response' => [
+				'code' => $this->getResponseHttpCode(),
+				'headers' => $this->getResponseHeader(),
+				'body' => $this->getResponseBody(),
+			],
+			'client' => [
+				'error' => $this->getResponseClientError(),
+				'info' => $this->getResponseClientInfo(),
+				'opts' => null,
+			],
+		];
+	}
+
+	/**
+	 * Set logger instance
+	 *
+	 * @param object $logger
+	 */
+	public function setLogger($logger)
+	{
+		$this->logger = $logger;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getResponseBody()
+	{
+		return $this->responseBody;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getResponseHeader()
+	{
+		return $this->responseHeader;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getResponseHttpCode()
+	{
+		return $this->responseHttpCode;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getResponseClientError()
+	{
+		return $this->responseClientError;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getResponseClientInfo()
+	{
+		return $this->responseClientInfo;
+	}
+
+	/**
+	 * Returns method request() arguments
+	 *
+	 * This is used for debugging.
+	 *
+	 * @return array
+	 */
+	protected function getRequestArguments()
+	{
+		return $this->requestArguments;
+	}
 }

src/Data/Parser.php

Indentation +101 added lines, -101 removed lines

@@ -15,105 +15,105 @@
  */
 final class Parser
 {
-    /**
-     * Decodes a string into an object.
-     *
-     * This method will first attempt to parse data as a JSON string (since most providers use this format)
-     * then XML and parse_str.
-     *
-     * @param string $raw
-     *
-     * @return mixed
-     */
-    public function parse($raw = null)
-    {
-        $data = $this->parseJson($raw);
-
-        if (!$data) {
-            $data = $this->parseXml($raw);
-
-            if (!$data) {
-                $data = $this->parseQueryString($raw);
-            }
-        }
-
-        return $data;
-    }
-
-    /**
-     * Decodes a JSON string
-     *
-     * @param $result
-     *
-     * @return mixed
-     */
-    public function parseJson($result)
-    {
-        return json_decode($result);
-    }
-
-    /**
-     * Decodes a XML string
-     *
-     * @param $result
-     *
-     * @return mixed
-     */
-    public function parseXml($result)
-    {
-        libxml_use_internal_errors(true);
-
-        $result = preg_replace('/([<\/])([a-z0-9-]+):/i', '$1', $result);
-        $xml = simplexml_load_string($result);
-
-        libxml_use_internal_errors(false);
-
-        if (!$xml) {
-            return [];
-        }
-
-        $arr = json_decode(json_encode((array)$xml), true);
-        $arr = array($xml->getName() => $arr);
-
-        return $arr;
-    }
-
-    /**
-     * Parses a string into variables
-     *
-     * @param $result
-     *
-     * @return \StdClass
-     */
-    public function parseQueryString($result)
-    {
-        parse_str($result, $output);
-
-        if (!is_array($output)) {
-            return $result;
-        }
-
-        $result = new \StdClass();
-
-        foreach ($output as $k => $v) {
-            $result->$k = $v;
-        }
-
-        return $result;
-    }
-
-    /**
-     * needs to be improved
-     *
-     * @param $birthday
-     * @param $seperator
-     *
-     * @return array
-     */
-    public function parseBirthday($birthday, $seperator)
-    {
-        $birthday = date_parse($birthday);
-
-        return [$birthday['year'], $birthday['month'], $birthday['day']];
-    }
+	/**
+	 * Decodes a string into an object.
+	 *
+	 * This method will first attempt to parse data as a JSON string (since most providers use this format)
+	 * then XML and parse_str.
+	 *
+	 * @param string $raw
+	 *
+	 * @return mixed
+	 */
+	public function parse($raw = null)
+	{
+		$data = $this->parseJson($raw);
+
+		if (!$data) {
+			$data = $this->parseXml($raw);
+
+			if (!$data) {
+				$data = $this->parseQueryString($raw);
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Decodes a JSON string
+	 *
+	 * @param $result
+	 *
+	 * @return mixed
+	 */
+	public function parseJson($result)
+	{
+		return json_decode($result);
+	}
+
+	/**
+	 * Decodes a XML string
+	 *
+	 * @param $result
+	 *
+	 * @return mixed
+	 */
+	public function parseXml($result)
+	{
+		libxml_use_internal_errors(true);
+
+		$result = preg_replace('/([<\/])([a-z0-9-]+):/i', '$1', $result);
+		$xml = simplexml_load_string($result);
+
+		libxml_use_internal_errors(false);
+
+		if (!$xml) {
+			return [];
+		}
+
+		$arr = json_decode(json_encode((array)$xml), true);
+		$arr = array($xml->getName() => $arr);
+
+		return $arr;
+	}
+
+	/**
+	 * Parses a string into variables
+	 *
+	 * @param $result
+	 *
+	 * @return \StdClass
+	 */
+	public function parseQueryString($result)
+	{
+		parse_str($result, $output);
+
+		if (!is_array($output)) {
+			return $result;
+		}
+
+		$result = new \StdClass();
+
+		foreach ($output as $k => $v) {
+			$result->$k = $v;
+		}
+
+		return $result;
+	}
+
+	/**
+	 * needs to be improved
+	 *
+	 * @param $birthday
+	 * @param $seperator
+	 *
+	 * @return array
+	 */
+	public function parseBirthday($birthday, $seperator)
+	{
+		$birthday = date_parse($birthday);
+
+		return [$birthday['year'], $birthday['month'], $birthday['day']];
+	}
 }