hybridauth / hybridauth

src/Data/Collection.php

Indentation +139 added lines, -139 removed lines

@@ -12,143 +12,143 @@
  */
 final class Collection
 {
-    /**
-     * Data collection
-     *
-     * @var mixed
-     */
-    protected $collection = null;
-
-    /**
-     * @param mixed $data
-     */
-    public function __construct($data = null)
-    {
-        $this->collection = (object)$data;
-    }
-
-    /**
-     * Retrieves the whole collection as array
-     *
-     * @return mixed
-     */
-    public function toArray()
-    {
-        return (array)$this->collection;
-    }
-
-    /**
-     * Retrieves an item
-     *
-     * @param $property
-     *
-     * @return mixed
-     */
-    public function get($property)
-    {
-        if ($this->exists($property)) {
-            return $this->collection->$property;
-        }
-
-        return null;
-    }
-
-    /**
-     * Add or update an item
-     *
-     * @param $property
-     * @param mixed $value
-     */
-    public function set($property, $value)
-    {
-        if ($property) {
-            $this->collection->$property = $value;
-        }
-    }
-
-    /**
-     * .. until I come with a better name..
-     *
-     * @param $property
-     *
-     * @return Collection
-     */
-    public function filter($property)
-    {
-        if ($this->exists($property)) {
-            $data = $this->get($property);
-
-            if (!is_a($data, 'Collection')) {
-                $data = new Collection($data);
-            }
-
-            return $data;
-        }
-
-        return new Collection([]);
-    }
-
-    /**
-     * Checks whether an item within the collection
-     *
-     * @param $property
-     *
-     * @return bool
-     */
-    public function exists($property)
-    {
-        return property_exists($this->collection, $property);
-    }
-
-    /**
-     * Finds whether the collection is empty
-     *
-     * @return bool
-     */
-    public function isEmpty()
-    {
-        return !(bool)$this->count();
-    }
-
-    /**
-     * Count all items in collection
-     *
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->properties());
-    }
-
-    /**
-     * Returns all items properties names
-     *
-     * @return array
-     */
-    public function properties()
-    {
-        $properties = [];
-
-        foreach ($this->collection as $key => $value) {
-            $properties[] = $key;
-        }
-
-        return $properties;
-    }
-
-    /**
-     * Returns all items values
-     *
-     * @return array
-     */
-    public function values()
-    {
-        $values = [];
-
-        foreach ($this->collection as $value) {
-            $values[] = $value;
-        }
-
-        return $values;
-    }
+	/**
+	 * Data collection
+	 *
+	 * @var mixed
+	 */
+	protected $collection = null;
+
+	/**
+	 * @param mixed $data
+	 */
+	public function __construct($data = null)
+	{
+		$this->collection = (object)$data;
+	}
+
+	/**
+	 * Retrieves the whole collection as array
+	 *
+	 * @return mixed
+	 */
+	public function toArray()
+	{
+		return (array)$this->collection;
+	}
+
+	/**
+	 * Retrieves an item
+	 *
+	 * @param $property
+	 *
+	 * @return mixed
+	 */
+	public function get($property)
+	{
+		if ($this->exists($property)) {
+			return $this->collection->$property;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Add or update an item
+	 *
+	 * @param $property
+	 * @param mixed $value
+	 */
+	public function set($property, $value)
+	{
+		if ($property) {
+			$this->collection->$property = $value;
+		}
+	}
+
+	/**
+	 * .. until I come with a better name..
+	 *
+	 * @param $property
+	 *
+	 * @return Collection
+	 */
+	public function filter($property)
+	{
+		if ($this->exists($property)) {
+			$data = $this->get($property);
+
+			if (!is_a($data, 'Collection')) {
+				$data = new Collection($data);
+			}
+
+			return $data;
+		}
+
+		return new Collection([]);
+	}
+
+	/**
+	 * Checks whether an item within the collection
+	 *
+	 * @param $property
+	 *
+	 * @return bool
+	 */
+	public function exists($property)
+	{
+		return property_exists($this->collection, $property);
+	}
+
+	/**
+	 * Finds whether the collection is empty
+	 *
+	 * @return bool
+	 */
+	public function isEmpty()
+	{
+		return !(bool)$this->count();
+	}
+
+	/**
+	 * Count all items in collection
+	 *
+	 * @return int
+	 */
+	public function count()
+	{
+		return count($this->properties());
+	}
+
+	/**
+	 * Returns all items properties names
+	 *
+	 * @return array
+	 */
+	public function properties()
+	{
+		$properties = [];
+
+		foreach ($this->collection as $key => $value) {
+			$properties[] = $key;
+		}
+
+		return $properties;
+	}
+
+	/**
+	 * Returns all items values
+	 *
+	 * @return array
+	 */
+	public function values()
+	{
+		$values = [];
+
+		foreach ($this->collection as $value) {
+			$values[] = $value;
+		}
+
+		return $values;
+	}
 }

src/HttpClient/Guzzle.php

Indentation +240 added lines, -240 removed lines

@@ -33,244 +33,244 @@
  */
 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 'PATCH':
-                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 'PATCH':
+				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/Provider/Google.php

Indentation +150 added lines, -150 removed lines

@@ -46,154 +46,154 @@
  */
 class Google extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    // phpcs:ignore
-    protected $scope = 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://www.googleapis.com/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://accounts.google.com/o/oauth2/v2/auth';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://oauth2.googleapis.com/token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developers.google.com/identity/protocols/OAuth2';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-
-        $this->AuthorizeUrlParameters += [
-            'access_type' => 'offline'
-        ];
-
-        if ($this->isRefreshTokenAvailable()) {
-            $this->tokenRefreshParameters += [
-                'client_id' => $this->clientId,
-                'client_secret' => $this->clientSecret
-            ];
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * See: https://developers.google.com/identity/protocols/OpenIDConnect#obtainuserinfo
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('oauth2/v3/userinfo');
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('sub')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new User\Profile();
-
-        $userProfile->identifier = $data->get('sub');
-        $userProfile->firstName = $data->get('given_name');
-        $userProfile->lastName = $data->get('family_name');
-        $userProfile->displayName = $data->get('name');
-        $userProfile->photoURL = $data->get('picture');
-        $userProfile->profileURL = $data->get('profile');
-        $userProfile->gender = $data->get('gender');
-        $userProfile->language = $data->get('locale');
-        $userProfile->email = $data->get('email');
-
-        $userProfile->emailVerified = $data->get('email_verified') ? $userProfile->email : '';
-
-        if ($this->config->get('photo_size')) {
-            $userProfile->photoURL .= '?sz=' . $this->config->get('photo_size');
-        }
-
-        return $userProfile;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserContacts($parameters = [])
-    {
-        $parameters = ['max-results' => 500] + $parameters;
-
-        // Google Gmail and Android contacts
-        if (false !== strpos($this->scope, '/m8/feeds/') || false !== strpos($this->scope, '/auth/contacts.readonly')) {
-            return $this->getGmailContacts($parameters);
-        }
-
-        return [];
-    }
-
-    /**
-     * Retrieve Gmail contacts
-     *
-     * @param array $parameters
-     *
-     * @return array
-     *
-     * @throws \Exception
-     */
-    protected function getGmailContacts($parameters = [])
-    {
-        $url = 'https://www.google.com/m8/feeds/contacts/default/full?'
-            . http_build_query(array_replace(['alt' => 'json', 'v' => '3.0'], (array)$parameters));
-
-        $response = $this->apiRequest($url);
-
-        if (!$response) {
-            return [];
-        }
-
-        $contacts = [];
-
-        if (isset($response->feed->entry)) {
-            foreach ($response->feed->entry as $idx => $entry) {
-                $uc = new User\Contact();
-
-                $uc->email = isset($entry->{'gd$email'}[0]->address)
-                    ? (string)$entry->{'gd$email'}[0]->address
-                    : '';
-
-                $uc->displayName = isset($entry->title->{'$t'}) ? (string)$entry->title->{'$t'} : '';
-                $uc->identifier = ($uc->email != '') ? $uc->email : '';
-                $uc->description = '';
-
-                if (property_exists($response, 'website')) {
-                    if (is_array($response->website)) {
-                        foreach ($response->website as $w) {
-                            if ($w->primary == true) {
-                                $uc->webSiteURL = $w->value;
-                            }
-                        }
-                    } else {
-                        $uc->webSiteURL = $response->website->value;
-                    }
-                } else {
-                    $uc->webSiteURL = '';
-                }
-
-                $contacts[] = $uc;
-            }
-        }
-
-        return $contacts;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	// phpcs:ignore
+	protected $scope = 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://www.googleapis.com/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://accounts.google.com/o/oauth2/v2/auth';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://oauth2.googleapis.com/token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developers.google.com/identity/protocols/OAuth2';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+
+		$this->AuthorizeUrlParameters += [
+			'access_type' => 'offline'
+		];
+
+		if ($this->isRefreshTokenAvailable()) {
+			$this->tokenRefreshParameters += [
+				'client_id' => $this->clientId,
+				'client_secret' => $this->clientSecret
+			];
+		}
+	}
+
+	/**
+	 * {@inheritdoc}
+	 *
+	 * See: https://developers.google.com/identity/protocols/OpenIDConnect#obtainuserinfo
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('oauth2/v3/userinfo');
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('sub')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new User\Profile();
+
+		$userProfile->identifier = $data->get('sub');
+		$userProfile->firstName = $data->get('given_name');
+		$userProfile->lastName = $data->get('family_name');
+		$userProfile->displayName = $data->get('name');
+		$userProfile->photoURL = $data->get('picture');
+		$userProfile->profileURL = $data->get('profile');
+		$userProfile->gender = $data->get('gender');
+		$userProfile->language = $data->get('locale');
+		$userProfile->email = $data->get('email');
+
+		$userProfile->emailVerified = $data->get('email_verified') ? $userProfile->email : '';
+
+		if ($this->config->get('photo_size')) {
+			$userProfile->photoURL .= '?sz=' . $this->config->get('photo_size');
+		}
+
+		return $userProfile;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserContacts($parameters = [])
+	{
+		$parameters = ['max-results' => 500] + $parameters;
+
+		// Google Gmail and Android contacts
+		if (false !== strpos($this->scope, '/m8/feeds/') || false !== strpos($this->scope, '/auth/contacts.readonly')) {
+			return $this->getGmailContacts($parameters);
+		}
+
+		return [];
+	}
+
+	/**
+	 * Retrieve Gmail contacts
+	 *
+	 * @param array $parameters
+	 *
+	 * @return array
+	 *
+	 * @throws \Exception
+	 */
+	protected function getGmailContacts($parameters = [])
+	{
+		$url = 'https://www.google.com/m8/feeds/contacts/default/full?'
+			. http_build_query(array_replace(['alt' => 'json', 'v' => '3.0'], (array)$parameters));
+
+		$response = $this->apiRequest($url);
+
+		if (!$response) {
+			return [];
+		}
+
+		$contacts = [];
+
+		if (isset($response->feed->entry)) {
+			foreach ($response->feed->entry as $idx => $entry) {
+				$uc = new User\Contact();
+
+				$uc->email = isset($entry->{'gd$email'}[0]->address)
+					? (string)$entry->{'gd$email'}[0]->address
+					: '';
+
+				$uc->displayName = isset($entry->title->{'$t'}) ? (string)$entry->title->{'$t'} : '';
+				$uc->identifier = ($uc->email != '') ? $uc->email : '';
+				$uc->description = '';
+
+				if (property_exists($response, 'website')) {
+					if (is_array($response->website)) {
+						foreach ($response->website as $w) {
+							if ($w->primary == true) {
+								$uc->webSiteURL = $w->value;
+							}
+						}
+					} else {
+						$uc->webSiteURL = $response->website->value;
+					}
+				} else {
+					$uc->webSiteURL = '';
+				}
+
+				$contacts[] = $uc;
+			}
+		}
+
+		return $contacts;
+	}
 }

src/Provider/Amazon.php

Indentation +49 added lines, -49 removed lines

@@ -17,65 +17,65 @@
  */
 class Amazon extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'profile';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'profile';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://api.amazon.com/';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://api.amazon.com/';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://www.amazon.com/ap/oa';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://www.amazon.com/ap/oa';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://api.amazon.com/auth/o2/token';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://api.amazon.com/auth/o2/token';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developer.amazon.com/docs/login-with-amazon/documentation-overview.html';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developer.amazon.com/docs/login-with-amazon/documentation-overview.html';
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
 
-        if ($this->isRefreshTokenAvailable()) {
-            $this->tokenRefreshParameters += [
-                'client_id' => $this->clientId,
-                'client_secret' => $this->clientSecret,
-            ];
-        }
-    }
+		if ($this->isRefreshTokenAvailable()) {
+			$this->tokenRefreshParameters += [
+				'client_id' => $this->clientId,
+				'client_secret' => $this->clientSecret,
+			];
+		}
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('user/profile');
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('user/profile');
 
-        $data = new Data\Collection($response);
+		$data = new Data\Collection($response);
 
-        if (!$data->exists('user_id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
+		if (!$data->exists('user_id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
 
-        $userProfile = new User\Profile();
+		$userProfile = new User\Profile();
 
-        $userProfile->identifier = $data->get('user_id');
-        $userProfile->displayName = $data->get('name');
-        $userProfile->email = $data->get('email');
+		$userProfile->identifier = $data->get('user_id');
+		$userProfile->displayName = $data->get('name');
+		$userProfile->email = $data->get('email');
 
-        return $userProfile;
-    }
+		return $userProfile;
+	}
 }

src/Provider/Facebook.php

Indentation +402 added lines, -402 removed lines

@@ -45,407 +45,407 @@
  */
 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 maintainToken()
-    {
-        if (!$this->isConnected()) {
-            return;
-        }
-
-        // 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();
-            }
-        }
-    }
-
-    /**
-     * 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 maintainToken()
+	{
+		if (!$this->isConnected()) {
+			return;
+		}
+
+		// 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();
+			}
+		}
+	}
+
+	/**
+	 * 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/Spotify.php

Indentation +73 added lines, -73 removed lines

@@ -17,77 +17,77 @@
  */
 class Spotify extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'user-read-email';
