Merge pull request #295 from mycookbook/quick-fix-tiktok-login

bugfix
mycookbook · Oct 7, 2023 · a5f0d1c · a5f0d1c
2 parents 3203e7a + e5c6956
commit a5f0d1c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/Http/Clients/TikTokHttpClient.php b/app/Http/Clients/TikTokHttpClient.php
@@ -11,9 +11,10 @@ class TikTokHttpClient
     protected array $config;
     protected Client $client;
 
-    public function __construct()
+    public function __construct(Client $client)
     {
         $this->config = config('services.tiktok');
+        $this->client = $client;
     }
 
     public function getAccessToken(string $code)

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');