feat(zohoCliq): add DataCenter class for Zoho Cliq API integration

- Introduced a new DataCenter class to manage data center URLs for Zoho Cliq.
- Implemented methods to retrieve base URLs for both API and OAuth based on the specified data center.
- Utilized PHP 8.0 match expression for cleaner URL resolution.
- Added exception handling for invalid data center inputs.

Signed-off-by: guanguans <[email protected]>

Author: guanguans

ide.json

@@ -2334,7 +2334,6 @@
                     "client_id",
                     "client_secret",
                     "code",
-                    "data_center",
                     "grant_type",
                     "redirect_uri",
                     "refresh_token",

src/Foundation/Authenticators/UriTemplateAuthenticator.php

@@ -42,6 +42,7 @@ public function applyToRequest(RequestInterface $request): RequestInterface
             $this->uriFactory->createUri(
                 UriTemplate::expand(urldecode((string) $request->getUri()), $this->variables),
             ),
+            $request->hasHeader('Host')
         );
     }
 }

src/Foundation/Authenticators/WebHookAuthenticator.php

@@ -31,6 +31,6 @@ public function __construct(
 
     public function applyToRequest(RequestInterface $request): RequestInterface
     {
-        return $request->withUri($this->uriFactory->createUri($this->webHook));
+        return $request->withUri($this->uriFactory->createUri($this->webHook), $request->hasHeader('Host'));
     }
 }

src/ZohoCliq/Authenticator.php

