removed TokenExpires interface

codemasher · codemasher · commit ebd24cdcc2a4 · 2019-08-06T15:05:41.000+02:00
diff --git a/README.md b/README.md
@@ -197,13 +197,12 @@ There are several interfaces that can be implemented by OAuth2 providers:
 
 - `ClientCredentials` - allows to fetch client credentials access tokens 
 - `CSRFToken` - enforces the usage/verification of the `<state>` parameter during authentication
-- `TokenExpires` - indicates expiring tokens
 - `TokenRefresh` - allows refreshing expired tokens during requests
 
 ```php
 use chillerlan\OAuth\Core\OAuth2Provider;
 
-class MyOauth2Provider extends Oauth2Provider implements ClientCredentials, CSRFToken, TokenExpires, TokenRefresh{
+class MyOauth2Provider extends Oauth2Provider implements ClientCredentials, CSRFToken, TokenRefresh{
 
 	public const SCOPE_WHATEVER = 'whatever';
 
diff --git a/src/Amazon/Amazon.php b/src/Amazon/Amazon.php
@@ -16,12 +16,12 @@
 
 namespace chillerlan\OAuth\Providers\Amazon;
 
-use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenExpires, TokenRefresh,};
+use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenRefresh,};
 
 /**
  * @method \Psr\Http\Message\ResponseInterface userProfile()
  */
-class Amazon extends OAuth2Provider implements CSRFToken, TokenExpires, TokenRefresh{
+class Amazon extends OAuth2Provider implements CSRFToken, TokenRefresh{
 
 	public const SCOPE_PROFILE         = 'profile';
 	public const SCOPE_PROFILE_USER_ID = 'profile:user_id';
diff --git a/src/BattleNet/BattleNet.php b/src/BattleNet/BattleNet.php
@@ -16,7 +16,7 @@
 
 use chillerlan\OAuth\Storage\OAuthStorageInterface;
 use chillerlan\Settings\SettingsContainerInterface;
-use chillerlan\OAuth\Core\{ClientCredentials, CSRFToken, OAuth2Provider, ProviderException, TokenExpires};
+use chillerlan\OAuth\Core\{ClientCredentials, CSRFToken, OAuth2Provider, ProviderException};
 use Psr\Http\Client\ClientInterface;
 use Psr\Log\LoggerInterface;
 
@@ -25,7 +25,7 @@
 /**
  * @method \Psr\Http\Message\ResponseInterface userinfo(array $params = ['access_token'])
  */
-class BattleNet extends OAuth2Provider implements ClientCredentials, CSRFToken, TokenExpires{
+class BattleNet extends OAuth2Provider implements ClientCredentials, CSRFToken{
 
 	public const SCOPE_OPENID      = 'openid';
 	public const SCOPE_PROFILE_D3  = 'd3.profile';
diff --git a/src/Bitbucket/Bitbucket.php b/src/Bitbucket/Bitbucket.php
@@ -15,12 +15,12 @@
 
 namespace chillerlan\OAuth\Providers\Bitbucket;
 
-use chillerlan\OAuth\Core\{ClientCredentials, CSRFToken, OAuth2Provider, TokenExpires, TokenRefresh};
+use chillerlan\OAuth\Core\{ClientCredentials, CSRFToken, OAuth2Provider, TokenRefresh};
 
 /**
  * @method \Psr\Http\Message\ResponseInterface me()
  */
-class Bitbucket extends OAuth2Provider implements ClientCredentials, CSRFToken, TokenExpires, TokenRefresh{
+class Bitbucket extends OAuth2Provider implements ClientCredentials, CSRFToken, TokenRefresh{
 
 	protected $apiURL         = 'https://api.bitbucket.org';
 	protected $authURL        = 'https://bitbucket.org/site/oauth2/authorize';
diff --git a/src/Deezer/Deezer.php b/src/Deezer/Deezer.php
@@ -17,7 +17,7 @@
 
 namespace chillerlan\OAuth\Providers\Deezer;
 
-use chillerlan\OAuth\Core\{AccessToken, CSRFToken, OAuth2Provider, ProviderException, TokenExpires};
+use chillerlan\OAuth\Core\{AccessToken, CSRFToken, OAuth2Provider, ProviderException};
 use Psr\Http\Message\{ResponseInterface, UriInterface};
 
 use function array_merge, http_build_query, implode, is_array, parse_str;
@@ -28,7 +28,7 @@
 /**
  * @method \Psr\Http\Message\ResponseInterface me()
  */
-class Deezer extends OAuth2Provider implements CSRFToken, TokenExpires{
+class Deezer extends OAuth2Provider implements CSRFToken{
 
 	public const SCOPE_BASIC             = 'basic_access';
 	public const SCOPE_EMAIL             = 'email';
diff --git a/src/DeviantArt/DeviantArt.php b/src/DeviantArt/DeviantArt.php
@@ -12,12 +12,12 @@
 
 namespace chillerlan\OAuth\Providers\DeviantArt;
 
-use chillerlan\OAuth\Core\{ClientCredentials, CSRFToken, OAuth2Provider, TokenExpires, TokenRefresh};
+use chillerlan\OAuth\Core\{ClientCredentials, CSRFToken, OAuth2Provider, TokenRefresh};
 
 /**
  * @method \Psr\Http\Message\ResponseInterface whoami()
  */
-class DeviantArt extends OAuth2Provider implements ClientCredentials, CSRFToken, TokenExpires, TokenRefresh{
+class DeviantArt extends OAuth2Provider implements ClientCredentials, CSRFToken, TokenRefresh{
 
 	public const SCOPE_BASIC        = 'basic';
 	public const SCOPE_BROWSE       = 'browse';
diff --git a/src/Discord/Discord.php b/src/Discord/Discord.php
@@ -14,12 +14,12 @@
 
 namespace chillerlan\OAuth\Providers\Discord;
 
-use chillerlan\OAuth\Core\{ClientCredentials, CSRFToken, OAuth2Provider, TokenExpires, TokenRefresh};
+use chillerlan\OAuth\Core\{ClientCredentials, CSRFToken, OAuth2Provider, TokenRefresh};
 
 /**
  * @method \Psr\Http\Message\ResponseInterface me()
  */
-class Discord extends OAuth2Provider implements ClientCredentials, CSRFToken, TokenExpires, TokenRefresh{
+class Discord extends OAuth2Provider implements ClientCredentials, CSRFToken, TokenRefresh{
 
 	public const SCOPE_BOT                    = 'bot';
 	public const SCOPE_CONNECTIONS            = 'connections';
diff --git a/src/GitLab/GitLab.php b/src/GitLab/GitLab.php
@@ -14,12 +14,12 @@
 
 namespace chillerlan\OAuth\Providers\GitLab;
 
-use chillerlan\OAuth\Core\{ClientCredentials, CSRFToken, OAuth2Provider, TokenExpires, TokenRefresh};
+use chillerlan\OAuth\Core\{ClientCredentials, CSRFToken, OAuth2Provider, TokenRefresh};
 
 /**
  * @method \Psr\Http\Message\ResponseInterface me()
  */
-class GitLab extends OAuth2Provider implements ClientCredentials, CSRFToken, TokenExpires, TokenRefresh{
+class GitLab extends OAuth2Provider implements ClientCredentials, CSRFToken, TokenRefresh{
 
 	protected $apiURL         = 'https://gitlab.com/api';
 	protected $authURL        = 'https://gitlab.com/oauth/authorize';
diff --git a/src/Gitter/Gitter.php b/src/Gitter/Gitter.php
@@ -15,12 +15,12 @@
 
 namespace chillerlan\OAuth\Providers\Gitter;
 
-use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenExpires};
+use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider};
 
 /**
  * @method \Psr\Http\Message\ResponseInterface me()
  */
-class Gitter extends OAuth2Provider implements CSRFToken, TokenExpires{
+class Gitter extends OAuth2Provider implements CSRFToken{
 
 	public const SCOPE_FLOW    = 'flow';
 	public const SCOPE_PRIVATE = 'private';
diff --git a/src/Google/Google.php b/src/Google/Google.php
@@ -16,12 +16,12 @@
 
 namespace chillerlan\OAuth\Providers\Google;
 
-use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenExpires};
+use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider};
 
 /**
  * @method \Psr\Http\Message\ResponseInterface me()
  */
-class Google extends OAuth2Provider implements CSRFToken, TokenExpires{
+class Google extends OAuth2Provider implements CSRFToken{
 
 	public const SCOPE_EMAIL            = 'email';
 	public const SCOPE_PROFILE          = 'profile';
diff --git a/src/Imgur/Imgur.php b/src/Imgur/Imgur.php
@@ -19,12 +19,12 @@
 
 namespace chillerlan\OAuth\Providers\Imgur;
 
-use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenExpires, TokenRefresh};
+use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenRefresh};
 
 /**
  * @method \Psr\Http\Message\ResponseInterface me()
  */
-class Imgur extends OAuth2Provider implements CSRFToken, TokenExpires, TokenRefresh{
+class Imgur extends OAuth2Provider implements CSRFToken, TokenRefresh{
 
 	protected $apiURL         = 'https://api.imgur.com';
 	protected $authURL        = 'https://api.imgur.com/oauth2/authorize';
diff --git a/src/Mastodon/Mastodon.php b/src/Mastodon/Mastodon.php
@@ -15,7 +15,7 @@
 
 namespace chillerlan\OAuth\Providers\Mastodon;
 
-use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenExpires, TokenRefresh};
+use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenRefresh};
 use chillerlan\OAuth\OAuthException;
 
 use function parse_url;
@@ -97,7 +97,7 @@
  * @method \Psr\Http\Message\ResponseInterface updatePushSubscription(array $body = ['data'])
  * @method \Psr\Http\Message\ResponseInterface userSearch(array $params = ['q', 'limit', 'following'])
  */
-class Mastodon extends OAuth2Provider implements CSRFToken, TokenExpires, TokenRefresh{
+class Mastodon extends OAuth2Provider implements CSRFToken, TokenRefresh{
 
 	public const SCOPE_READ   = 'read';
 	public const SCOPE_WRITE  = 'write';
diff --git a/src/Microsoft/AzureActiveDirectory.php b/src/Microsoft/AzureActiveDirectory.php
@@ -14,11 +14,11 @@
 
 namespace chillerlan\OAuth\Providers\Microsoft;
 
-use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenExpires};
+use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider};
 
 /**
  */
-abstract class AzureActiveDirectory extends OAuth2Provider implements CSRFToken, TokenExpires{
+abstract class AzureActiveDirectory extends OAuth2Provider implements CSRFToken{
 
 	public const SCOPE_OPENID         = 'openid';
 	public const SCOPE_OPENID_EMAIL   = 'email';
diff --git a/src/NPR/NPROne.php b/src/NPR/NPROne.php
@@ -15,7 +15,7 @@
 
 namespace chillerlan\OAuth\Providers\NPR;
 
-use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenExpires, TokenRefresh};
+use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenRefresh};
 use Psr\Http\Message\{RequestInterface, ResponseInterface};
 
 use function strpos;
@@ -37,7 +37,7 @@
  * @method \Psr\Http\Message\ResponseInterface station(string $stationId)
  * @method \Psr\Http\Message\ResponseInterface stations()
  */
-class NPROne extends OAuth2Provider implements CSRFToken, TokenExpires, TokenRefresh{
+class NPROne extends OAuth2Provider implements CSRFToken, TokenRefresh{
 
 	public const SCOPE_IDENTITY_READONLY  = 'identity.readonly';
 	public const SCOPE_IDENTITY_WRITE     = 'identity.write';
diff --git a/src/Patreon/PatreonAbstract.php b/src/Patreon/PatreonAbstract.php
@@ -12,11 +12,11 @@
 
 namespace chillerlan\OAuth\Providers\Patreon;
 
-use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenExpires, TokenRefresh};
+use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenRefresh};
 
 /**
  */
-abstract class PatreonAbstract extends OAuth2Provider implements CSRFToken, TokenExpires, TokenRefresh{
+abstract class PatreonAbstract extends OAuth2Provider implements CSRFToken, TokenRefresh{
 
 	protected $authURL        = 'https://www.patreon.com/oauth2/authorize';
 	protected $accessTokenURL = 'https://www.patreon.com/api/oauth2/token';
diff --git a/src/PayPal/PayPal.php b/src/PayPal/PayPal.php
@@ -14,7 +14,7 @@
 
 namespace chillerlan\OAuth\Providers\PayPal;
 
-use chillerlan\OAuth\Core\{AccessToken, ClientCredentials, CSRFToken, OAuth2Provider, ProviderException, TokenExpires, TokenRefresh};
+use chillerlan\OAuth\Core\{AccessToken, ClientCredentials, CSRFToken, OAuth2Provider, ProviderException, TokenRefresh};
 use Psr\Http\Message\ResponseInterface;
 
 use function array_column, base64_encode, http_build_query, implode, is_array, json_decode;
@@ -25,7 +25,7 @@
 /**
  * @method \Psr\Http\Message\ResponseInterface me(array $params = ['schema'])
  */
-class PayPal extends OAuth2Provider implements ClientCredentials, CSRFToken, TokenExpires, TokenRefresh{
+class PayPal extends OAuth2Provider implements ClientCredentials, CSRFToken, TokenRefresh{
 
 	public const SCOPE_BASIC_AUTH = 'openid';
 	public const SCOPE_FULL_NAME  = 'profile';
diff --git a/src/SoundCloud/SoundCloud.php b/src/SoundCloud/SoundCloud.php
@@ -15,13 +15,13 @@
 
 namespace chillerlan\OAuth\Providers\SoundCloud;
 
-use chillerlan\OAuth\Core\{OAuth2Provider, TokenExpires};
+use chillerlan\OAuth\Core\{OAuth2Provider};
 
 /**
  * @method \Psr\Http\Message\ResponseInterface me()
  * @method \Psr\Http\Message\ResponseInterface user(string $id)
  */
-class SoundCloud extends OAuth2Provider implements TokenExpires{
+class SoundCloud extends OAuth2Provider{
 
 	public const SCOPE_NONEXPIRING = 'non-expiring';
 #	public const SCOPE_EMAIL       = 'email'; // ???
diff --git a/src/Spotify/Spotify.php b/src/Spotify/Spotify.php
@@ -15,7 +15,7 @@
 
 namespace chillerlan\OAuth\Providers\Spotify;
 
-use chillerlan\OAuth\Core\{ClientCredentials, CSRFToken, OAuth2Provider, TokenExpires, TokenRefresh};
+use chillerlan\OAuth\Core\{ClientCredentials, CSRFToken, OAuth2Provider, TokenRefresh};
 
 /**
  * @method \Psr\Http\Message\ResponseInterface album(string $id, array $params = ['market'])
@@ -82,7 +82,7 @@
  * @method \Psr\Http\Message\ResponseInterface userPlaylists(string $user_id, array $params = ['limit', 'offset'])
  * @method \Psr\Http\Message\ResponseInterface volume(array $params = ['volume_percent', 'device_id'])
  */
-class Spotify extends OAuth2Provider implements ClientCredentials, CSRFToken, TokenExpires, TokenRefresh{
+class Spotify extends OAuth2Provider implements ClientCredentials, CSRFToken, TokenRefresh{
 
 	public const SCOPE_PLAYLIST_READ_PRIVATE       = 'playlist-read-private';
 	public const SCOPE_PLAYLIST_READ_COLLABORATIVE = 'playlist-read-collaborative';
diff --git a/src/Stripe/Stripe.php b/src/Stripe/Stripe.php
@@ -18,12 +18,12 @@
 
 namespace chillerlan\OAuth\Providers\Stripe;
 
-use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenExpires, TokenRefresh};
+use chillerlan\OAuth\Core\{CSRFToken, OAuth2Provider, TokenRefresh};
 
 /**
  * @method \Psr\Http\Message\ResponseInterface me()
  */
-class Stripe extends OAuth2Provider implements CSRFToken, TokenExpires, TokenRefresh{
+class Stripe extends OAuth2Provider implements CSRFToken, TokenRefresh{
 
 	public const SCOPE_READ_WRITE = 'read_write';
 	public const SCOPE_READ_ONLY  = 'read_only';
diff --git a/src/Twitch/Twitch.php b/src/Twitch/Twitch.php
@@ -52,7 +52,7 @@ class Twitch extends OAuth2Provider implements ClientCredentials, CSRFToken, Tok
 	protected $accessTokenURL     = 'https://api.twitch.tv/kraken/oauth2/token';
 	protected $userRevokeURL      = 'https://www.twitch.tv/settings/connections';
 	protected $revokeURL          = 'https://api.twitch.tv/kraken/oauth2/revoke';
-#	protected $accessTokenExpires = true;
+
 	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
diff --git a/src/Vimeo/Vimeo.php b/src/Vimeo/Vimeo.php
@@ -15,7 +15,7 @@
 
 namespace chillerlan\OAuth\Providers\Vimeo;
 
-use chillerlan\OAuth\Core\{ClientCredentials, CSRFToken, OAuth2Provider, TokenExpires};
+use chillerlan\OAuth\Core\{ClientCredentials, CSRFToken, OAuth2Provider};
 
 /**
  * @method \Psr\Http\Message\ResponseInterface me()
@@ -97,7 +97,7 @@
  * @method \Psr\Http\Message\ResponseInterface videoAssignPreset(string $video_id, string $preset_id)
  * @method \Psr\Http\Message\ResponseInterface videoLikes(string $video_id, array $params = ['query', 'page', 'per_page', 'sort', 'direction'])
  */
-class Vimeo extends OAuth2Provider implements ClientCredentials, CSRFToken, TokenExpires{
+class Vimeo extends OAuth2Provider implements ClientCredentials, CSRFToken{
 
 	public const SCOPE_PRIVATE     = 'private';
 	public const SCOPE_PUBLIC      = 'public';
