hybridauth / hybridauth

src/Provider/QQ.php

Indentation +122 added lines, -122 removed lines

@@ -12,127 +12,127 @@
  */
 class QQ extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'get_user_info';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiBaseUrl = 'https://graph.qq.com/oauth2.0/';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $authorizeUrl = 'https://graph.qq.com/oauth2.0/authorize';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $accessTokenUrl = 'https://graph.qq.com/oauth2.0/token';
-
-    /**
-     * {@ịnheritdoc}
-     */
-    protected $accessTokenInfoUrl = 'https://graph.qq.com/oauth2.0/me';
-
-    /**
-     * User Information Endpoint
-     * @var string
-     */
-    protected $accessUserInfo = 'https://graph.qq.com/user/get_user_info';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $tokenExchangeMethod = 'GET';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $tokenRefreshMethod = 'GET';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $apiDocumentation = ''; // Not available
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $responseDataFormat = 'json';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'get_user_info';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiBaseUrl = 'https://graph.qq.com/oauth2.0/';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $authorizeUrl = 'https://graph.qq.com/oauth2.0/authorize';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $accessTokenUrl = 'https://graph.qq.com/oauth2.0/token';
+
+	/**
+	 * {@ịnheritdoc}
+	 */
+	protected $accessTokenInfoUrl = 'https://graph.qq.com/oauth2.0/me';
+
+	/**
+	 * User Information Endpoint
+	 * @var string
+	 */
+	protected $accessUserInfo = 'https://graph.qq.com/user/get_user_info';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $tokenExchangeMethod = 'GET';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $tokenRefreshMethod = 'GET';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $apiDocumentation = ''; // Not available
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $responseDataFormat = 'json';
     
