🛀 auth method cleanup

Author: codemasher

examples/create-docblocks.php

@@ -14,6 +14,11 @@
 use chillerlan\OAuth\Core\{ClientCredentials, OAuth1Interface, OAuth2Interface};
 use Psr\Http\Message\ResponseInterface;
 
+use function chillerlan\OAuth\Providers\getProviders;
+use function file_get_contents, file_put_contents, implode, str_replace, strpos, substr;
+
+use const PHP_EOL;
+
 $ENVVAR = '';
 
 require_once __DIR__.'/provider-example-common.php';
@@ -30,7 +35,7 @@
 	'----------|----------|---------------|-------|--------------------',
 ];
 
-foreach(\chillerlan\OAuth\Providers\getProviders() as $p){
+foreach(getProviders() as $p){
 	/** @var \chillerlan\OAuth\Core\OAuthInterface $provider */
 	$provider = new $p['fqcn']($http, $storage, $options, $logger);
 
@@ -50,19 +55,18 @@
 			$oauth = '-';
 	}
 
-	$table[] =
-		'['.$p['name'].']('.$provider->apiDocs.') '.
-		'| [link]('.$provider->applicationURL.') '.
-		'| '.(!$provider->userRevokeURL ? '' : '[link]('.$provider->userRevokeURL.')').
-		'| '.$oauth.
-		'| '.($provider instanceof ClientCredentials ? '✓' : '')
-	;
+	$table[]
+		= '['.$p['name'].']('.$provider->apiDocs.') '.
+		  '| [link]('.$provider->applicationURL.') '.
+		  '| '.(!$provider->userRevokeURL ? '' : '[link]('.$provider->userRevokeURL.')').
+		  '| '.$oauth.
+		  '| '.($provider instanceof ClientCredentials ? '✓' : '');
 
 }
 
 $file   = __DIR__.'/../README.md';
-$readme = \file_get_contents($file);
-$start  = \strpos($readme, '<!--A-->')+8;
-$end    = \strpos($readme, '<!--O-->');
+$readme = file_get_contents($file);
+$start  = strpos($readme, '<!--A-->') + 8;
+$end    = strpos($readme, '<!--O-->');
 
-\file_put_contents($file, \str_replace(\substr($readme, $start, $end-$start), \PHP_EOL.\implode(\PHP_EOL, $table).\PHP_EOL, $readme));
+file_put_contents($file, str_replace(substr($readme, $start, $end - $start), PHP_EOL.implode(PHP_EOL, $table).PHP_EOL, $readme));

src/Deezer/Deezer.php

