Merge pull request #324 from MasoniteFramework/master

Next Minor

Author: josephmancuso

masonite.db-journal

@@ -2,7 +2,7 @@
 __title__ = 'masonite'
 __description__ = 'The core for the Masonite framework'
 __url__ = 'https://github.com/MasoniteFramework/masonite'
-__version__ = '2.3.15'
+__version__ = '2.3.16'
 __author__ = 'Joseph Mancuso'
 __author_email__ = '[email protected]'
 __licence__ = 'MIT'

src/masonite/__version__.py

@@ -26,7 +26,12 @@ def back(location=None):
     """
     if location is None:
         from wsgi import container
-        location = container.make('Request').path
+        request = container.make('Request')
+        intended_route = request.session.get('__intend')
+        if intended_route:
+            location = intended_route
+        else:
+            location = request.path
 
     return Markup("<input type='hidden' name='__back' value='{0}'>".format(location))
 

src/masonite/helpers/view_helpers.py

@@ -943,13 +943,27 @@ def back(self, default=None):
         self.with_input()
 
         redirect_url = self.input('__back')
+
         if not redirect_url and default:
             return self.redirect(default)
         elif not redirect_url and not default:
             return self.redirect(self.path)  # Some global default?
 
         return self.redirect(redirect_url)
 
+    def then_back(self):
+        self.session.set('__intend', self.path)
+        return self
+
+    def redirect_intended(self, default=None):
+        if self.session.get('__intend'):
+            self.redirect(self.session.get('__intend'))
+            self.session.delete('__intend')
+        else:
+            self.redirect(default)
+
+        return self
+
     def flash_inputs_to_session(self):
         if not hasattr(self, 'session'):
             return

src/masonite/request.py

@@ -7,10 +7,12 @@ class TestSession(TestCase):
 
     def setUp(self):
         super().setUp()
-        self.container.make('Request').load_environ(generate_wsgi())
+        self.container.make('Request').load_environ(generate_wsgi()).load_app(self.container)
         self.container.bind('SessionMemoryDriver', SessionMemoryDriver)
         self.container.bind('SessionCookieDriver', SessionCookieDriver)
         self.container.bind('SessionManager', SessionManager(self.container))
+        self.container.make('Request').session = self.container.make('SessionManager').driver('cookie')
+        self.container.bind('StatusCode', 200)
 
     def test_session_request(self):
         for driver in ('memory', 'cookie'):
@@ -151,3 +153,17 @@ def test_can_redirect_with_bytes_inputs(self):
             request.with_input()
             self.assertFalse(session.has('byte'))
             self.assertTrue(session.has('key2'))
+
+    def test_intended_returns_correct_url(self):
+        request = self.container.make('Request')
+        request.redirect('/dashboard')
+        self.assertEqual(request.redirect_url, '/dashboard')
+
+        request.path = '/test'
+
+        request.redirect('/dashboard').then_back()
+        self.assertEqual(request.session.get('__intend'), '/test')
+
+        # Assert redirect intended method resets the redirection
+        request.redirect_intended()
+        self.assertEqual(request.session.get('__intend'), None)