-    /**
-     * {@inheritdoc}
-     */
-    protected function initialize()
-    {
-        parent::initialize();
-
-        if ($this->isRefreshTokenAvailable()) {
-            $this->tokenRefreshParameters += [
-                'client_id' => $this->clientId,
-                'client_secret' => $this->clientSecret,
-            ];
-        }
-
-        $this->apiRequestParameters = [
-            'access_token' => $this->getStoredData('access_token'),
-            'fmt' => $this>responseDataFormat
-        ];
-
-        $this->apiRequestHeaders = [];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function validateAccessTokenExchange($response)
-    {
-        $collection = parent::validateAccessTokenExchange($response);
-
-        $resp = $this->apiRequest($this->accessTokenInfoUrl);
-
-        if (!isset($resp->openid)) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $this->storeData('openid', $resp->openid);
-
-        return $collection;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getUserProfile()
-    {
-        $openid = $this->getStoredData('openid');
-
-        $userRequestParameters = [
-            'oauth_consumer_key' => $this->clientId,
-            'openid' => $openid,
-            'format' => $this>responseDataFormat
-        ];
-
-        $response = $this->apiRequest($this->accessUserInfo, 'GET', $userRequestParameters);
-
-        $data = new Data\Collection($response);
-
-        if ($data->get('ret') < 0) {
-            throw new UnexpectedApiResponseException('Provider API returned an error: ' . $data->get('msg'));
-        }
-
-        $userProfile = new Profile();
-
-        $userProfile->identifier = $openid;
-        $userProfile->displayName = $data->get('nickname');
-        $userProfile->photoURL = $data->get('figureurl_2');
-        $userProfile->gender = $data->get('gender');
-        $userProfile->region = $data->get('province');
-        $userProfile->city = $data->get('city');
-
-        return $userProfile;
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function initialize()
+	{
+		parent::initialize();
+
+		if ($this->isRefreshTokenAvailable()) {
+			$this->tokenRefreshParameters += [
+				'client_id' => $this->clientId,
+				'client_secret' => $this->clientSecret,
+			];
+		}
+
+		$this->apiRequestParameters = [
+			'access_token' => $this->getStoredData('access_token'),
+			'fmt' => $this>responseDataFormat
+		];
+
+		$this->apiRequestHeaders = [];
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function validateAccessTokenExchange($response)
+	{
+		$collection = parent::validateAccessTokenExchange($response);
+
+		$resp = $this->apiRequest($this->accessTokenInfoUrl);
+
+		if (!isset($resp->openid)) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$this->storeData('openid', $resp->openid);
+
+		return $collection;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getUserProfile()
+	{
+		$openid = $this->getStoredData('openid');
+
+		$userRequestParameters = [
+			'oauth_consumer_key' => $this->clientId,
+			'openid' => $openid,
+			'format' => $this>responseDataFormat
+		];
+
+		$response = $this->apiRequest($this->accessUserInfo, 'GET', $userRequestParameters);
+
+		$data = new Data\Collection($response);
+
+		if ($data->get('ret') < 0) {
+			throw new UnexpectedApiResponseException('Provider API returned an error: ' . $data->get('msg'));
+		}
+
+		$userProfile = new Profile();
+
+		$userProfile->identifier = $openid;
+		$userProfile->displayName = $data->get('nickname');
+		$userProfile->photoURL = $data->get('figureurl_2');
+		$userProfile->gender = $data->get('gender');
+		$userProfile->region = $data->get('province');
+		$userProfile->city = $data->get('city');
+
+		return $userProfile;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -79,7 +79,7 @@ 
 
         $this->apiRequestParameters = [
             'access_token' => $this->getStoredData('access_token'),
-            'fmt' => $this>responseDataFormat
+            'fmt' => $this > responseDataFormat
         ];
 
         $this->apiRequestHeaders = [];
@@ -94,7 +94,7 @@ 
 
         $resp = $this->apiRequest($this->accessTokenInfoUrl);
 
-        if (!isset($resp->openid)) {
+        if ( ! isset($resp->openid)) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -113,7 +113,7 @@ 
         $userRequestParameters = [
             'oauth_consumer_key' => $this->clientId,
             'openid' => $openid,
-            'format' => $this>responseDataFormat
+            'format' => $this > responseDataFormat
         ];
 
         $response = $this->apiRequest($this->accessUserInfo, 'GET', $userRequestParameters);
@@ -121,7 +121,7 @@ 
         $data = new Data\Collection($response);
 
         if ($data->get('ret') < 0) {
-            throw new UnexpectedApiResponseException('Provider API returned an error: ' . $data->get('msg'));
+            throw new UnexpectedApiResponseException('Provider API returned an error: '.$data->get('msg'));
         }
 
         $userProfile = new Profile();

src/Provider/Facebook.php

Indentation +509 added lines, -509 removed lines

@@ -51,513 +51,513 @@
  */
 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()
-    {
-        return $this->getUserProfileFromOIDCToken() ?? $this->getUserProfileFromAccessToken();
-    }
-
-    /**
-     * Retrieve the user data from access token.
-     *
-     * @return \Hybridauth\User\Profile
-     */
-    public function getUserProfileFromAccessToken()
-    {
-        $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;
-    }
-
-    /**
-     * Get the user profile from OIDC token.
-     *
-     * @return \Hybridauth\User\Profile
-     */
-    public function getUserProfileFromOIDCToken()
-    {
-        $accessToken = $this->getStoredData('access_token');
-
-        $kid = $this->getKidFromOLDCToken($accessToken);
-
-        if (!$kid) {
-            return null;
-        }
-
-        $clientId = $this->config->filter('keys')->get('id') ?: $this->config->filter('keys')->get('key');
-
-        if (!$clientId) {
-            throw new InvalidApplicationCredentialsException(
-                'Missing parameter id: your client id is required to generate the JWS token.'
-            );
-        }
-
-        $response = $this->apiRequest('https://www.facebook.com/.well-known/oauth/openid/jwks/');
-
-        $publicKeys = new Data\Collection($response);
-
-        if (!$publicKeys->exists('keys') || !$publicKeys->get('keys')) {
-            throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
-        }
-
-        $filteredKeys = array_filter($publicKeys->get('keys'), function ($k) use ($kid) {
-            return $k->kid === $kid;
-        });
-
-        if (empty($filteredKeys)) {
-            throw new UnexpectedValueException('Unable to find key with kid: ' . $kid);
-        }
-
-        $jwk = array_shift($filteredKeys);
-
-        $keyData = [
-            'e' => new BigInteger(base64_decode($jwk->e), 256),
-            'n' => new BigInteger(base64_decode(strtr($jwk->n, '-_', '+/'), true), 256),
-        ];
-
-        $pem = (string) PublicKeyLoader::load($keyData)->withHash('sha1')->withMGFHash('sha1');
-
-        $payload = JWT::decode($accessToken, new Key($pem, $jwk->alg));
-
-        $data = new Data\Collection($payload);
-
-        if ($data->get('iss') !== 'https://www.facebook.com') {
-            throw new UnexpectedValueException('Invalid issuer');
-        } elseif ($data->get('aud') !== $clientId) {
-            throw new UnexpectedValueException('Invalid audience');
-        }
-
-        $userProfile = new User\Profile();
-        $userProfile->identifier = $data->get('sub');
-        $userProfile->email = $data->get('email');
-        $userProfile->firstName = $data->get('given_name');
-        $userProfile->lastName = $data->get('family_name');
-        $userProfile->displayName = $userProfile->firstName.' '.$userProfile->lastName;
-        $userProfile->photoURL = $data->get('picture');
-        // 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);
-        }
-
-        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 key ID from OIDC token.
-     *
-     * @param string $accessToken
-     * @return string|null
-     */
-    private function getKidFromOLDCToken(string $accessToken): ?string
-    {
-        $segments = explode('.', $accessToken);
-
-        if (count($segments) !== 3) {
-            return null;
-        }
-
-        $payload = json_decode(base64_decode($segments[0] ?? ''));
-
-        if (!is_object($payload) || $payload?->kid === null) {
-            return null;
-        }
-
-        return $payload->kid;
-    }
-
-    /**
-     * 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);
-    }
+	/**
+	 * {@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()
+	{
+		return $this->getUserProfileFromOIDCToken() ?? $this->getUserProfileFromAccessToken();
+	}
+
+	/**
+	 * Retrieve the user data from access token.
+	 *
+	 * @return \Hybridauth\User\Profile
+	 */
+	public function getUserProfileFromAccessToken()
+	{
+		$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;
+	}
+
+	/**
+	 * Get the user profile from OIDC token.
+	 *
+	 * @return \Hybridauth\User\Profile
+	 */
+	public function getUserProfileFromOIDCToken()
+	{
+		$accessToken = $this->getStoredData('access_token');
+
+		$kid = $this->getKidFromOLDCToken($accessToken);
+
+		if (!$kid) {
+			return null;
+		}
+
+		$clientId = $this->config->filter('keys')->get('id') ?: $this->config->filter('keys')->get('key');
+
+		if (!$clientId) {
+			throw new InvalidApplicationCredentialsException(
+				'Missing parameter id: your client id is required to generate the JWS token.'
+			);
+		}
+
+		$response = $this->apiRequest('https://www.facebook.com/.well-known/oauth/openid/jwks/');
+
+		$publicKeys = new Data\Collection($response);
+
+		if (!$publicKeys->exists('keys') || !$publicKeys->get('keys')) {
+			throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
+		}
+
+		$filteredKeys = array_filter($publicKeys->get('keys'), function ($k) use ($kid) {
+			return $k->kid === $kid;
+		});
+
+		if (empty($filteredKeys)) {
+			throw new UnexpectedValueException('Unable to find key with kid: ' . $kid);
+		}
+
+		$jwk = array_shift($filteredKeys);
+
+		$keyData = [
+			'e' => new BigInteger(base64_decode($jwk->e), 256),
+			'n' => new BigInteger(base64_decode(strtr($jwk->n, '-_', '+/'), true), 256),
+		];
+
+		$pem = (string) PublicKeyLoader::load($keyData)->withHash('sha1')->withMGFHash('sha1');
+
+		$payload = JWT::decode($accessToken, new Key($pem, $jwk->alg));
+
+		$data = new Data\Collection($payload);
+
+		if ($data->get('iss') !== 'https://www.facebook.com') {
+			throw new UnexpectedValueException('Invalid issuer');
+		} elseif ($data->get('aud') !== $clientId) {
+			throw new UnexpectedValueException('Invalid audience');
+		}
+
+		$userProfile = new User\Profile();
+		$userProfile->identifier = $data->get('sub');
+		$userProfile->email = $data->get('email');
+		$userProfile->firstName = $data->get('given_name');
+		$userProfile->lastName = $data->get('family_name');
+		$userProfile->displayName = $userProfile->firstName.' '.$userProfile->lastName;
+		$userProfile->photoURL = $data->get('picture');
+		// 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);
+		}
+
+		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 key ID from OIDC token.
+	 *
+	 * @param string $accessToken
+	 * @return string|null
+	 */
+	private function getKidFromOLDCToken(string $accessToken): ?string
+	{
+		$segments = explode('.', $accessToken);
+
+		if (count($segments) !== 3) {
+			return null;
+		}
+
+		$payload = json_decode(base64_decode($segments[0] ?? ''));
+
+		if (!is_object($payload) || $payload?->kid === null) {
+			return null;
+		}
+
+		return $payload->kid;
+	}
+
+	/**
+	 * 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);
+	}
 }

Spacing +27 added lines, -27 removed lines

@@ -100,7 +100,7 @@ 
      */
     public function maintainToken()
     {
-        if (!$this->isConnected()) {
+        if ( ! $this->isConnected()) {
             return;
         }
 
@@ -108,7 +108,7 @@ 
         $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)) {
+            if ( ! $this->hasAccessTokenExpired() && $this->hasAccessTokenExpired($projected_timestamp)) {
                 $this->exchangeAccessToken();
             }
         }
@@ -189,7 +189,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('id')) {
+        if ( ! $data->exists('id')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -215,8 +215,8 @@ 
 
         $photoSize = $this->config->get('photo_size') ?: '150';
 
-        $userProfile->photoURL = $this->apiBaseUrl . $userProfile->identifier;
-        $userProfile->photoURL .= '/picture?width=' . $photoSize . '&height=' . $photoSize;
+        $userProfile->photoURL = $this->apiBaseUrl.$userProfile->identifier;
+        $userProfile->photoURL .= '/picture?width='.$photoSize.'&height='.$photoSize;
 
         $userProfile->emailVerified = $userProfile->email;
 
@@ -238,13 +238,13 @@ 
 
         $kid = $this->getKidFromOLDCToken($accessToken);
 
-        if (!$kid) {
+        if ( ! $kid) {
             return null;
         }
 
         $clientId = $this->config->filter('keys')->get('id') ?: $this->config->filter('keys')->get('key');
 
-        if (!$clientId) {
+        if ( ! $clientId) {
             throw new InvalidApplicationCredentialsException(
                 'Missing parameter id: your client id is required to generate the JWS token.'
             );
@@ -254,16 +254,16 @@ 
 
         $publicKeys = new Data\Collection($response);
 
-        if (!$publicKeys->exists('keys') || !$publicKeys->get('keys')) {
+        if ( ! $publicKeys->exists('keys') || ! $publicKeys->get('keys')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
-        $filteredKeys = array_filter($publicKeys->get('keys'), function ($k) use ($kid) {
+        $filteredKeys = array_filter($publicKeys->get('keys'), function($k) use ($kid) {
             return $k->kid === $kid;
         });
 
         if (empty($filteredKeys)) {
-            throw new UnexpectedValueException('Unable to find key with kid: ' . $kid);
+            throw new UnexpectedValueException('Unable to find key with kid: '.$kid);
         }
 
         $jwk = array_shift($filteredKeys);
@@ -309,7 +309,7 @@ 
      */
     protected function fetchUserRegion(User\Profile $userProfile)
     {
-        if (!empty($userProfile->region)) {
+        if ( ! empty($userProfile->region)) {
             $regionArr = explode(',', $userProfile->region);
 
             if (count($regionArr) > 1) {
@@ -333,9 +333,9 @@ 
     {
         $result = (new Data\Parser())->parseBirthday($birthday);
 
-        $userProfile->birthYear = (int)$result[0];
-        $userProfile->birthMonth = (int)$result[1];
-        $userProfile->birthDay = (int)$result[2];
+        $userProfile->birthYear = (int) $result[0];
+        $userProfile->birthMonth = (int) $result[1];
+        $userProfile->birthDay = (int) $result[2];
 
         return $userProfile;
     }
@@ -358,11 +358,11 @@ 
 
             $data = new Data\Collection($response);
 
-            if (!$data->exists('data')) {
+            if ( ! $data->exists('data')) {
                 throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
             }
 
-            if (!$data->filter('data')->isEmpty()) {
+            if ( ! $data->filter('data')->isEmpty()) {
                 foreach ($data->filter('data')->toArray() as $item) {
                     $contacts[] = $this->fetchUserContact($item);
                 }
@@ -399,7 +399,7 @@ 
         $userContact->profileURL = $item->exists('link')
             ?: $this->getProfileUrl($userContact->identifier);
 
-        $userContact->photoURL = $this->apiBaseUrl . $userContact->identifier . '/picture?width=150&height=150';
+        $userContact->photoURL = $this->apiBaseUrl.$userContact->identifier.'/picture?width=150&height=150';
 
         return $userContact;
     }
@@ -418,11 +418,11 @@ 
 
         // Retrieve writable user pages and filter by given one.
         $pages = $this->getUserPages(true);
-        $pages = array_filter($pages, function ($page) use ($pageId) {
+        $pages = array_filter($pages, function($page) use ($pageId) {
             return $page->id == $pageId;
         });
 
-        if (!$pages) {
+        if ( ! $pages) {
             throw new InvalidArgumentException('Could not find a page with given id.');
         }
 
@@ -430,7 +430,7 @@ 
 
         // Use page access token instead of user access token.
         $headers = [
-            'Authorization' => 'Bearer ' . $page->access_token,
+            'Authorization' => 'Bearer '.$page->access_token,
         ];
 
         // Refresh proof for API call.
@@ -450,12 +450,12 @@ 
     {
         $pages = $this->apiRequest('me/accounts');
 
-        if (!$writable) {
+        if ( ! $writable) {
             return $pages->data;
         }
 
         // Filter user pages by CREATE_CONTENT permission.
-        return array_filter($pages->data, function ($page) {
+        return array_filter($pages->data, function($page) {
             return in_array('CREATE_CONTENT', $page->tasks);
         });
     }
@@ -471,7 +471,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('data')) {
+        if ( ! $data->exists('data')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -510,13 +510,13 @@ 
             $userActivity->text = $item->get('message');
         }
 
-        if (!empty($userActivity->text) && $item->exists('from')) {
+        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 = $this->apiBaseUrl.$userActivity->user->identifier;
             $userActivity->user->photoURL .= '/picture?width=150&height=150';
         }
 
@@ -539,7 +539,7 @@ 
 
         $payload = json_decode(base64_decode($segments[0] ?? ''));
 
-        if (!is_object($payload) || $payload?->kid === null) {
+        if ( ! is_object($payload) || $payload?->kid === null) {
             return null;
         }
 
@@ -554,7 +554,7 @@ 
      */
     protected function getProfileUrl($identity)
     {
-        if (!is_numeric($identity)) {
+        if ( ! is_numeric($identity)) {
             return null;
         }
 

src/Provider/MicrosoftGraph.php

Indentation +133 added lines, -133 removed lines

@@ -43,138 +43,138 @@
  */
 class MicrosoftGraph extends OAuth2
 {
-    /**
-     * {@inheritdoc}
-     */
-    protected $scope = 'openid user.read contacts.read offline_access';
-
-    /**
-     * {@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();
-
-        $this->AuthorizeUrlParameters += [
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $scope = 'openid user.read contacts.read offline_access';
+
+	/**
+	 * {@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();
+
+		$this->AuthorizeUrlParameters += [
 			'prompt' => 'consent',
-        ];
-
-        $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);
-        }
-
-        if ($this->isRefreshTokenAvailable()) {
-            $this->tokenRefreshParameters += [
-                'client_id' => $this->clientId,
-                'client_secret' => $this->clientSecret,
-            ];
-        }
-    }
-
-    /**
-     * {@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;
-    }
+		];
+
+		$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);
+		}
+
+		if ($this->isRefreshTokenAvailable()) {
+			$this->tokenRefreshParameters += [
+				'client_id' => $this->clientId,
+				'client_secret' => $this->clientSecret,
+			];
+		}
+	}
+
+	/**
+	 * {@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

@@ -80,10 +80,10 @@ 
         ];
 
         $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);
@@ -106,7 +106,7 @@ 
 
         $data = new Data\Collection($response);
 
-        if (!$data->exists('id')) {
+        if ( ! $data->exists('id')) {
             throw new UnexpectedApiResponseException('Provider API returned an unexpected response.');
         }
 
@@ -148,7 +148,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) {
@@ -157,11 +157,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/Hybridauth.php

Indentation +242 added lines, -242 removed lines

@@ -24,246 +24,246 @@
  */
 class Hybridauth
 {
-    /**
-     * Hybridauth config.
-     *
-     * @var array
-     */
-    protected $config;
-
-    /**
-     * Storage.
-     *
-     * @var StorageInterface
-     */
-    protected $storage;
-
-    /**
-     * HttpClient.
-     *
-     * @var HttpClientInterface
-     */
-    protected $httpClient;
-
-    /**
-     * Logger.
-     *
-     * @var LoggerInterface
-     */
-    protected $logger;
-
-    /**
-     * @param array|string $config Array with configuration or Path to PHP file that will return array
-     * @param HttpClientInterface $httpClient
-     * @param StorageInterface $storage
-     * @param LoggerInterface $logger
-     *
-     * @throws InvalidArgumentException
-     */
-    public function __construct(
-        $config,
-        HttpClientInterface $httpClient = null,
-        StorageInterface $storage = null,
-        LoggerInterface $logger = null
-    ) {
-        if (is_string($config) && file_exists($config)) {
-            $config = include $config;
-        } elseif (!is_array($config)) {
-            throw new InvalidArgumentException('Hybridauth config does not exist on the given path.');
-        }
-
-        $this->config = $config + [
-                'debug_mode' => Logger::NONE,
-                'debug_file' => '',
-                'curl_options' => null,
-                'providers' => []
-            ];
-        $this->storage = $storage;
-        $this->logger = $logger;
-        $this->httpClient = $httpClient;
-    }
-
-    /**
-     * Instantiate the given provider and authentication or authorization protocol.
-     *
-     * If not authenticated yet, the user will be redirected to the provider's site for
-     * authentication/authorisation, otherwise it will simply return an instance of
-     * provider's adapter.
-     *
-     * @param string $name adapter's name (case insensitive)
-     *
-     * @return \Hybridauth\Adapter\AdapterInterface
-     * @throws InvalidArgumentException
-     * @throws UnexpectedValueException
-     */
-    public function authenticate($name)
-    {
-        $adapter = $this->getAdapter($name);
-
-        $adapter->authenticate();
-
-        return $adapter;
-    }
-
-    /**
-     * Returns a new instance of a provider's adapter by name
-     *
-     * @param string $name adapter's name (case insensitive)
-     *
-     * @return \Hybridauth\Adapter\AdapterInterface
-     * @throws InvalidArgumentException
-     * @throws UnexpectedValueException
-     */
-    public function getAdapter($name)
-    {
-        $config = $this->getProviderConfig($name);
-
-        $adapter = isset($config['adapter']) ? $config['adapter'] : sprintf('Hybridauth\\Provider\\%s', $name);
-
-        if (!class_exists($adapter)) {
-            $unexistingConfiguredAdapter = $adapter;
-            $adapter = null;
-            $fs = new \FilesystemIterator(__DIR__ . '/Provider/');
-            /** @var \SplFileInfo $file */
-            foreach ($fs as $file) {
-                if (!$file->isDir()) {
-                    $provider = strtok($file->getFilename(), '.');
-                    if (mb_strtolower($name) === mb_strtolower($provider)) {
-                        $adapter = sprintf('Hybridauth\\Provider\\%s', $provider);
-                        break;
-                    }
-                }
-            }
-            if ($adapter === null) {
-                throw new InvalidArgumentException("Unknown Provider (name: $name / configured: $unexistingConfiguredAdapter).");
-            }
-        }
-
-        return new $adapter($config, $this->httpClient, $this->storage, $this->logger);
-    }
-
-    /**
-     * Get provider config by name.
-     *
-     * @param string $name adapter's name (case insensitive)
-     *
-     * @throws UnexpectedValueException
-     * @throws InvalidArgumentException
-     *
-     * @return array
-     */
-    public function getProviderConfig($name)
-    {
-        $name = strtolower($name);
-
-        $providersConfig = array_change_key_case($this->config['providers'], CASE_LOWER);
-
-        if (!isset($providersConfig[$name])) {
-            throw new InvalidArgumentException('Unknown Provider.');
-        }
-
-        if (!$providersConfig[$name]['enabled']) {
-            throw new UnexpectedValueException('Disabled Provider.');
-        }
-
-        $config = $providersConfig[$name];
-        $config += [
-            'debug_mode' => $this->config['debug_mode'],
-            'debug_file' => $this->config['debug_file'],
-        ];
-
-        if (!isset($config['callback']) && isset($this->config['callback'])) {
-            $config['callback'] = $this->config['callback'];
-        }
-
-        return $config;
-    }
-
-    /**
-     * Returns a boolean of whether the user is connected with a provider
-     *
-     * @param string $name adapter's name (case insensitive)
-     *
-     * @return bool
-     * @throws InvalidArgumentException
-     * @throws UnexpectedValueException
-     */
-    public function isConnectedWith($name)
-    {
-        return $this->getAdapter($name)->isConnected();
-    }
-
-    /**
-     * Returns a list of enabled adapters names
-     *
-     * @return array
-     */
-    public function getProviders()
-    {
-        $providers = [];
-
-        foreach ($this->config['providers'] as $name => $config) {
-            if ($config['enabled']) {
-                $providers[] = $name;
-            }
-        }
-
-        return $providers;
-    }
-
-    /**
-     * Returns a list of currently connected adapters names
-     *
-     * @return array
-     * @throws InvalidArgumentException
-     * @throws UnexpectedValueException
-     */
-    public function getConnectedProviders()
-    {
-        $providers = [];
-
-        foreach ($this->getProviders() as $name) {
-            if ($this->isConnectedWith($name)) {
-                $providers[] = $name;
-            }
-        }
-
-        return $providers;
-    }
-
-    /**
-     * Returns a list of new instances of currently connected adapters
-     *
-     * @return \Hybridauth\Adapter\AdapterInterface[]
-     * @throws InvalidArgumentException
-     * @throws UnexpectedValueException
-     */
-    public function getConnectedAdapters()
-    {
-        $adapters = [];
-
-        foreach ($this->getProviders() as $name) {
-            $adapter = $this->getAdapter($name);
-
-            if ($adapter->isConnected()) {
-                $adapters[$name] = $adapter;
-            }
-        }
-
-        return $adapters;
-    }
-
-    /**
-     * Disconnect all currently connected adapters at once
-     */
-    public function disconnectAllAdapters()
-    {
-        foreach ($this->getProviders() as $name) {
-            $adapter = $this->getAdapter($name);
-
-            if ($adapter->isConnected()) {
-                $adapter->disconnect();
-            }
-        }
-    }
+	/**
+	 * Hybridauth config.
+	 *
+	 * @var array
+	 */
+	protected $config;
+
+	/**
+	 * Storage.
+	 *
+	 * @var StorageInterface
+	 */
+	protected $storage;
+
+	/**
+	 * HttpClient.
+	 *
+	 * @var HttpClientInterface
+	 */
+	protected $httpClient;
+
+	/**
+	 * Logger.
+	 *
+	 * @var LoggerInterface
+	 */
+	protected $logger;
+
+	/**
+	 * @param array|string $config Array with configuration or Path to PHP file that will return array
+	 * @param HttpClientInterface $httpClient
+	 * @param StorageInterface $storage
+	 * @param LoggerInterface $logger
+	 *
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct(
+		$config,
+		HttpClientInterface $httpClient = null,
+		StorageInterface $storage = null,
+		LoggerInterface $logger = null
+	) {
+		if (is_string($config) && file_exists($config)) {
+			$config = include $config;
+		} elseif (!is_array($config)) {
+			throw new InvalidArgumentException('Hybridauth config does not exist on the given path.');
+		}
+
+		$this->config = $config + [
+				'debug_mode' => Logger::NONE,
+				'debug_file' => '',
+				'curl_options' => null,
+				'providers' => []
+			];
+		$this->storage = $storage;
+		$this->logger = $logger;
+		$this->httpClient = $httpClient;
+	}
+
+	/**
+	 * Instantiate the given provider and authentication or authorization protocol.
+	 *
+	 * If not authenticated yet, the user will be redirected to the provider's site for
+	 * authentication/authorisation, otherwise it will simply return an instance of
+	 * provider's adapter.
+	 *
+	 * @param string $name adapter's name (case insensitive)
+	 *
+	 * @return \Hybridauth\Adapter\AdapterInterface
+	 * @throws InvalidArgumentException
+	 * @throws UnexpectedValueException
+	 */
+	public function authenticate($name)
+	{
+		$adapter = $this->getAdapter($name);
+
+		$adapter->authenticate();
+
+		return $adapter;
+	}
+
+	/**
+	 * Returns a new instance of a provider's adapter by name
+	 *
+	 * @param string $name adapter's name (case insensitive)
+	 *
+	 * @return \Hybridauth\Adapter\AdapterInterface
+	 * @throws InvalidArgumentException
+	 * @throws UnexpectedValueException
+	 */
+	public function getAdapter($name)
+	{
+		$config = $this->getProviderConfig($name);
+
+		$adapter = isset($config['adapter']) ? $config['adapter'] : sprintf('Hybridauth\\Provider\\%s', $name);
+
+		if (!class_exists($adapter)) {
+			$unexistingConfiguredAdapter = $adapter;
+			$adapter = null;
+			$fs = new \FilesystemIterator(__DIR__ . '/Provider/');
+			/** @var \SplFileInfo $file */
+			foreach ($fs as $file) {
+				if (!$file->isDir()) {
+					$provider = strtok($file->getFilename(), '.');
+					if (mb_strtolower($name) === mb_strtolower($provider)) {
+						$adapter = sprintf('Hybridauth\\Provider\\%s', $provider);
+						break;
+					}
+				}
+			}
+			if ($adapter === null) {
+				throw new InvalidArgumentException("Unknown Provider (name: $name / configured: $unexistingConfiguredAdapter).");
+			}
+		}
+
+		return new $adapter($config, $this->httpClient, $this->storage, $this->logger);
+	}
+
+	/**
+	 * Get provider config by name.
+	 *
+	 * @param string $name adapter's name (case insensitive)
+	 *
+	 * @throws UnexpectedValueException
+	 * @throws InvalidArgumentException
+	 *
+	 * @return array
+	 */
+	public function getProviderConfig($name)
+	{
+		$name = strtolower($name);
+
+		$providersConfig = array_change_key_case($this->config['providers'], CASE_LOWER);
+
+		if (!isset($providersConfig[$name])) {
+			throw new InvalidArgumentException('Unknown Provider.');
+		}
+
+		if (!$providersConfig[$name]['enabled']) {
+			throw new UnexpectedValueException('Disabled Provider.');
+		}
+
+		$config = $providersConfig[$name];
+		$config += [
+			'debug_mode' => $this->config['debug_mode'],
+			'debug_file' => $this->config['debug_file'],
+		];
+
+		if (!isset($config['callback']) && isset($this->config['callback'])) {
+			$config['callback'] = $this->config['callback'];
+		}
+
+		return $config;
+	}
+
+	/**
+	 * Returns a boolean of whether the user is connected with a provider
+	 *
+	 * @param string $name adapter's name (case insensitive)
+	 *
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 * @throws UnexpectedValueException
+	 */
+	public function isConnectedWith($name)
+	{
+		return $this->getAdapter($name)->isConnected();
+	}
+
+	/**
+	 * Returns a list of enabled adapters names
+	 *
+	 * @return array
+	 */
+	public function getProviders()
+	{
+		$providers = [];
+
+		foreach ($this->config['providers'] as $name => $config) {
+			if ($config['enabled']) {
+				$providers[] = $name;
+			}
+		}
+
+		return $providers;
+	}
+
+	/**
+	 * Returns a list of currently connected adapters names
+	 *
+	 * @return array
+	 * @throws InvalidArgumentException
+	 * @throws UnexpectedValueException
+	 */
+	public function getConnectedProviders()
+	{
+		$providers = [];
+
+		foreach ($this->getProviders() as $name) {
+			if ($this->isConnectedWith($name)) {
+				$providers[] = $name;
+			}
+		}
+
+		return $providers;
+	}
+
+	/**
+	 * Returns a list of new instances of currently connected adapters
+	 *
+	 * @return \Hybridauth\Adapter\AdapterInterface[]
+	 * @throws InvalidArgumentException
+	 * @throws UnexpectedValueException
+	 */
+	public function getConnectedAdapters()
+	{
+		$adapters = [];
+
+		foreach ($this->getProviders() as $name) {
+			$adapter = $this->getAdapter($name);
+
+			if ($adapter->isConnected()) {
+				$adapters[$name] = $adapter;
+			}
+		}
+
+		return $adapters;
+	}
+
+	/**
+	 * Disconnect all currently connected adapters at once
+	 */
+	public function disconnectAllAdapters()
+	{
+		foreach ($this->getProviders() as $name) {
+			$adapter = $this->getAdapter($name);
+
+			if ($adapter->isConnected()) {
+				$adapter->disconnect();
+			}
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -68,7 +68,7 @@ 
     ) {
         if (is_string($config) && file_exists($config)) {
             $config = include $config;
-        } elseif (!is_array($config)) {
+        } elseif ( ! is_array($config)) {
             throw new InvalidArgumentException('Hybridauth config does not exist on the given path.');
         }
 
@@ -120,13 +120,13 @@ 
 
         $adapter = isset($config['adapter']) ? $config['adapter'] : sprintf('Hybridauth\\Provider\\%s', $name);
 
-        if (!class_exists($adapter)) {
+        if ( ! class_exists($adapter)) {
             $unexistingConfiguredAdapter = $adapter;
             $adapter = null;
-            $fs = new \FilesystemIterator(__DIR__ . '/Provider/');
+            $fs = new \FilesystemIterator(__DIR__.'/Provider/');
             /** @var \SplFileInfo $file */
             foreach ($fs as $file) {
-                if (!$file->isDir()) {
+                if ( ! $file->isDir()) {
                     $provider = strtok($file->getFilename(), '.');
                     if (mb_strtolower($name) === mb_strtolower($provider)) {
                         $adapter = sprintf('Hybridauth\\Provider\\%s', $provider);
@@ -158,11 +158,11 @@ 
 
         $providersConfig = array_change_key_case($this->config['providers'], CASE_LOWER);
 
-        if (!isset($providersConfig[$name])) {
+        if ( ! isset($providersConfig[$name])) {
             throw new InvalidArgumentException('Unknown Provider.');
         }
 
-        if (!$providersConfig[$name]['enabled']) {
+        if ( ! $providersConfig[$name]['enabled']) {
             throw new UnexpectedValueException('Disabled Provider.');
         }
 
@@ -172,7 +172,7 @@ 
             'debug_file' => $this->config['debug_file'],
         ];
 
-        if (!isset($config['callback']) && isset($this->config['callback'])) {
+        if ( ! isset($config['callback']) && isset($this->config['callback'])) {
             $config['callback'] = $this->config['callback'];
         }