4 files changed, 23 insertions, 3 deletions
diff --git a/phpBB/config/auth_providers.yml b/phpBB/config/auth_providers.yml
index b7486eabf4..393c2a4229 100644
--- a/phpBB/config/auth_providers.yml
+++ b/phpBB/config/auth_providers.yml
@@ -64,11 +64,13 @@ services:
         class: phpbb_auth_provider_oauth_service_facebook
         arguments:
             - @config
+            - @request
         tags:
             - { name: auth.provider.oauth.service }
     auth.provider.oauth.service.google:
         class: phpbb_auth_provider_oauth_service_google
         arguments:
             - @config
+            - @request
         tags:
             - { name: auth.provider.oauth.service }
diff --git a/phpBB/phpbb/auth/provider/oauth/service/base.php b/phpBB/phpbb/auth/provider/oauth/service/base.php
index d59199f987..ccfe57c8e2 100644
--- a/phpBB/phpbb/auth/provider/oauth/service/base.php
+++ b/phpBB/phpbb/auth/provider/oauth/service/base.php
@@ -50,6 +50,6 @@ abstract class phpbb_auth_provider_oauth_service_base implements phpbb_auth_prov
 	*/
 	public function set_external_service_provider(\OAuth\Common\Service\ServiceInterface $service_provider)
 	{
-		$this->service_provider = $service;
+		$this->service_provider = $service_provider;
 	}
 }
diff --git a/phpBB/phpbb/auth/provider/oauth/service/facebook.php b/phpBB/phpbb/auth/provider/oauth/service/facebook.php
index fcf41755b7..4758ae11f8 100644
--- a/phpBB/phpbb/auth/provider/oauth/service/facebook.php
+++ b/phpBB/phpbb/auth/provider/oauth/service/facebook.php
@@ -30,13 +30,22 @@ class phpbb_auth_provider_oauth_service_facebook extends phpbb_auth_provider_oau
 	protected $config;
 
 	/**
+	* phpBB request
+	*
+	* @var phpbb_request
+	*/
+	protected $request;
+
+	/**
 	* Constructor
 	*
 	* @param	phpbb_config 	$config
+	* @param	phpbb_request 	$request
 	*/
-	public function __construct(phpbb_config $config)
+	public function __construct(phpbb_config $config, phpbb_request $request)
 	{
 		$this->config = $config;
+		$this->request = $request;
 	}
 
 	/**
diff --git a/phpBB/phpbb/auth/provider/oauth/service/google.php b/phpBB/phpbb/auth/provider/oauth/service/google.php
index 70bad77697..3e5735b97c 100644
--- a/phpBB/phpbb/auth/provider/oauth/service/google.php
+++ b/phpBB/phpbb/auth/provider/oauth/service/google.php
@@ -30,13 +30,22 @@ class phpbb_auth_provider_oauth_service_google extends phpbb_auth_provider_oauth
 	protected $config;
 
 	/**
+	* phpBB request
+	*
+	* @var phpbb_request
+	*/
+	protected $request;
+
+	/**
 	* Constructor
 	*
 	* @param	phpbb_config 	$config
+	* @param	phpbb_request 	$request
 	*/
-	public function __construct(phpbb_config $config)
+	public function __construct(phpbb_config $config, phpbb_request $request)
 	{
 		$this->config = $config;
+		$this->request = $request;
 	}
 
 	/**