From f9168896edf326b89cc08d5f4dee681125b3efc1 Mon Sep 17 00:00:00 2001
From: hgc <yellowrna@gmail.com>
Date: Mon, 6 Jan 2025 19:41:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/OAuthController.php | 32 ++++++++++--------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/app/controller/OAuthController.php b/app/controller/OAuthController.php
index 3a0930d..10b22b3 100644
--- a/app/controller/OAuthController.php
+++ b/app/controller/OAuthController.php
@@ -53,19 +53,7 @@ class OAuthController
         } else {
             $googleOAuthService->saveRefreshToken($tokens['refresh_token'], $state);
         }
-//        if (getenv('GOOGLE_DEVELOP_TOKEN_LEVEL') === 'test') {
-//            $option['manager_customer_id'] = '1401879025';  //开发者
-//            $option['login_customer_id']   = '1401879025';
-//        }
-//        $option['refresh_token'] = $tokens['refresh_token'];
-//
-//        $thirdUser = ThirdUser::where('access_token', $tokens['refresh_token'])->find();  // 获取第一个结果
-//        if ($thirdUser) {
-//            $option['third_user_id'] = $thirdUser->id;
-//            Event::emit(GoogleAdsCustomers::CUSTOMERADD, $option);
-//        } else {
-//            return $this->errorResponse(300, 'Invalid state parameter');
-//        }
+
         return $this->successResponse($tokens,$request);
 
     }
@@ -82,7 +70,7 @@ class OAuthController
 
         $tokens = $googleOAuthService->getRefreshToken($authCode);
         if (!isset($tokens['refresh_token'])) {
-            return $this->successResponse($tokens);
+            return $this->successResponse($tokens,$request);
         }
         // 保存refresh token到数据库
 //        $googleOAuthService->saveRefreshToken($tokens['refresh_token'], $tokens['access_token'], $request->user_id);
@@ -96,7 +84,7 @@ class OAuthController
         $googleOAuthService = new GoogleOAuthService();
 
         $newAccessToken = $googleOAuthService->useRefreshToken($refreshToken);
-        return $this->successResponse(['access_token' => $newAccessToken]);
+        return $this->successResponse(['access_token' => $newAccessToken],$request);
     }
 
     public function revokeRefreshToken(Request $request)
@@ -126,16 +114,16 @@ class OAuthController
     //保存某个主体的全部access广告账号
     public function saveAdvertisers(Request $request)
     {
-        $customerIds = $request->input('third_user_list_customers'); // customer_id_list每个元素包含advertiser_id
+//        $customerIds = $request->input('third_user_list_customers'); // customer_id_list每个元素包含advertiser_id
 
 
 //        $thirdUserId = $request->input('third_user_id'); // bps_third_user的id
-        $googleOAuthService = new GoogleOAuthService();
-        $hasThirdUser       = $googleOAuthService->bindThirdUserAdvertiser($customerId, $thirdUserId);
-        if (!$hasThirdUser) {
-            return $this->errorResponse(300, 'Invalid state parameter');
-        }
-        return $this->successResponse($hasThirdUser);
+//        $googleOAuthService = new GoogleOAuthService();
+//        $hasThirdUser       = $googleOAuthService->bindThirdUserAdvertiser($customerId, $thirdUserId);
+//        if (!$hasThirdUser) {
+//            return $this->errorResponse(300, 'Invalid state parameter');
+//        }
+//        return $this->successResponse($hasThirdUser);
     }