Skip to content

Commit 975d60a

Browse files
Regenerate session during Auth::login() (#57204)
* Swap session migrate for regenerate in login flow * Update AuthGuard tests * Update SessionGuard.php * Update SessionGuard.php --------- Co-authored-by: Taylor Otwell <[email protected]>
1 parent 5718d44 commit 975d60a

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/Illuminate/Auth/SessionGuard.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ public function login(AuthenticatableContract $user, $remember = false)
566566
}
567567

568568
/**
569-
* Update the session with the given ID.
569+
* Update the session with the given ID and regenerate the session's token.
570570
*
571571
* @param string $id
572572
* @return void
@@ -575,7 +575,7 @@ protected function updateSession($id)
575575
{
576576
$this->session->put($this->getName(), $id);
577577

578-
$this->session->migrate(true);
578+
$this->session->regenerate(true);
579579
}
580580

581581
/**

tests/Auth/AuthGuardTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public function testAttemptAndWithCallbacks()
158158
$mock->expects($this->once())->method('getName')->willReturn('foo');
159159
$user->shouldReceive('getAuthIdentifier')->once()->andReturn('bar');
160160
$mock->getSession()->shouldReceive('put')->with('foo', 'bar')->once();
161-
$session->shouldReceive('migrate')->once();
161+
$session->shouldReceive('regenerate')->once();
162162
$mock->getProvider()->shouldReceive('retrieveByCredentials')->times(3)->with(['foo'])->andReturn($user);
163163
$mock->getProvider()->shouldReceive('validateCredentials')->twice()->andReturnTrue();
164164
$mock->getProvider()->shouldReceive('validateCredentials')->once()->andReturnFalse();
@@ -233,7 +233,7 @@ public function testLoginStoresIdentifierInSession()
233233
$mock->expects($this->once())->method('getName')->willReturn('foo');
234234
$user->shouldReceive('getAuthIdentifier')->once()->andReturn('bar');
235235
$mock->getSession()->shouldReceive('put')->with('foo', 'bar')->once();
236-
$session->shouldReceive('migrate')->once();
236+
$session->shouldReceive('regenerate')->once();
237237
$mock->login($user);
238238
}
239239

@@ -261,7 +261,7 @@ public function testLoginFiresLoginAndAuthenticatedEvents()
261261
$mock->expects($this->once())->method('getName')->willReturn('foo');
262262
$user->shouldReceive('getAuthIdentifier')->once()->andReturn('bar');
263263
$mock->getSession()->shouldReceive('put')->with('foo', 'bar')->once();
264-
$session->shouldReceive('migrate')->once();
264+
$session->shouldReceive('regenerate')->once();
265265
$mock->login($user);
266266
}
267267

@@ -501,7 +501,7 @@ public function testLoginMethodQueuesCookieWhenRemembering()
501501
$cookie->shouldReceive('make')->once()->with($guard->getRecallerName(), 'foo|recaller|bar', 576000)->andReturn($foreverCookie);
502502
$cookie->shouldReceive('queue')->once()->with($foreverCookie);
503503
$guard->getSession()->shouldReceive('put')->once()->with($guard->getName(), 'foo');
504-
$session->shouldReceive('migrate')->once();
504+
$session->shouldReceive('regenerate')->once();
505505
$user = m::mock(Authenticatable::class);
506506
$user->shouldReceive('getAuthIdentifier')->andReturn('foo');
507507
$user->shouldReceive('getAuthPassword')->andReturn('bar');
@@ -521,7 +521,7 @@ public function testLoginMethodQueuesCookieWhenRememberingAndAllowsOverride()
521521
$cookie->shouldReceive('make')->once()->with($guard->getRecallerName(), 'foo|recaller|bar', 5000)->andReturn($foreverCookie);
522522
$cookie->shouldReceive('queue')->once()->with($foreverCookie);
523523
$guard->getSession()->shouldReceive('put')->once()->with($guard->getName(), 'foo');
524-
$session->shouldReceive('migrate')->once();
524+
$session->shouldReceive('regenerate')->once();
525525
$user = m::mock(Authenticatable::class);
526526
$user->shouldReceive('getAuthIdentifier')->andReturn('foo');
527527
$user->shouldReceive('getAuthPassword')->andReturn('bar');
@@ -540,7 +540,7 @@ public function testLoginMethodCreatesRememberTokenIfOneDoesntExist()
540540
$cookie->shouldReceive('make')->once()->andReturn($foreverCookie);
541541
$cookie->shouldReceive('queue')->once()->with($foreverCookie);
542542
$guard->getSession()->shouldReceive('put')->once()->with($guard->getName(), 'foo');
543-
$session->shouldReceive('migrate')->once();
543+
$session->shouldReceive('regenerate')->once();
544544
$user = m::mock(Authenticatable::class);
545545
$user->shouldReceive('getAuthIdentifier')->andReturn('foo');
546546
$user->shouldReceive('getAuthPassword')->andReturn('foo');
@@ -608,7 +608,7 @@ public function testUserUsesRememberCookieIfItExists()
608608
$guard->getProvider()->shouldReceive('retrieveByToken')->once()->with('id', 'recaller')->andReturn($user);
609609
$user->shouldReceive('getAuthIdentifier')->once()->andReturn('bar');
610610
$guard->getSession()->shouldReceive('put')->with($guard->getName(), 'bar')->once();
611-
$session->shouldReceive('migrate')->once();
611+
$session->shouldReceive('regenerate')->once();
612612
$this->assertSame($user, $guard->user());
613613
$this->assertTrue($guard->viaRemember());
614614
}

0 commit comments

Comments
 (0)