🚿

Author: codemasher

resources/db.mysql.sql

@@ -18,7 +18,7 @@
  * @property \chillerlan\OAuthExamples\OAuth2Testprovider $provider
  */
 class GenericOAuth2Test extends OAuth2Test{
-	use SupportsOAuth2ClientCredentials, SupportsOAuth2TokenRefresh;
+	use SupportsOAuth2ClientCredentials, SupportsOAuth2TokenRefresh, SupportsCSRFToken;
 
 	protected $FQCN = OAuth2Testprovider::class;
 }

resources/providers.json

@@ -12,11 +12,11 @@
 
 namespace chillerlan\OAuthTest\Providers;
 
-use chillerlan\OAuth\{
-	OAuthOptions, Providers\ClientCredentials, Providers\CSRFToken, Providers\OAuth2Interface, Providers\TokenRefresh, Token
-};
 use chillerlan\HTTP\{
-	HTTPClientInterface, HTTPClientAbstract, HTTPResponse, HTTPResponseInterface
+	HTTPClientAbstract, HTTPClientInterface, HTTPResponse, HTTPResponseInterface
+};
+use chillerlan\OAuth\{
+	OAuthOptions, Providers\ClientCredentials, Providers\CSRFToken, Providers\TokenRefresh, Token
 };
 
 /**
@@ -59,7 +59,10 @@ protected function setUp(){
 			$this->setProperty($this->provider, 'clientCredentialsTokenURL', 'https://localhost/oauth2/client_credentials');
 		}
 
-		$this->storage->storeCSRFState($this->provider->serviceName, 'test_state');
+		if($this->provider instanceof CSRFToken){
+			$this->storage->storeCSRFState($this->provider->serviceName, 'test_state');
+		}
+
 	}
 
 	protected function initHttp():HTTPClientInterface{
@@ -135,49 +138,6 @@ public function testParseTokenResponseNoToken(){
 			->invokeArgs($this->provider, [new HTTPResponse(['body' => json_encode(['foo' => 'bar'])])]);
 	}
 
-	public function testCheckCSRFState(){
-
-		if(!$this->provider instanceof CSRFToken){
-			$this->markTestSkipped('N/A');
-		}
-
-		$provider = $this
-			->getMethod('checkState')
-			->invokeArgs($this->provider, ['test_state']);
-
-		$this->assertInstanceOf(OAuth2Interface::class, $provider);
-	}
-
-	/**
-	 * @expectedException \chillerlan\OAuth\Providers\ProviderException
-	 * @expectedExceptionMessage invalid state
-	 */
-	public function testCheckStateInvalid(){
-
-		if(!$this->provider instanceof CSRFToken){
-			$this->markTestSkipped('N/A');
-		}
-
-		$this
-			->getMethod('checkState')
-			->invoke($this->provider);
-	}
-
-	/**
-	 * @expectedException \chillerlan\OAuth\Providers\ProviderException
-	 * @expectedExceptionMessage invalid CSRF state
-	 */
-	public function testCheckStateInvalidCSRFState(){
-
-		if(!$this->provider instanceof CSRFToken){
-			$this->markTestSkipped('N/A');
-		}
-
-		$this
-			->getMethod('checkState')
-			->invokeArgs($this->provider, ['invalid_test_state']);
-	}
-
 	public function testRequest(){
 		$this->storeToken(new Token(['accessToken' => 'test_access_token_secret', 'expires' => 1]));
 

tests/Providers/GenericOAuth2Test.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Trait SupportsCSRFToken
+ *
+ * @filesource   SupportsCSRFToken.php
+ * @created      20.04.2018
+ * @package      chillerlan\OAuthTest\Providers
+ * @author       smiley <smiley@chillerlan.net>
+ * @copyright    2018 smiley
+ * @license      MIT
+ */
+
+namespace chillerlan\OAuthTest\Providers;
+
+use chillerlan\OAuth\Providers\OAuth2Interface;
+
+/**
+ */
+trait SupportsCSRFToken{
+
+	public function testCheckCSRFState(){
+
+		$provider = $this
+			->getMethod('checkState')
+			->invokeArgs($this->provider, ['test_state']);
+
+		$this->assertInstanceOf(OAuth2Interface::class, $provider);
+	}
+
+	/**
+	 * @expectedException \chillerlan\OAuth\Providers\ProviderException
+	 * @expectedExceptionMessage invalid state
+	 */
+	public function testCheckStateInvalid(){
+
+		$this
+			->getMethod('checkState')
+			->invoke($this->provider);
+	}
+
+	/**
+	 * @expectedException \chillerlan\OAuth\Providers\ProviderException
+	 * @expectedExceptionMessage invalid CSRF state
+	 */
+	public function testCheckStateInvalidCSRFState(){
+
+		$this
+			->getMethod('checkState')
+			->invokeArgs($this->provider, ['invalid_test_state']);
+	}
+
+
+}