finish Clover

src/Clover/CloverExtendSocialite.php

@@ -6,7 +6,7 @@
 
 class CloverExtendSocialite
 {
-    public function handle(SocialiteWasCalled $socialiteWasCalled)
+    public function handle(SocialiteWasCalled $socialiteWasCalled): void
     {
         $socialiteWasCalled->extendSocialite(Provider::IDENTIFIER, Provider::class);
     }

src/Clover/Provider.php

@@ -2,6 +2,8 @@
 
 namespace SocialiteProviders\Clover;
 
+use GuzzleHttp\RequestOptions;
+use Illuminate\Support\Arr;
 use SocialiteProviders\Manager\OAuth2\AbstractProvider;
 use SocialiteProviders\Manager\OAuth2\User;
 
@@ -24,25 +26,40 @@ class Provider extends AbstractProvider
      */
     protected $stateless = true;
 
-    public static function additionalConfigKeys()
+    public static function additionalConfigKeys(): array
     {
         return [
             'environment',
         ];
     }
 
+    /**
+     * Get the access token response for the given code.
+     *
+     * @param  string  $code
+     */
+    public function getAccessTokenResponse($code): array
+    {
+        $response = $this->getHttpClient()->post($this->getTokenUrl(), [
+            RequestOptions::HEADERS => $this->getTokenHeaders($code),
+            RequestOptions::JSON => $this->getTokenFields($code),
+        ]);
+
+        return json_decode($response->getBody(), true);
+    }
+
     protected function getApiDomain(): string
     {
         return match ($this->getConfig('environment')) {
             'sandbox' => 'sandbox.dev.clover.com',
-            default   => 'www.clover.com',
+            default => 'www.clover.com',
         };
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function getAuthUrl($state)
+    protected function getAuthUrl($state): string
     {
         return $this->buildAuthUrlFromBase(
             sprintf('https://%s/oauth/v2/authorize', $this->getApiDomain()),
@@ -53,31 +70,26 @@ protected function getAuthUrl($state)
     /**
      * {@inheritdoc}
      */
-    protected function getTokenUrl()
+    protected function getTokenUrl(): string
     {
         $domain = match ($this->getConfig('environment')) {
             'sandbox' => 'apisandbox.dev.clover.com',
-            default   => 'api.clover.com',
+            default => 'api.clover.com',
         };
 
-        return sprintf('https://%s/oauth/token', $domain);
+        return sprintf('https://%s/oauth/v2/token', $domain);
     }
 
     /**
      * {@inheritdoc}
      */
     protected function getUserByToken($token)
     {
-        $requestParams = str(request()->fullUrl())
-            ->after('?')
-            ->explode('&')
-            ->mapWithKeys(fn (string $keyAndValue) => [str($keyAndValue)->before('=')->toString() => str($keyAndValue)->after('=')->toString()]);
-
         $response = $this->getHttpClient()->get(sprintf(
             'https://%s/v3/merchants/%s/employees/%s',
             $this->getApiDomain(),
-            $requestParams['merchant_id'],
-            $requestParams['employee_id'],
+            $this->request->query('merchant_id'),
+            $this->request->query('employee_id'),
         ), [
             'headers' => [
                 'Authorization' => 'Bearer '.$token,
@@ -93,11 +105,22 @@ protected function getUserByToken($token)
     protected function mapUserToObject(array $user)
     {
         return (new User())->setRaw($user)->map([
-            'id'       => $user['id'],
+            'id' => $user['id'],
             'nickname' => $user['name'],
-            'name'     => $user['name'],
-            'email'    => $user['email'],
-            'avatar'   => null,
+            'name' => $user['name'],
+            'email' => $user['email'],
+            'avatar' => null,
         ]);
     }
+
+    /**
+     * Get the expires in from the token response body.
+     *
+     * @param  array  $body
+     * @return string
+     */
+    protected function parseExpiresIn($body)
+    {
+        return (string) (Arr::get($body, 'access_token_expiration') - time());
+    }
 }

src/Clover/README.md

@@ -31,7 +31,7 @@ Add the event to your `listen[]` array in `app/Providers/EventServiceProvider`.
 protected $listen = [
     \SocialiteProviders\Manager\SocialiteWasCalled::class => [
         // ... other providers
-        'SocialiteProviders\\Clover\\CloverExtendSocialite@handle',
+        \SocialiteProviders\Clover\CloverExtendSocialite::class.'@handle',
     ],
 ];
 ```
@@ -52,7 +52,21 @@ The user includes a `token` property that you can use to retrieve the API token
 Route::get('clover/auth/callback', function () {
     $user = Socialite::driver('clover')->user();
 
-    // Save this token somewhere for other use.
-    $token = $user->token;
+    // Save these tokens somewhere for use with the API.
+    $token = $user->accessTokenResponseBody;
+
+    // Here’s what it looks like:
+    // [
+    //     'access_token' => 'JWT',
+    //     'access_token_expiration' => 1709563149,
+    //     'refresh_token' => 'clvroar-6e49ffe9b5122f137aa39d8f7f930558',
+    //     'refresh_token_expiration' => 1741097349,
+    // ]
+
+    // You may also want to store the merchant ID somewhere.
+    $merchantId = request()->input('merchant_id');
+
+    // Here’s what it looks like:
+    // 'ABC123DEF4567'
 });
 ```

src/Clover/composer.json

@@ -2,16 +2,28 @@
     "name": "socialiteproviders/clover",
     "description": "Clover OAuth2 Provider for Laravel Socialite",
     "license": "MIT",
+    "keywords": [
+        "clover",
+        "laravel",
+        "oauth",
+        "provider",
+        "socialite"
+    ],
     "authors": [
         {
             "name": "macbookandrew",
             "homepage": "https://andrewrminion.com"
         }
     ],
+    "support": {
+        "issues": "https://github.com/socialiteproviders/providers/issues",
+        "source": "https://github.com/socialiteproviders/providers",
+        "docs": "https://socialiteproviders.com/clover"
+    },
     "require": {
         "php": "^8.1",
         "ext-json": "*",
-        "socialiteproviders/manager": "^4.0"
+        "socialiteproviders/manager": "^4.4"
     },
     "autoload": {
         "psr-4": {