Added an event triggered before redirect

lookyman · Jun 16, 2017 · 1d2f9b0 · 1d2f9b0
1 parent 738fa70
commit 1d2f9b0
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 0 deletions.
diff --git a/src/UI/OAuth2Presenter.php b/src/UI/OAuth2Presenter.php
@@ -14,13 +14,21 @@
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 
+/**
+ * @method void onBeforeRedirect()
+ */
 class OAuth2Presenter extends Presenter implements LoggerAwareInterface
 {
 	use LoggerAwareTrait;
 	use Psr7Trait;
 
 	const SESSION_NAMESPACE = 'nette-oauth2-server';
 
+	/**
+	 * @var callable[]
+	 */
+	public $onBeforeRedirect = [];
+
 	/**
 	 * @var IAuthorizationRequestSerializer
 	 * @inject
@@ -86,6 +94,7 @@ public function actionAuthorize()
 			$this->getSession(self::SESSION_NAMESPACE)->authorizationRequest = $this->authorizationRequestSerializer->serialize(
 				$this->authorizationServer->validateAuthorizationRequest($this->createServerRequest())
 			);
+			$this->onBeforeRedirect();
 			if (!$this->getUser()->isLoggedIn()) {
 				$this->redirect(...$this->redirectConfig->getLoginDestination());
 			}

diff --git a/tests/UI/OAuth2PresenterTest.php b/tests/UI/OAuth2PresenterTest.php
@@ -153,8 +153,14 @@ public function testActionAuthorizeUnlogged()
 		$presenter->authorizationServer = $authorizationServer;
 		$presenter->redirectConfig = $config;
 
+		$redirectEventTriggered = false;
+		$presenter->onBeforeRedirect[] = function () use (&$redirectEventTriggered) {
+			$redirectEventTriggered = true;
+		};
+
 		$response = $presenter->run(new Request('', null, ['action' => 'authorize']));
 		self::assertInstanceOf(RedirectResponse::class, $response);
+		self::assertTrue($redirectEventTriggered);
 	}
 
 	public function testActionAuthorizeLogged()
@@ -185,8 +191,14 @@ public function testActionAuthorizeLogged()
 		$presenter->authorizationServer = $authorizationServer;
 		$presenter->redirectConfig = $config;
 
+		$redirectEventTriggered = false;
+		$presenter->onBeforeRedirect[] = function () use (&$redirectEventTriggered) {
+			$redirectEventTriggered = true;
+		};
+
 		$response = $presenter->run(new Request('', null, ['action' => 'authorize']));
 		self::assertInstanceOf(RedirectResponse::class, $response);
+		self::assertTrue($redirectEventTriggered);
 	}
 
 	public function testActionAuthorizeWrongMethod()
@@ -200,8 +212,14 @@ public function testActionAuthorizeWrongMethod()
 		$presenter = new OAuth2Presenter();
 		$presenter->injectPrimary(null, null, null, $httpRequest, $httpResponse);
 
+		$redirectEventTriggered = false;
+		$presenter->onBeforeRedirect[] = function () use (&$redirectEventTriggered) {
+			$redirectEventTriggered = true;
+		};
+
 		$response = $presenter->run(new Request('', null, ['action' => 'authorize']));
 		self::assertInstanceOf(Response::class, $response);
+		self::assertFalse($redirectEventTriggered);
 		$this->expectOutputString('Method not allowed');
 		$response->send($httpRequest, $httpResponse);
 	}
@@ -222,8 +240,14 @@ public function testActionAuthorizeOAuthException()
 		$presenter->authorizationRequestSerializer = $this->getMockBuilder(IAuthorizationRequestSerializer::class)->disableOriginalConstructor()->getMock();
 		$presenter->authorizationServer = $authorizationServer;
 
+		$redirectEventTriggered = false;
+		$presenter->onBeforeRedirect[] = function () use (&$redirectEventTriggered) {
+			$redirectEventTriggered = true;
+		};
+
 		$response = $presenter->run(new Request('', null, ['action' => 'authorize']));
 		self::assertInstanceOf(Response::class, $response);
+		self::assertFalse($redirectEventTriggered);
 		ob_start();
 		$response->send($httpRequest, $httpResponse);
 		ob_end_clean();
@@ -245,8 +269,14 @@ public function testActionAuthorizeException()
 		$presenter->authorizationRequestSerializer = $this->getMockBuilder(IAuthorizationRequestSerializer::class)->disableOriginalConstructor()->getMock();
 		$presenter->authorizationServer = $authorizationServer;
 
+		$redirectEventTriggered = false;
+		$presenter->onBeforeRedirect[] = function () use (&$redirectEventTriggered) {
+			$redirectEventTriggered = true;
+		};
+
 		$response = $presenter->run(new Request('', null, ['action' => 'authorize']));
 		self::assertInstanceOf(Response::class, $response);
+		self::assertFalse($redirectEventTriggered);
 		$this->expectOutputString('Unknown error');
 		$response->send($httpRequest, $httpResponse);
 	}
@@ -273,8 +303,14 @@ public function testActionAuthorizeExceptionWithLogger()
 		$presenter->authorizationServer = $authorizationServer;
 		$presenter->setLogger($logger);
 
+		$redirectEventTriggered = false;
+		$presenter->onBeforeRedirect[] = function () use (&$redirectEventTriggered) {
+			$redirectEventTriggered = true;
+		};
+
 		$response = $presenter->run(new Request('', null, ['action' => 'authorize']));
 		self::assertInstanceOf(Response::class, $response);
+		self::assertFalse($redirectEventTriggered);
 		$this->expectOutputString('Unknown error');
 		$response->send($httpRequest, $httpResponse);
 	}