Fix wrong roles comparison

thlbaut · chalasr · commit 7d2ad4b265e4 · 2020-05-22T14:29:11.000+02:00
diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php
@@ -317,13 +317,10 @@ private function hasUserChanged(UserInterface $user): bool
             return true;
         }
 
+        $currentUserRoles = array_map('strval', (array) $this->user->getRoles());
         $userRoles = array_map('strval', (array) $user->getRoles());
 
-        if ($this instanceof SwitchUserToken) {
-            $userRoles[] = 'ROLE_PREVIOUS_ADMIN';
-        }
-
-        if (\count($userRoles) !== \count($this->getRoleNames()) || \count($userRoles) !== \count(array_intersect($userRoles, $this->getRoleNames()))) {
+        if (\count($userRoles) !== \count($currentUserRoles) || \count($userRoles) !== \count(array_intersect($userRoles, $currentUserRoles))) {
             return true;
         }
 
diff --git a/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php b/src/Symfony/Component/Security/Core/Tests/Authentication/Token/AbstractTokenTest.php
@@ -238,7 +238,7 @@ public function getUserChangesAdvancedUser()
      */
     public function testSetUserDoesNotSetAuthenticatedToFalseWhenUserDoesNotChange($user)
     {
-        $token = new ConcreteToken();
+        $token = new ConcreteToken(['ROLE_FOO']);
         $token->setAuthenticated(true);
         $this->assertTrue($token->isAuthenticated());
 

Original file line number	Diff line number	Diff line change
`@@ -317,13 +317,10 @@ private function hasUserChanged(UserInterface $user): bool`
`317`	`317`	`return true;`
`318`	`318`	`}`
`319`	`319`
	`320`	`+ $currentUserRoles = array_map('strval', (array) $this->user->getRoles());`
`320`	`321`	`$userRoles = array_map('strval', (array) $user->getRoles());`
`321`	`322`
`322`		`- if ($this instanceof SwitchUserToken) {`
`323`		`- $userRoles[] = 'ROLE_PREVIOUS_ADMIN';`
`324`		`- }`
`325`		`-`
`326`		`- if (\count($userRoles) !== \count($this->getRoleNames()) \|\| \count($userRoles) !== \count(array_intersect($userRoles, $this->getRoleNames()))) {`
	`323`	`+ if (\count($userRoles) !== \count($currentUserRoles) \|\| \count($userRoles) !== \count(array_intersect($userRoles, $currentUserRoles))) {`
`327`	`324`	`return true;`
`328`	`325`	`}`
`329`	`326`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public function getUserChangesAdvancedUser()`
`238`	`238`	`*/`
`239`	`239`	`public function testSetUserDoesNotSetAuthenticatedToFalseWhenUserDoesNotChange($user)`
`240`	`240`	`{`
`241`		`- $token = new ConcreteToken();`
	`241`	`+ $token = new ConcreteToken(['ROLE_FOO']);`
`242`	`242`	`$token->setAuthenticated(true);`
`243`	`243`	`$this->assertTrue($token->isAuthenticated());`
`244`	`244`