Merge pull request #930 from MasoniteFramework/fix/ajax-user

users now login immediately

masonite/__version__.py

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

masonite/auth/Auth.py

@@ -85,6 +85,8 @@ def login(self, name, password):
                     model.remember_token = remember_token
                     model.save()
                     self.request.app().make('AuthManager').driver(self.driver).save(remember_token, model=model)
+
+                self.request.set_user(model)
                 return model
 
         except Exception as exception:
@@ -99,6 +101,7 @@ def logout(self):
             self
         """
         self.request.app().make('AuthManager').driver(self.driver).delete()
+        self.request.reset_user()
         return self
 
     def login_by_id(self, user_id):
@@ -118,6 +121,7 @@ def login_by_id(self, user_id):
                 model.remember_token = remember_token
                 model.save()
                 self.request.app().make('AuthManager').driver(self.driver).save(remember_token, model=model)
+            self.request.set_user(model)
             return model
 
         return False

masonite/request.py

@@ -613,6 +613,11 @@ def set_user(self, user_model):
 
         return self
 
+    def reset_user(self):
+        """Resets the user back to none
+        """
+        self.user_model = None
+
     def user(self):
         """Load the user into the class.
 

tests/core/test_auth.py

@@ -101,6 +101,7 @@ def test_get_user(self):
         for driver in ('cookie', 'jwt'):
             self.auth.driver = driver
             self.assertTrue(self.auth.login_by_id(1))
+            self.assertTrue(self.request.user())
 
     def test_get_user_returns_false_if_not_loggedin(self):
         for driver in ('cookie', 'jwt'):
@@ -114,10 +115,12 @@ def test_logout_user(self):
             self.auth.login('[email protected]', 'secret')
             self.assertTrue(self.request.get_cookie('token'))
             self.assertTrue(self.auth.user())
+            self.assertTrue(self.request.user())
 
             self.auth.logout()
             self.assertFalse(self.request.get_cookie('token'))
             self.assertFalse(self.auth.user())
+            self.assertFalse(self.request.user())
 
     def test_login_user_fails(self):
         for driver in ('cookie', 'jwt'):