-
-    /**
-     * {@inheritdoc}
-     */
-    public $apiBaseUrl = 'https://api.spotify.com/v1/';
-
-    /**
-     * {@inheritdoc}
-     */
-    public $authorizeUrl = 'https://accounts.spotify.com/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://accounts.spotify.com/api/token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://developer.spotify.com/documentation/general/guides/authorization-guide/';
-
-    /**
-     * {@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('display_name');
-        $userProfile->email = $data->get('email');
-        $userProfile->emailVerified = $data->get('email');
-        $userProfile->profileURL = $data->filter('external_urls')->get('spotify');
-        $userProfile->photoURL = $data->filter('images')->get('url');
-        $userProfile->country = $data->get('country');
-
-        if ($data->exists('birthdate')) {
-            $this->fetchBirthday($userProfile, $data->get('birthdate'));
-        }
-
-        return $userProfile;
-    }
-
-    /**
-     * Fetch use birthday
-     *
-     * @param User\Profile $userProfile
-     * @param              $birthday
-     *
-     * @return User\Profile
-     */
-    protected function fetchBirthday(User\Profile $userProfile, $birthday)
-    {
-        $result = (new Data\Parser())->parseBirthday($birthday);
-
-        $userProfile->birthDay = (int)$result[0];
-        $userProfile->birthMonth = (int)$result[1];
-        $userProfile->birthYear = (int)$result[2];
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'user-read-email';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public $apiBaseUrl = 'https://api.spotify.com/v1/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public $authorizeUrl = 'https://accounts.spotify.com/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://accounts.spotify.com/api/token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://developer.spotify.com/documentation/general/guides/authorization-guide/';
+
+	/**
+	 * {@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('display_name');
+		$userProfile->email = $data->get('email');
+		$userProfile->emailVerified = $data->get('email');
+		$userProfile->profileURL = $data->filter('external_urls')->get('spotify');
+		$userProfile->photoURL = $data->filter('images')->get('url');
+		$userProfile->country = $data->get('country');
+
+		if ($data->exists('birthdate')) {
+			$this->fetchBirthday($userProfile, $data->get('birthdate'));
+		}
+
+		return $userProfile;
+	}
+
+	/**
+	 * Fetch use birthday
+	 *
+	 * @param User\Profile $userProfile
+	 * @param              $birthday
+	 *
+	 * @return User\Profile
+	 */
+	protected function fetchBirthday(User\Profile $userProfile, $birthday)
+	{
+		$result = (new Data\Parser())->parseBirthday($birthday);
+
+		$userProfile->birthDay = (int)$result[0];
+		$userProfile->birthMonth = (int)$result[1];
+		$userProfile->birthYear = (int)$result[2];
+
+		return $userProfile;
+	}
 }

