remove scope from params for google service

src/EAuth.php

@@ -10,7 +10,7 @@
 namespace nodge\eauth;
 
 use Yii;
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Url;
 
@@ -19,7 +19,7 @@
  *
  * @package application.extensions.eauth
  */
-class EAuth extends Object
+class EAuth extends BaseObject
 {
 
 	/**

src/ServiceBase.php

@@ -10,7 +10,7 @@
 namespace nodge\eauth;
 
 use Yii;
-use yii\base\Object;
+use yii\base\BaseObject;
 use yii\helpers\Url;
 use yii\helpers\ArrayHelper;
 use OAuth\Common\Http\Uri\Uri;
@@ -21,7 +21,7 @@
  *
  * @package application.extensions.eauth
  */
-abstract class ServiceBase extends Object implements IAuthService
+abstract class ServiceBase extends BaseObject implements IAuthService
 {
 
 	/**

src/oauth/HttpClient.php

@@ -154,7 +154,7 @@ protected function prepareRequest()
 		}
 
 		if (is_array($this->requestBody)) {
-			$this->requestBody = http_build_query($this->requestBody, null, '&');
+			$this->requestBody = http_build_query($this->requestBody, "", '&');
 		}
 	}
 

src/services/GoogleOAuth2Service.php

@@ -12,6 +12,8 @@
 namespace nodge\eauth\services;
 
 use nodge\eauth\oauth2\Service;
+use Yii;
+use yii\helpers\Url;
 
 /**
  * Google provider class.
@@ -121,6 +123,10 @@ protected function fetchAttributes()
 			$this->attributes['url'] = $info['link'];
 		}
 
+        if (!empty($info['email'])) {
+            $this->attributes['email'] = $info['email'];
+        }
+
 		/*if (!empty($info['gender']))
 			$this->attributes['gender'] = $info['gender'] == 'male' ? 'M' : 'F';
 
@@ -166,4 +172,26 @@ protected function fetchResponseError($response)
 			return null;
 		}
 	}
+
+    /**
+     * override getCallbackUrl()
+     * basically its just ignoring 'scope' param for Google, as they return full urls now
+     *
+     * @return string
+     */
+    protected function getCallbackUrl()
+    {
+        if (isset($_GET['redirect_uri'])) {
+            $url = $_GET['redirect_uri'];
+        }
+        else {
+            $route = array();
+            array_unshift($route, '');
+            $route['service'] = $_GET['service'];
+
+            $url = Url::to($route, true);
+        }
+
+        return $url;
+    }
 }