[10.x] Remove session on authenticatable deletion v2 (#47141)

* Clear session from storage if no recaller can be found * Update SessionGuard.php * Fixed tests to expect new behavior. --------- Co-authored-by: Taylor Otwell <taylor@laravel.com>
laravel · May 22, 2023 · 8fe2f65 · 8fe2f65
1 parent fa4e0f1
commit 8fe2f65
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/Illuminate/Auth/SessionGuard.php b/src/Illuminate/Auth/SessionGuard.php
@@ -173,6 +173,10 @@ public function user()
             }
         }
 
+        if (is_null($this->user)) {
+            $this->clearUserDataFromStorage();
+        }
+
         return $this->user;
     }
 

diff --git a/tests/Auth/AuthGuardTest.php b/tests/Auth/AuthGuardTest.php
@@ -262,6 +262,9 @@ public function testAuthenticateThrowsWhenUserIsNull()
         $this->expectExceptionMessage('Unauthenticated.');
 
         $guard = $this->getGuard();
+        $guard->setCookieJar($cookies = m::mock(CookieJar::class));
+        $cookies->shouldReceive('unqueue')->once();
+        $guard->getSession()->shouldReceive('remove')->once();
         $guard->getSession()->shouldReceive('get')->once()->andReturn(null);
 
         $guard->authenticate();
@@ -313,6 +316,9 @@ public function testUserMethodReturnsCachedUser()
     public function testNullIsReturnedForUserIfNoUserFound()
     {
         $mock = $this->getGuard();
+        $mock->setCookieJar($cookies = m::mock(CookieJar::class));
+        $cookies->shouldReceive('unqueue')->once();
+        $mock->getSession()->shouldReceive('remove')->once();
         $mock->getSession()->shouldReceive('get')->once()->andReturn(null);
         $this->assertNull($mock->user());
     }