From 45a4849448b4ce24e77c2bc0c14a66d713b3ba77 Mon Sep 17 00:00:00 2001
From: Sajjad Hasehmian <wolaws@gmail.com>
Date: Tue, 9 Feb 2016 16:26:25 +0330
Subject: [PATCH] Correct redirect uri in OAuth2 Controller (fixes #778)

---
 .../core/src/Forum/Controller/AbstractOAuth2Controller.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/core/src/Forum/Controller/AbstractOAuth2Controller.php b/framework/core/src/Forum/Controller/AbstractOAuth2Controller.php
index 8ae8957ec..6ea3ddd73 100644
--- a/framework/core/src/Forum/Controller/AbstractOAuth2Controller.php
+++ b/framework/core/src/Forum/Controller/AbstractOAuth2Controller.php
@@ -38,7 +38,7 @@ abstract class AbstractOAuth2Controller implements ControllerInterface
      */
     public function handle(Request $request)
     {
-        $redirectUri = (string) $request->getUri()->withQuery('');
+        $redirectUri = (string) $request->getAttribute('originalUri', $request->getUri())->withQuery('');
 
         $provider = $this->getProvider($redirectUri);