feat 新增刷新ticket (#2733)

w7corp · Aug 21, 2023 · d087e07 · d087e07
1 parent 24e8c93
commit d087e07
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/src/Kernel/Contracts/RefreshableJsApiTicket.php b/src/Kernel/Contracts/RefreshableJsApiTicket.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace EasyWeChat\Kernel\Contracts;
+
+interface RefreshableJsApiTicket extends JsApiTicket
+{
+    public function refreshTicket(): string;
+}
diff --git a/src/OfficialAccount/Application.php b/src/OfficialAccount/Application.php
@@ -6,6 +6,7 @@
 
 use EasyWeChat\Kernel\Contracts\AccessToken as AccessTokenInterface;
 use EasyWeChat\Kernel\Contracts\JsApiTicket as JsApiTicketInterface;
+use EasyWeChat\Kernel\Contracts\RefreshableJsApiTicket as RefreshableJsApiTicketInterface;
 use EasyWeChat\Kernel\Contracts\RefreshableAccessToken as RefreshableAccessTokenInterface;
 use EasyWeChat\Kernel\Contracts\Server as ServerInterface;
 use EasyWeChat\Kernel\Encryptor;
@@ -187,7 +188,7 @@ public function getOAuth(): SocialiteProviderInterface
         return $provider;
     }
 
-    public function getTicket(): JsApiTicketInterface
+    public function getTicket(): JsApiTicketInterface|RefreshableJsApiTicketInterface
     {
         if (! $this->ticket) {
             $this->ticket = new JsApiTicket(
@@ -202,7 +203,7 @@ public function getTicket(): JsApiTicketInterface
         return $this->ticket;
     }
 
-    public function setTicket(JsApiTicketInterface $ticket): static
+    public function setTicket(JsApiTicketInterface|RefreshableJsApiTicketInterface $ticket): static
     {
         $this->ticket = $ticket;
 

diff --git a/src/OfficialAccount/JsApiTicket.php b/src/OfficialAccount/JsApiTicket.php
@@ -4,13 +4,13 @@
 
 namespace EasyWeChat\OfficialAccount;
 
-use EasyWeChat\Kernel\Contracts\JsApiTicket as JsApiTicketInterface;
+use EasyWeChat\Kernel\Contracts\RefreshableJsApiTicket as RefreshableJsApiTicketInterface;
 use EasyWeChat\Kernel\Exceptions\HttpException;
 use JetBrains\PhpStorm\ArrayShape;
 
 use function sprintf;
 
-class JsApiTicket extends AccessToken implements JsApiTicketInterface
+class JsApiTicket extends AccessToken implements RefreshableJsApiTicketInterface
 {
     /**
      * @throws \Symfony\Contracts\HttpClient\Exception\RedirectionExceptionInterface
@@ -30,14 +30,19 @@ public function getTicket(): string
             return $ticket;
         }
 
+        return $this->refreshTicket();
+    }
+
+    public function refreshTicket(): string
+    {
         $response = $this->httpClient->request('GET', '/cgi-bin/ticket/getticket', ['query' => ['type' => 'jsapi']])
             ->toArray(false);
 
         if (empty($response['ticket'])) {
             throw new HttpException('Failed to get jssdk ticket: '.\json_encode($response, JSON_UNESCAPED_UNICODE));
         }
 
-        $this->cache->set($key, $response['ticket'], \intval($response['expires_in']));
+        $this->cache->set($this->getKey(), $response['ticket'], \intval($response['expires_in']));
 
         return $response['ticket'];
     }