bugfix

mycookbook · Oct 7, 2023 · 322ddc7 · 322ddc7
1 parent 12af28e
commit 322ddc7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/app/Http/Clients/TikTokHttpClient.php b/app/Http/Clients/TikTokHttpClient.php
@@ -9,7 +9,6 @@
 class TikTokHttpClient
 {
     protected array $config;
-    protected Client $client;
 
     public function __construct()
     {
@@ -18,7 +17,7 @@ public function __construct()
 
     public function getAccessToken(string $code)
     {
-        $response = $this->client->request(
+        $response = $this->getClient()->request(
             'POST',
             $this->getUri() . '/oauth/access_token/',
             [
@@ -42,7 +41,7 @@ public function getAccessToken(string $code)
 
     public function getUserInfo(string $open_id, string $access_token)
     {
-        $userInfoResponse = $this->client->request('POST',
+        $userInfoResponse = $this->getClient()->request('POST',
             $this->getUri() . '/user/info/',
             [
                 'json' => [
@@ -83,4 +82,9 @@ private function getClientSecret(): string
     {
         return $this->config['client_secret'] ?? '';
     }
+
+    private function getClient()
+    {
+        return new Client();
+    }
 }
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
@@ -144,7 +144,7 @@ public function loginViaMagicLink(Request $request, LocationService $locationSer
      *
      * @throws GuzzleException
      */
-    public function tikTokHandleCallback(Request $request, TikTokHttpClient $client, UserService $service)
+    public function tikTokHandleCallback(Request $request, TikTokHttpClient $httpClient, UserService $service)
     {
         $code = $request->get('code');
         $errCode = $request->get('errCode');
@@ -154,7 +154,7 @@ public function tikTokHandleCallback(Request $request, TikTokHttpClient $client,
         }
 
         try {
-            $decoded = $client->getAccessToken($code);
+            $decoded = $httpClient->getAccessToken($code);
             $message = Arr::get($decoded, 'message');
             $open_id = Arr::get($decoded, 'data.open_id');
             $access_token = Arr::get($decoded, 'data.access_token');
@@ -163,7 +163,7 @@ public function tikTokHandleCallback(Request $request, TikTokHttpClient $client,
                 throw new \Exception(json_encode($decoded));
             }
 
-            $userInfo = $client->getUserInfo($open_id, $access_token);
+            $userInfo = $httpClient->getUserInfo($open_id, $access_token);
 
             if (!empty($userInfo['data']['user'])) {
                 $open_id = Arr::get($userInfo, 'data.user.open_id');