Redirect to previous page after login

fixes tastyigniter/TastyIgniter#1064 Signed-off-by: Sam Poyigi <[email protected]>
tastyigniter · Jan 5, 2024 · d0e2226 · d0e2226
1 parent 3e5aad1
commit d0e2226
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/components/Account.php b/components/Account.php
@@ -104,6 +104,9 @@ public function onRun()
             $this->onActivate($code);
 
         $this->prepareVars();
+
+        if ($this->page->getId() === $this->property('loginPage'))
+            $this->setIntendedUrl();
     }
 
     public function prepareVars()
@@ -427,4 +430,12 @@ protected function makeActivationUrl($code)
 
         return $url;
     }
+
+    protected function setIntendedUrl()
+    {
+        $previousUrl = url()->previous();
+        if (!session()->has('url.intended') && $previousUrl && $previousUrl !== url()->current()) {
+            session(['url.intended' => $previousUrl]);
+        }
+    }
 }