Upated twitter provider

src/Auth/CollectionFactory.php

@@ -20,7 +20,7 @@ class CollectionFactory implements FactoryInterface
      */
     protected $providers = [
         // OAuth1
-        OAuth1\Provider\Twitter::NAME       => OAuth1\Provider\Twitter::class,
+        OAuth2\Provider\Twitter::NAME       => OAuth2\Provider\Twitter::class,
         OAuth1\Provider\Px500::NAME         => OAuth1\Provider\Px500::class,
         OAuth1\Provider\Tumblr::NAME        => OAuth1\Provider\Tumblr::class,
         OAuth1\Provider\Atlassian::NAME     => OAuth1\Provider\Atlassian::class,

src/OAuth2/AbstractProvider.php

@@ -116,6 +116,25 @@ protected function makeAccessTokenRequest(string $code): RequestInterface
         ;
     }
 
+    /**
+     * @param string $refreshToken
+     * @return RequestInterface
+     */
+    protected function makeRefreshAccessTokenRequest(string $refreshToken): RequestInterface
+    {
+        $parameters = [
+            'refresh_token' => $refreshToken,
+            'client_id' => $this->consumer->getKey(),
+            'client_secret' => $this->consumer->getSecret(),
+            'grant_type' => 'refresh_token',
+        ];
+
+        return $this->httpStack->createRequest($this->requestHttpMethod, $this->getRequestTokenUri())
+            ->withHeader('Content-Type', 'application/x-www-form-urlencoded')
+            ->withBody($this->httpStack->createStream(http_build_query($parameters, '', '&')))
+        ;
+    }
+
     /**
      * @param string $code
      * @return AccessToken
@@ -132,6 +151,24 @@ public function getAccessToken(string $code): AccessToken
         return $this->parseToken($response->getBody()->getContents());
     }
 
+    /**
+     * @param string $refreshToken
+     *
+     * @return AccessToken
+     * @throws InvalidAccessToken
+     * @throws InvalidResponse
+     * @throws \Psr\Http\Client\ClientExceptionInterface
+     */
+    public function refreshAccessToken(string $refreshToken): AccessToken
+    {
+        $response = $this->executeRequest(
+            $this->makeRefreshAccessTokenRequest($refreshToken)
+        );
+
+        return $this->parseToken($response->getBody()->getContents());
+    }
+
+
     /**
      * @param array $parameters
      * @return AccessToken

src/OAuth2/Provider/Twitter.php

@@ -0,0 +1,85 @@
+<?php
+/**
+ * SocialConnect project
+ * @author: Patsura Dmitry https://github.com/ovr <talk@dmtry.me>
+ */
+declare(strict_types=1);
+
+namespace SocialConnect\OAuth2\Provider;
+
+use SocialConnect\Common\ArrayHydrator;
+use SocialConnect\Provider\AccessTokenInterface;
+use SocialConnect\Common\Entity\User;
+
+class Twitter extends \SocialConnect\OAuth2\AbstractProvider
+{
+    const NAME = 'twitter';
+
+    public function getBaseUri()
+    {
+        return 'https://api.x.com/2/';
+    }
+
+    public function getAuthorizeUri()
+    {
+        return 'https://api.x.com/2/oauth2';
+    }
+
+    public function getRequestTokenUri()
+    {
+        return 'https://api.x.com/2/oauth2/token';
+    }
+
+    public function getName()
+    {
+        return self::NAME;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIdentity(AccessTokenInterface $accessToken)
+    {
+        $query = [];
+
+        $fields = $this->getArrayOption('identity.fields', []);
+        if ($fields) {
+            $query['fields'] = implode(',', $fields);
+        }
+
+        $response = $this->request(
+            'GET',
+            'me',
+            $query,
+            $accessToken
+        );
+
+        $hydrator = new ArrayHydrator([
+            'id' => 'id',
+            'first_name' => 'firstname',
+            'last_name' => 'lastname',
+            'email' => 'email',
+            'gender' => static function ($value, User $user) {
+                $user->setSex($value === 1 ? User::SEX_FEMALE : User::SEX_MALE);
+            },
+            'birthday' => static function ($value, User $user) {
+                $user->setBirthday(
+                    new \DateTime($value)
+                );
+            },
+            'link' => 'url',
+            'locale' => 'locale',
+            'name' => 'fullname',
+            'timezone' => 'timezone',
+            'updated_time' => 'dateModified',
+            'verified' => 'verified',
+            'picture.data.url' => 'pictureURL'
+        ]);
+
+        /** @var User $user */
+        $user = $hydrator->hydrate(new User(), $response);
+        $user->emailVerified = true;
+
+        return $user;
+    }
+}

src/OpenID/AbstractProvider.php

@@ -100,7 +100,7 @@ protected function getRequiredRequestParameter(array $requestParameters, string
             return $requestParameters[$key];
         }
 
-        throw new Unauthorized("There is no required parameter called: '{$key}'");
+        throw new Unauthorized("There is no required parameter called: ".$key);
     }
 
     /**