google 登录问题

app/apphtml5/modules/Customer/controllers/GoogleController.php

@@ -31,6 +31,7 @@ class GoogleController extends AppfrontController
     {
         Yii::$service->session->set('logintype', 'google');
         $thirdLogin = Yii::$service->store->thirdLogin;
+        global $googleapiinfo;
         $googleapiinfo['GOOGLE_CLIENT_ID'] = isset($thirdLogin['google']['CLIENT_ID']) ? $thirdLogin['google']['CLIENT_ID'] : '';
         $googleapiinfo['GOOGLE_CLIENT_SECRET'] = isset($thirdLogin['google']['CLIENT_SECRET']) ? $thirdLogin['google']['CLIENT_SECRET'] : '';
         $lib_google_base = Yii::getAlias('@fecshop/lib/google');

services/Customer.php

@@ -459,22 +459,23 @@ class Customer extends Service
      */
     protected function actionRegisterThirdPartyAccountAndLogin($user, $type)
     {
-        if (!(isset($user['password']) && $user['password'])) {
-            $user['password'] = $this->getRandomPassword();
-        }
+        
         // 查看邮箱是否存在
         $email = $user['email'];
         $customer_one = Yii::$service->customer->getUserIdentityByEmail($email);
         if ($customer_one) {
-            $loginStatus = Yii::$service->customer->login($user);
+            $loginStatus = \Yii::$app->user->login($customer_one);
             if ($loginStatus) {
                 return true;
             }
         // 不存在，注册。
         } else {
+            if (!(isset($user['password']) && $user['password'])) {
+                $user['password'] = $this->getRandomPassword();
+            }
             $registerData = [
-                'email'    => $email,
-                'firstname' => $user['first_name'],
+                'email'       => $email,
+                'firstname'   => $user['first_name'],
                 'lastname'    => $user['last_name'],
                 'password'    => $user['password'],
                 'type'        => $type,