fix bug with Google auth in the budyaga\users\components\oauth\Google

Author: gaalferov

README.md

@@ -39,14 +39,17 @@ Password: yii2shortenerpassword
 * Add to file `app/config/web-local.php` your oauth data, for example:
 ```php
 <?php
-use budyaga\users\components\oauth\Google;
-
 return  [
   'components' => [
     'authClientCollection' => [
       'clients' => [
         'google' => [
-          'class' => Google::class,
+          'class' => 'app\components\oauth\Google',
+          'clientId' => 'XXX',
+          'clientSecret' => 'XXX',
+        ],
+        'facebook' => [
+          'class' => 'budyaga\users\components\oauth\Facebook',
           'clientId' => 'XXX',
           'clientSecret' => 'XXX',
         ],

app/components/oauth/Google.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace app\components\oauth;
+
+use budyaga\users\models\User;
+use budyaga\users\models\UserOauthKey;
+
+/**
+ * Fix error with incorrect API request in initUserAttributes
+ * @override budyaga\users\components\oauth\Google
+ */
+class Google extends \yii\authclient\clients\Google
+{
+    /**
+     * @inheritdoc
+     */
+    public function getViewOptions()
+    {
+        return [
+            'popupWidth' => 900,
+            'popupHeight' => 500
+        ];
+    }
+
+    public function normalizeSex()
+    {
+        return [
+            'male' => User::SEX_MALE,
+            'female' => User::SEX_FEMALE
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function init()
+    {
+        parent::init();
+        if ($this->scope === null) {
+            $this->scope = implode(' ', [
+                'profile',
+                'email',
+            ]);
+        }
+    }
+
+        /**
+         * @inheritdoc
+         */
+        protected function initUserAttributes()
+        {
+            $attributes = parent::initUserAttributes();
+
+            $return_attributes = [
+                'User' => [
+                    'email' => $attributes['email'],
+                    'username' => $attributes['name'],
+                    'photo' => $attributes['picture'],
+                    'sex' => 1 //empty information from Google
+                ],
+                'provider_user_id' => $attributes['id'],
+                'provider_id' => UserOauthKey::getAvailableClients()['google'],
+            ];
+
+            return $return_attributes;
+        }
+}