chillerlan / php-oauth-core

src/Storage/MemoryTokenStorage.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 
 use chillerlan\OAuth\Token;
 
-class MemoryTokenStorage extends TokenStorageAbstract{
+class MemoryTokenStorage extends TokenStorageAbstract {
 
 	/**
 	 * @var array
@@ -46,7 +46,7 @@ 
 	 */
 	public function getAccessToken(string $service):Token{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return $this->tokens[$service];
 		}
 
@@ -69,7 +69,7 @@ 
 	 */
 	public function clearAccessToken(string $service):TokenStorageInterface{
 
-		if(array_key_exists($service, $this->tokens)){
+		if (array_key_exists($service, $this->tokens)) {
 			unset($this->tokens[$service]);
 		}
 
@@ -81,7 +81,7 @@ 
 	 */
 	public function clearAllAccessTokens():TokenStorageInterface{
 
-		foreach(array_keys($this->tokens) as $service){
+		foreach (array_keys($this->tokens) as $service) {
 			unset($this->tokens[$service]); // trigger the memzero destructor
 		}
 
@@ -110,7 +110,7 @@ 
 	 */
 	public function getCSRFState(string $service):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $this->states[$service];
 		}
 
@@ -133,7 +133,7 @@ 
 	 */
 	public function clearCSRFState(string $service):TokenStorageInterface{
 
-		if(array_key_exists($service, $this->states)){
+		if (array_key_exists($service, $this->states)) {
 			unset($this->states[$service]);
 		}
 

src/Storage/SessionTokenStorage.php

Spacing +16 added lines, -16 removed lines

@@ -21,7 +21,7 @@ 
  *      - the session is running through a session handler that already encrypts the session data. nothing to do here.
  *      - the session runs in memory - i think it's silly to encrypt there. sodium_memzero() galore!
  */
-class SessionTokenStorage extends TokenStorageAbstract{
+class SessionTokenStorage extends TokenStorageAbstract {
 
 	/**
 	 * @var bool
@@ -43,21 +43,21 @@ 
 	 *
 	 * @param \chillerlan\Traits\ContainerInterface|null $options
 	 */
-	public function __construct(ContainerInterface $options = null){
+	public function __construct(ContainerInterface $options = null) {
 		parent::__construct($options);
 
 		$this->sessionVar = $this->options->sessionTokenVar;
 		$this->stateVar = $this->options->sessionStateVar;
 
-		if($this->options->sessionStart && !$this->sessionIsActive()){
+		if ($this->options->sessionStart && !$this->sessionIsActive()) {
 			session_start();
 		}
 
-		if(!isset($_SESSION[$this->sessionVar])){
+		if (!isset($_SESSION[$this->sessionVar])) {
 			$_SESSION[$this->sessionVar] = [];
 		}
 
-		if(!isset($_SESSION[$this->stateVar])){
+		if (!isset($_SESSION[$this->stateVar])) {
 			$_SESSION[$this->stateVar] = [];
 		}
 
@@ -66,8 +66,8 @@ 
 	/**
 	 * Destructor.
 	 */
-	public function __destruct(){
-		if($this->options->sessionStart){
+	public function __destruct() {
+		if ($this->options->sessionStart) {
 			session_write_close();
 		}
 	}
@@ -81,10 +81,10 @@ 
 	public function storeAccessToken(string $service, Token $token):TokenStorageInterface{
 		$token = $token->__toJSON();
 
-		if(isset($_SESSION[$this->sessionVar]) && is_array($_SESSION[$this->sessionVar])){
+		if (isset($_SESSION[$this->sessionVar]) && is_array($_SESSION[$this->sessionVar])) {
 			$_SESSION[$this->sessionVar][$service] = $token;
 		}
-		else{
+		else {
 			$_SESSION[$this->sessionVar] = [$service => $token];
 		}
 
@@ -99,7 +99,7 @@ 
 	 */
 	public function getAccessToken(string $service):Token{
 
-		if($this->hasAccessToken($service)){
+		if ($this->hasAccessToken($service)) {
 			return (new Token)->__fromJSON($_SESSION[$this->sessionVar][$service]);
 		}
 
@@ -122,7 +122,7 @@ 
 	 */
 	public function clearAccessToken(string $service):TokenStorageInterface{
 
-		if(array_key_exists($service, $_SESSION[$this->sessionVar])){
+		if (array_key_exists($service, $_SESSION[$this->sessionVar])) {
 			unset($_SESSION[$this->sessionVar][$service]);
 		}
 
@@ -134,7 +134,7 @@ 
 	 */
 	public function clearAllAccessTokens():TokenStorageInterface{
 
-		foreach(array_keys($_SESSION[$this->sessionVar]) as $service){
+		foreach (array_keys($_SESSION[$this->sessionVar]) as $service) {
 			unset($_SESSION[$this->sessionVar][$service]); // trigger the memzero destructor
 		}
 
@@ -151,10 +151,10 @@ 
 	 */
 	public function storeCSRFState(string $service, string $state):TokenStorageInterface{
 
-		if(isset($_SESSION[$this->stateVar]) && is_array($_SESSION[$this->stateVar])){
+		if (isset($_SESSION[$this->stateVar]) && is_array($_SESSION[$this->stateVar])) {
 			$_SESSION[$this->stateVar][$service] = $state;
 		}
-		else{
+		else {
 			$_SESSION[$this->stateVar] = [$service => $state];
 		}
 
@@ -169,7 +169,7 @@ 
 	 */
 	public function getCSRFState(string $service):string{
 
-		if($this->hasCSRFState($service)){
+		if ($this->hasCSRFState($service)) {
 			return $_SESSION[$this->stateVar][$service];
 		}
 
@@ -192,7 +192,7 @@ 
 	 */
 	public function clearCSRFState(string $service):TokenStorageInterface{
 
-		if(array_key_exists($service, $_SESSION[$this->stateVar])){
+		if (array_key_exists($service, $_SESSION[$this->stateVar])) {
 			unset($_SESSION[$this->stateVar][$service]);
 		}
 

src/Providers/OAuthProvider.php

Spacing +2 added lines, -2 removed lines

@@ -88,14 +88,14 @@
 	 * @param \chillerlan\OAuth\Storage\TokenStorageInterface $storage
 	 * @param \chillerlan\Traits\ContainerInterface           $options
 	 */
-	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options){
+	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options) {
 		$this->setHTTPClient($http);
 
 		$this->storage     = $storage;
 		$this->options     = $options;
 		$this->serviceName = (new ReflectionClass($this))->getShortName();
 
-		if($this instanceof ApiClientInterface){
+		if ($this instanceof ApiClientInterface) {
 			$this->loadEndpoints();
 		}
 

src/Providers/OAuth2TokenRefreshTrait.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
  * @property \chillerlan\OAuth\Storage\TokenStorageInterface $storage
  * @property \chillerlan\OAuth\OAuthOptions $options
  */
-trait OAuth2TokenRefreshTrait{
+trait OAuth2TokenRefreshTrait {
 
 	/**
 	 * @param \chillerlan\OAuth\Token $token
@@ -31,15 +31,15 @@ 
 	 */
 	public function refreshAccessToken(Token $token = null):Token{
 
-		if($token === null){
+		if ($token === null) {
 			$token = $this->storage->getAccessToken($this->serviceName);
 		}
 
 		$refreshToken = $token->refreshToken;
 
-		if(empty($refreshToken)){
+		if (empty($refreshToken)) {
 
-			if(!$this instanceof AccessTokenForRefresh){
+			if (!$this instanceof AccessTokenForRefresh) {
 				throw new ProviderException(sprintf('no refresh token available, token expired [%s]', date('Y-m-d h:i:s A', $token->expires)));
 			}
 
@@ -55,7 +55,7 @@ 
 			)
 		);
 
-		if(!$newToken->refreshToken){
+		if (!$newToken->refreshToken) {
 			$newToken->refreshToken = $refreshToken;
 		}
 

src/Providers/OAuth2Provider.php

Spacing +13 added lines, -13 removed lines

@@ -25,7 +25,7 @@ 
  * @method array setState(array $params)
  * @method \chillerlan\OAuth\Providers\OAuth2Interface checkState(string $state = null)
  */
-abstract class OAuth2Provider extends OAuthProvider implements OAuth2Interface{
+abstract class OAuth2Provider extends OAuthProvider implements OAuth2Interface {
 
 	/**
 	 * @var int
@@ -60,7 +60,7 @@ 
 	 * @param \chillerlan\Traits\ContainerInterface           $options
 	 * @param array                                           $scopes
 	 */
-	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options, array $scopes = null){
+	public function __construct(HTTPClientInterface $http, TokenStorageInterface $storage, ContainerInterface $options, array $scopes = null) {
 		parent::__construct($http, $storage, $options);
 
 		$this->scopes = $scopes ?? [];
@@ -74,7 +74,7 @@ 
 	public function getAuthURL(array $params = null):string{
 		$params = $this->getAuthURLParams($params ?? []);
 
-		if($this instanceof CSRFToken){
+		if ($this instanceof CSRFToken) {
 			$params = $this->setState($params);
 		}
 
@@ -89,7 +89,7 @@ 
 	protected function getAuthURLParams(array $params):array {
 
 		// this should not be here
-		if(isset($params['client_secret'])){
+		if (isset($params['client_secret'])) {
 			unset($params['client_secret']);
 		}
 
@@ -111,19 +111,19 @@ 
 	protected function parseTokenResponse(HTTPResponseInterface $response):Token{
 		$data = $response->json_array;
 
-		if(!is_array($data)){
+		if (!is_array($data)) {
 			throw new ProviderException('unable to parse token response');
 		}
 
-		foreach(['error_description', 'error'] as $field){
+		foreach (['error_description', 'error'] as $field) {
 
-			if(isset($data[$field])){
+			if (isset($data[$field])) {
 				throw new ProviderException('error retrieving access token: "'.$data[$field].'"');
 			}
 
 		}
 
-		if(!isset($data['access_token'])){
+		if (!isset($data['access_token'])) {
 			throw new ProviderException('token missing');
 		}
 
@@ -149,7 +149,7 @@ 
 	 */
 	public function getAccessToken(string $code, string $state = null):Token{
 
-		if($this instanceof CSRFToken){
+		if ($this instanceof CSRFToken) {
 			$this->checkState($state);
 		}
 
@@ -203,7 +203,7 @@ 
 		$token = $this->storage->getAccessToken($this->serviceName);
 
 		// attempt to refresh an expired token
-		if($this->options->tokenAutoRefresh && $this instanceof TokenRefresh && ($token->isExpired() || $token->expires === $token::EOL_UNKNOWN)){
+		if ($this->options->tokenAutoRefresh && $this instanceof TokenRefresh && ($token->isExpired() || $token->expires === $token::EOL_UNKNOWN)) {
 			$token = $this->refreshAccessToken($token);
 		}
 
@@ -212,15 +212,15 @@ 
 		$params  = array_merge($query, $params ?? []);
 		$headers = $headers ?? [];
 
-		if(array_key_exists($this->authMethod, $this::AUTH_METHODS_HEADER)){
+		if (array_key_exists($this->authMethod, $this::AUTH_METHODS_HEADER)) {
 			$headers = array_merge($headers, [
 				'Authorization' => $this::AUTH_METHODS_HEADER[$this->authMethod].$token->accessToken,
 			]);
 		}
-		elseif(array_key_exists($this->authMethod, $this::AUTH_METHODS_QUERY)){
+		elseif (array_key_exists($this->authMethod, $this::AUTH_METHODS_QUERY)) {
 			$params[$this::AUTH_METHODS_QUERY[$this->authMethod]] = $token->accessToken;
 		}
-		else{
+		else {
 			throw new ProviderException('invalid auth type');
 		}
 

src/Providers/CSRFTokenTrait.php

Spacing +4 added lines, -4 removed lines

@@ -18,7 +18,7 @@ 
  * @property string $serviceName
  * @property \chillerlan\OAuth\Storage\TokenStorageInterface $storage
  */
-trait CSRFTokenTrait{
+trait CSRFTokenTrait {
 
 	/**
 	 * @param string|null $state
@@ -28,13 +28,13 @@ 
 	 */
 	protected function checkState(string $state = null):OAuth2Interface{
 
-		if(empty($state) || !$this->storage->hasCSRFState($this->serviceName)){
+		if (empty($state) || !$this->storage->hasCSRFState($this->serviceName)) {
 			throw new ProviderException('invalid state for '.$this->serviceName);
 		}
 
 		$knownState = $this->storage->getCSRFState($this->serviceName);
 
-		if(!hash_equals($knownState, $state)){
+		if (!hash_equals($knownState, $state)) {
 			throw new ProviderException('invalid CSRF state: '.$this->serviceName.' '.$state);
 		}
 
@@ -49,7 +49,7 @@ 
 	 */
 	protected function setState(array $params):array {
 
-		if(!isset($params['state'])){
+		if (!isset($params['state'])) {
 			$params['state'] = sha1(random_bytes(256));
 		}
 

src/Providers/OAuth1Provider.php

Spacing +12 added lines, -12 removed lines

@@ -16,7 +16,7 @@ 
 use chillerlan\HTTP\HTTPResponseInterface;
 use DateTime;
 
-abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface{
+abstract class OAuth1Provider extends OAuthProvider implements OAuth1Interface {
 
 	/**
 	 * @var string
@@ -47,7 +47,7 @@ 
 	 * @return \chillerlan\OAuth\Token
 	 */
 	public function getRequestToken():Token {
-		$params   = $this->getRequestTokenHeaderParams();
+		$params = $this->getRequestTokenHeaderParams();
 
 		return $this->parseTokenResponse(
 			$this->httpPOST(
@@ -72,19 +72,19 @@ 
 	protected function parseTokenResponse(HTTPResponseInterface $response, bool $checkCallbackConfirmed = null):Token {
 		parse_str($response->body, $data);
 
-		if(!$data || !is_array($data)){
+		if (!$data || !is_array($data)) {
 			throw new ProviderException('unable to parse token response');
 		}
-		elseif(isset($data['error'])){
+		elseif (isset($data['error'])) {
 			throw new ProviderException('error retrieving access token: '.$data['error']);
 		}
-		elseif(!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])){
+		elseif (!isset($data['oauth_token']) || !isset($data['oauth_token_secret'])) {
 			throw new ProviderException('token missing');
 		}
 
-		if(($checkCallbackConfirmed ?? false)
+		if (($checkCallbackConfirmed ?? false)
 		   && (!isset($data['oauth_callback_confirmed']) || $data['oauth_callback_confirmed'] !== 'true')
-		){
+		) {
 			throw new ProviderException('oauth callback unconfirmed');
 		}
 
@@ -147,7 +147,7 @@ 
 	public function getSignature(string $url, array $params, string $method = null):string {
 		$parseURL = parse_url($url);
 
-		if(!isset($parseURL['host']) || !isset($parseURL['scheme']) || !in_array($parseURL['scheme'], ['http', 'https'], true)){
+		if (!isset($parseURL['host']) || !isset($parseURL['scheme']) || !in_array($parseURL['scheme'], ['http', 'https'], true)) {
 			throw new ProviderException('getSignature: invalid url');
 		}
 
@@ -171,9 +171,9 @@ 
 	 *
 	 * @return string
 	 */
-	protected function getSignatureData(string $signatureURL, array $signatureParams, string $method){
+	protected function getSignatureData(string $signatureURL, array $signatureParams, string $method) {
 
-		if(isset($signatureParams['oauth_signature'])){
+		if (isset($signatureParams['oauth_signature'])) {
 			unset($signatureParams['oauth_signature']);
 		}
 
@@ -196,7 +196,7 @@ 
 	public function getAccessToken(string $token, string $verifier, string $tokenSecret = null):Token {
 		$this->tokenSecret = $tokenSecret;
 
-		if(empty($this->tokenSecret)){
+		if (empty($this->tokenSecret)) {
 			$this->tokenSecret = $this->storage->getAccessToken($this->serviceName)->requestTokenSecret;
 		}
 
@@ -232,7 +232,7 @@ 
 
 		$parameters['oauth_signature'] = $this->getSignature($url, array_merge($params ?? [], $parameters), $method);
 
-		if(isset($params['oauth_session_handle'])){
+		if (isset($params['oauth_session_handle'])) {
 			$parameters['oauth_session_handle'] = $params['oauth_session_handle'];
 			unset($params['oauth_session_handle']);
 		}