@@ -48,21 +48,29 @@
  */
 class Authenticator extends NullAuthenticator implements \Stringable
 {
+    private DataCenter $dataCenter;
     private CacheInterface $cache;
     private string $cacheKey;
     private Client $client;
 
+    /**
+     * @noinspection PhpDocSignatureInspection
+     *
+     * @param null|key-of<\Guanguans\Notify\ZohoCliq\DataCenter::BASE_URI_MAP> $dataCenter
+     */
     public function __construct(
         private string $clientId,
         #[\SensitiveParameter]
         private string $clientSecret,
+        ?string $dataCenter = null,
         ?CacheInterface $cache = null,
         ?string $cacheKey = null,
         ?Client $client = null,
     ) {
+        $this->dataCenter = new DataCenter($dataCenter);
         $this->cache = $cache ?? new FileCache;
-        $this->cacheKey = $cacheKey ?? "zoho_cliq.access_token.$clientId.$clientSecret";
-        $this->client = $client ?? new Client;
+        $this->cacheKey = $cacheKey ?? "zoho_cliq.access_token.$this->dataCenter.$clientId.$clientSecret";
+        $this->client = ($client ?? new Client)->push($this->baseUriMiddleware($this->dataCenter->toOauthBaseUri()));
     }
 
     /**
@@ -80,35 +88,20 @@ public function applyToMiddleware(callable $handler): callable
     {
         return array_reduce(
             [
-                [$this, 'dataCenter'],
-                [$this, 'retry'],
-                [$this, 'authenticate'],
+                $this->retryMiddleware(),
+                $this->authMiddleware(),
+                $this->baseUriMiddleware($this->dataCenter->toBaseUri()),
             ],
             static fn (callable $handler, callable $next): callable => $next($handler),
             $handler,
         );
     }
 
-    /**
-     * @todo
-     */
-    private function dataCenter(callable $handler): callable
-    {
-        return $handler;
-    }
-
-    private function authenticate(callable $handler): callable
-    {
-        return Middleware::mapRequest(
-            fn (RequestInterface $request): RequestInterface => $request->withHeader('Authorization', "Bearer $this"),
-        )($handler);
-    }
-
     /**
      * @see \GuzzleHttp\RetryMiddleware::onFulfilled()
      * @see \GuzzleHttp\RetryMiddleware::onRejected()
      */
-    private function retry(callable $handler): callable
+    private function retryMiddleware(): callable
     {
         return Middleware::retry(
             function (int $retries, RequestInterface &$request, ?ResponseInterface $response = null): bool {
@@ -124,7 +117,31 @@ function (int $retries, RequestInterface &$request, ?ResponseInterface $response
 
                 return false;
             }
-        )($handler);
+        );
+    }
+
+    private function authMiddleware(): callable
+    {
+        return Middleware::mapRequest(
+            fn (RequestInterface $request): RequestInterface => $request->withHeader('Authorization', "Bearer $this"),
+        );
+    }
+
+    /**
+     * @see \GuzzleHttp\Client::buildUri()
+     * @see \GuzzleHttp\Client::requestAsync()
+     * @see \GuzzleHttp\Client::sendAsync()
+     */
+    private function baseUriMiddleware(string $baseUri): callable
+    {
+        $parsedBaseUri = parse_url($baseUri);
+
+        return Middleware::mapRequest(
+            static fn (RequestInterface $request): RequestInterface => $request->withUri(
+                $request->getUri()->withScheme($parsedBaseUri['scheme'])->withHost($parsedBaseUri['host']),
+                $request->hasHeader('Host')
+            ),
+        );
     }
 
     /**
@@ -157,6 +174,10 @@ private function getToken(): string
      *     "expires_in": 3600
      * }
      * ```
+     *
+     * ```json
+     * {"error":"invalid_client_secret"}
+     * ```
      */
     private function refreshToken(): string
     {

src/ZohoCliq/Client.php

@@ -26,6 +26,5 @@ class Client extends \Guanguans\Notify\Foundation\Client
     public function __construct(Authenticator $authenticator)
     {
         parent::__construct($authenticator);
-        $this->baseUri('https://cliq.zoho.com/');
     }
 }

src/ZohoCliq/DataCenter.php

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright (c) 2021-2025 guanguans<[email protected]>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ *
+ * @see https://github.com/guanguans/notify
+ */
+
+namespace Guanguans\Notify\ZohoCliq;
+
+use Guanguans\Notify\Foundation\Exceptions\InvalidArgumentException;
+
+/**
+ * @see https://www.zoho.com/cliq/help/restapi/v2/#cliq_rest_api
+ * @see https://github.com/MarJose123/laravel-zoho-cliq-alert/blob/main/src/ZohoDataCenter.php
+ *
+ * @immutable
+ *
+ * @readonly
+ */
+class DataCenter implements \Stringable
+{
+    public const AU = 'au';
+    public const CA = 'ca';
+    public const CN = 'cn';
+    public const EU = 'eu';
+    public const IN = 'in';
+    public const JP = 'jp';
+    public const SA = 'sa';
+    public const UK = 'uk';
+    public const US = 'us';
+    private const BASE_URI_MAP = [
+        self::AU => 'https://cliq.zoho.com.au',
+        self::CA => 'https://cliq.zohocloud.ca',
+        self::CN => 'https://cliq.zoho.com.cn',
+        self::EU => 'https://cliq.zoho.eu',
+        self::IN => 'https://cliq.zoho.in',
+        self::JP => 'https://cliq.zoho.jp',
+        self::SA => 'https://cliq.zoho.sa',
+        self::UK => 'https://cliq.zoho.uk',
+        self::US => 'https://cliq.zoho.com',
+    ];
+    private string $value;
+
+    public function __construct(?string $value = null)
+    {
+        if (!isset(self::BASE_URI_MAP[$this->value = $value ?? self::US])) {
+            throw new InvalidArgumentException("Invalid data center [$this->value].");
+        }
+    }
+
+    public function __toString(): string
+    {
+        return $this->value;
+    }
+
+    public function toOauthBaseUri(): string
+    {
+        return str_replace('https://cliq.', 'https://accounts.', $this->toBaseUri());
+    }
+
+    public function toBaseUri(): string
+    {
+        return self::BASE_URI_MAP[$this->value];
+    }
+}

src/ZohoCliq/Messages/AccessTokenMessage.php

@@ -15,13 +15,11 @@
 
 use Guanguans\Notify\Foundation\Concerns\AsFormParams;
 use Guanguans\Notify\Foundation\Message;
-use Guanguans\Notify\Foundation\Support\Arr;
 
 /**
  * @method self clientId(mixed $clientId)
  * @method self clientSecret(mixed $clientSecret)
  * @method self code(mixed $code)
- * @method self dataCenter(mixed $dataCenter)
  * @method self grantType(mixed $grantType)
  * @method self redirectUri(mixed $redirectUri)
  * @method self refreshToken(mixed $refreshToken)
@@ -31,8 +29,6 @@ final class AccessTokenMessage extends Message // @internal
 {
     use AsFormParams;
     protected array $defined = [
-        'data_center',
-
         'client_id',
         'client_secret',
         'grant_type',
@@ -49,13 +45,6 @@ final class AccessTokenMessage extends Message // @internal
 
     public function toHttpUri(): string
     {
-        return 'https://accounts.zoho.com/oauth/v2/token';
-    }
-
-    protected function toPayload(): array
-    {
-        return Arr::except(parent::toPayload(), [
-            'data_center',
-        ]);
+        return 'oauth/v2/token';
     }
 }