phpBB

Code Changes

File: phpbb/auth/provider/oauth/service/google.php

  Unmodified   Added   Modified   Removed
Line 18Line 18
*/
class google extends base
{

*/
class google extends base
{

	/**
* phpBB config
*
* @var \phpbb\config\config
*/

	/** @var \phpbb\config\config */





	protected $config;


	protected $config;


	/**
* phpBB request
*
* @var \phpbb\request\request_interface
*/

	/** @var \phpbb\request\request_interface */





	protected $request;

/**

	protected $request;

/**

	* Constructor

	 * Constructor.

	*

	*

	* @param	\phpbb\config\config				$config
* @param \phpbb\request\request_interface $request

	 * @param \phpbb\config\config				$config		Config object
* @param \phpbb\request\request_interface $request Request object

	*/
public function __construct(\phpbb\config\config $config, \phpbb\request\request_interface $request)
{

	*/
public function __construct(\phpbb\config\config $config, \phpbb\request\request_interface $request)
{

		$this->config = $config;
$this->request = $request;

		$this->config	= $config;
$this->request = $request;

	}

/**

	}

/**

Line 49Line 41
	*/
public function get_auth_scope()
{

	*/
public function get_auth_scope()
{

		return array(

		return [

			'userinfo_email',
'userinfo_profile',

			'userinfo_email',
'userinfo_profile',

		);

		];

	}

/**

	}

/**

Line 60Line 52
	*/
public function get_service_credentials()
{

	*/
public function get_service_credentials()
{

		return array(

		return [

			'key'		=> $this->config['auth_oauth_google_key'],
'secret' => $this->config['auth_oauth_google_secret'],

			'key'		=> $this->config['auth_oauth_google_key'],
'secret' => $this->config['auth_oauth_google_secret'],

		);

		];

	}

/**

	}

/**

Line 76Line 68
			throw new exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE');
}


			throw new exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE');
}


 
		try
{

		// This was a callback request, get the token
$this->service_provider->requestAccessToken($this->request->variable('code', ''));

		// This was a callback request, get the token
$this->service_provider->requestAccessToken($this->request->variable('code', ''));

 
		}
catch (\OAuth\Common\Http\Exception\TokenResponseException $e)
{
throw new exception('AUTH_PROVIDER_OAUTH_ERROR_REQUEST');
}





 
		try
{

		// Send a request with it

		// Send a request with it

		$result = json_decode($this->service_provider->request('https://www.googleapis.com/oauth2/v1/userinfo'), true);






			$result = (array) json_decode($this->service_provider->request('https://www.googleapis.com/oauth2/v1/userinfo'), true);
}
catch (\OAuth\Common\Exception\Exception $e)
{
throw new exception('AUTH_PROVIDER_OAUTH_ERROR_REQUEST');
}


// Return the unique identifier
return $result['id'];


// Return the unique identifier
return $result['id'];

Line 96Line 102
			throw new exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE');
}


			throw new exception('AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE');
}


 
		try
{

		// Send a request with it

		// Send a request with it

		$result = json_decode($this->service_provider->request('https://www.googleapis.com/oauth2/v1/userinfo'), true);






			$result = (array) json_decode($this->service_provider->request('https://www.googleapis.com/oauth2/v1/userinfo'), true);
}
catch (\OAuth\Common\Exception\Exception $e)
{
throw new exception('AUTH_PROVIDER_OAUTH_ERROR_REQUEST');
}


// Return the unique identifier
return $result['id'];


// Return the unique identifier
return $result['id'];