src/Provider/Seznam.php

Indentation +43 added lines, -43 removed lines

@@ -17,47 +17,47 @@
  */
 class Seznam extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://login.szn.cz/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://login.szn.cz/api/v1/oauth/auth';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://login.szn.cz/api/v1/oauth/token';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = 'https://vyvojari.seznam.cz/oauth/doc';
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $response = $this->apiRequest('api/v1/user', 'GET', ['format' => 'json']);
-
-        $data = new Data\Collection($response);
-
-        if (!$data->exists('oauth_user_id')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $userProfile = new User\Profile();
-
-        $userProfile->identifier = $data->get('oauth_user_id');
-        $userProfile->email = $data->get('account_name');
-        $userProfile->firstName = $data->get('firstname');
-        $userProfile->lastName = $data->get('lastname');
-        $userProfile->photoURL = $data->get('avatar_url');
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://login.szn.cz/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://login.szn.cz/api/v1/oauth/auth';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://login.szn.cz/api/v1/oauth/token';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = 'https://vyvojari.seznam.cz/oauth/doc';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$response = $this->apiRequest('api/v1/user', 'GET', ['format' => 'json']);
+
+		$data = new Data\Collection($response);
+
+		if (!$data->exists('oauth_user_id')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$userProfile = new User\Profile();
+
+		$userProfile->identifier = $data->get('oauth_user_id');
+		$userProfile->email = $data->get('account_name');
+		$userProfile->firstName = $data->get('firstname');
+		$userProfile->lastName = $data->get('lastname');
+		$userProfile->photoURL = $data->get('avatar_url');
+
+		return $userProfile;
+	}
 }

src/Data/Parser.php

Indentation +100 added lines, -100 removed lines

@@ -15,104 +15,104 @@
  */
 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
-     *
-     * @return array
-     */
-    public function parseBirthday($birthday)
-    {
-        $birthday = date_parse((string) $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
+	 *
+	 * @return array
+	 */
+	public function parseBirthday($birthday)
+	{
+		$birthday = date_parse((string) $birthday);
+
+		return [$birthday['year'], $birthday['month'], $birthday['day']];
+	}
 }

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((string)$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((string)$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;
+	}
 }