@@ -42,7 +42,7 @@ class Deezer extends OAuth2Provider implements CSRFToken{
 	protected $authURL        = 'https://connect.deezer.com/oauth/auth.php';
 	protected $accessTokenURL = 'https://connect.deezer.com/oauth/access_token.php';
 	protected $userRevokeURL  = 'https://www.deezer.com/account/apps';
-	protected $authMethod     = self::QUERY_ACCESS_TOKEN;
+	protected $authMethod     = self::AUTH_METHOD_QUERY;
 	protected $endpointMap    = DeezerEndpoints::class;
 	protected $apiDocs        = 'https://developers.deezer.com/api';
 	protected $applicationURL = 'http://developers.deezer.com/myapps';

src/Foursquare/Foursquare.php

@@ -29,14 +29,15 @@ class Foursquare extends OAuth2Provider{
 
 	protected const API_VERSIONDATE = '20190225';
 
-	protected $apiURL         = 'https://api.foursquare.com/v2';
-	protected $authURL        = 'https://foursquare.com/oauth2/authenticate';
-	protected $accessTokenURL = 'https://foursquare.com/oauth2/access_token';
-	protected $userRevokeURL  = 'https://foursquare.com/settings/connections';
-	protected $authMethod     = self::QUERY_OAUTH_TOKEN;
-	protected $endpointMap    = FoursquareEndpoints::class;
-	protected $apiDocs        = 'https://developer.foursquare.com/docs';
-	protected $applicationURL = 'https://foursquare.com/developers/apps';
+	protected $apiURL          = 'https://api.foursquare.com/v2';
+	protected $authURL         = 'https://foursquare.com/oauth2/authenticate';
+	protected $accessTokenURL  = 'https://foursquare.com/oauth2/access_token';
+	protected $userRevokeURL   = 'https://foursquare.com/settings/connections';
+	protected $authMethod      = self::AUTH_METHOD_QUERY;
+	protected $authMethodQuery = 'oauth_token';
+	protected $endpointMap     = FoursquareEndpoints::class;
+	protected $apiDocs         = 'https://developer.foursquare.com/docs';
+	protected $applicationURL  = 'https://foursquare.com/developers/apps';
 
 	/**
 	 * @param string $path

src/Instagram/Instagram.php

@@ -56,7 +56,7 @@ class Instagram extends OAuth2Provider implements CSRFToken{
 	protected $authURL        = 'https://api.instagram.com/oauth/authorize';
 	protected $accessTokenURL = 'https://api.instagram.com/oauth/access_token';
 	protected $userRevokeURL  = 'https://www.instagram.com/accounts/manage_access/';
-	protected $authMethod     = self::QUERY_ACCESS_TOKEN;
+	protected $authMethod     = self::AUTH_METHOD_QUERY;
 	protected $endpointMap    = InstagramEndpoints::class;
 	protected $apiDocs        = 'https://www.instagram.com/developer/';
 	protected $applicationURL = 'https://www.instagram.com/developer/clients/manage/';

src/MailChimp/MailChimp.php

@@ -34,12 +34,12 @@ class MailChimp extends OAuth2Provider implements CSRFToken{
 	protected const API_BASE          = 'https://%s.api.mailchimp.com/3.0';
 	protected const METADATA_ENDPOINT = 'https://login.mailchimp.com/oauth2/metadata';
 
-	protected $authURL        = 'https://login.mailchimp.com/oauth2/authorize';
-	protected $accessTokenURL = 'https://login.mailchimp.com/oauth2/token';
-	protected $endpointMap    = MailChimpEndpoints::class;
-	protected $authMethod     = self::HEADER_OAUTH;
-	protected $apiDocs        = 'https://developer.mailchimp.com/';
-	protected $applicationURL = 'https://admin.mailchimp.com/account/oauth2/';
+	protected $authURL          = 'https://login.mailchimp.com/oauth2/authorize';
+	protected $accessTokenURL   = 'https://login.mailchimp.com/oauth2/token';
+	protected $endpointMap      = MailChimpEndpoints::class;
+	protected $authMethodHeader = 'OAuth';
+	protected $apiDocs          = 'https://developer.mailchimp.com/';
+	protected $applicationURL   = 'https://admin.mailchimp.com/account/oauth2/';
 
 	/**
 	 * @param \chillerlan\OAuth\Core\AccessToken|null $token

src/Mixcloud/Mixcloud.php

@@ -26,7 +26,7 @@ class Mixcloud extends OAuth2Provider{
 	protected $authURL        = 'https://www.mixcloud.com/oauth/authorize';
 	protected $accessTokenURL = 'https://www.mixcloud.com/oauth/access_token';
 	protected $userRevokeURL  = 'https://www.mixcloud.com/settings/applications/';
-	protected $authMethod     = self::QUERY_ACCESS_TOKEN;
+	protected $authMethod     = self::AUTH_METHOD_QUERY;
 	protected $endpointMap    = MixcloudEndpoints::class;
 	protected $apiDocs        = 'https://www.mixcloud.com/developers/';
 	protected $applicationURL = 'https://www.mixcloud.com/developers/create/';

src/SoundCloud/SoundCloud.php

@@ -30,7 +30,7 @@ class SoundCloud extends OAuth2Provider{
 	protected $authURL            = 'https://soundcloud.com/connect';
 	protected $accessTokenURL     = 'https://api.soundcloud.com/oauth2/token';
 	protected $userRevokeURL      = 'https://soundcloud.com/settings/connections';
-	protected $authMethod         = self::HEADER_OAUTH;
+	protected $authMethodHeader   = 'OAuth';
 	protected $endpointMap        = SoundCloudEndpoints::class;
 	protected $apiDocs            = 'https://developers.soundcloud.com/';
 	protected $applicationURL     = 'https://soundcloud.com/you/apps';

src/Twitch/Twitch.php

@@ -55,8 +55,8 @@ class Twitch extends OAuth2Provider implements ClientCredentials, CSRFToken, Tok
 
 	protected $authHeaders        = ['Accept' => 'application/vnd.twitchtv.v5+json'];
 	protected $apiHeaders         = ['Accept' => 'application/vnd.twitchtv.v5+json'];
-	protected $authMethod         = self::HEADER_OAUTH;  // -> https://api.twitch.tv/kraken
-#	protected $authMethod         = self::HEADER_BEARER; // -> https://api.twitch.tv/helix
+	protected $authMethodHeader   = 'OAuth';  // -> https://api.twitch.tv/kraken
+#	protected $authMethodHeader   = 'Bearer'; // -> https://api.twitch.tv/helix
 	protected $endpointMap        = TwitchEndpoints::class;
 	protected $apiDocs            = 'https://dev.twitch.tv/docs/api/reference/';
 	protected $applicationURL     = 'https://dev.twitch.tv/console/apps/create';