Extract method for easier extension/overwriting.

cakephp · Oct 13, 2016 · 0b9fcb3 · 0b9fcb3
1 parent f71b823
commit 0b9fcb3
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/src/Controller/Component/AuthComponent.php b/src/Controller/Component/AuthComponent.php
@@ -402,10 +402,7 @@ protected function _unauthenticated(Controller $controller)
      */
     protected function _loginActionRedirectUrl()
     {
-        $urlToRedirectBackTo = $this->request->here(false);
-        if (!$this->request->is('get')) {
-            $urlToRedirectBackTo = $this->request->referer(true);
-        }
+        $urlToRedirectBackTo = $this->_getUrlToRedirectBackTo();
 
         $loginAction = $this->_config['loginAction'];
         if ($urlToRedirectBackTo === '/') {
@@ -999,4 +996,22 @@ public function authorizationProvider()
     {
         return $this->_authorizationProvider;
     }
+
+    /**
+     * Returns the URL to redirect back to or / if not possible.
+     *
+     * This method takes the referrer into account as long as the
+     * request is of type GET.
+     *
+     * @return string
+     */
+    protected function _getUrlToRedirectBackTo()
+    {
+        $urlToRedirectBackTo = $this->request->here(false);
+        if (!$this->request->is('get')) {
+            $urlToRedirectBackTo = $this->request->referer(true);
+        }
+
+        return $urlToRedirectBackTo;
+    }
 }