Merge branch '5.8.x' into 6.0.x

marcusdacoregio · marcusdacoregio · commit 8a2b96795e8f · 2023-03-22T09:21:50.000-03:00
diff --git a/docs/modules/ROOT/pages/servlet/authentication/session-management.adoc b/docs/modules/ROOT/pages/servlet/authentication/session-management.adoc
@@ -157,7 +157,7 @@ public void login(@RequestBody LoginRequest loginRequest, HttpServletRequest req
     Authentication authentication = authenticationManager.authenticate(token); <4>
     SecurityContext context = securityContextHolderStrategy.createEmptyContext();
     context.setAuthentication(authentication); <5>
-    securityContextHolderStrategy.setContext(authentication);
+    securityContextHolderStrategy.setContext(context);
     securityContextRepository.saveContext(context, request, response); <6>
 }
 
@@ -825,7 +825,7 @@ public class SomeClass {
         // ...
         SecurityContext context = this.securityContextHolderStrategy.createEmptyContext(); <1>
         context.setAuthentication(authentication); <2>
-        this.securityContextHolderStrategy.setContext(authentication); <3>
+        this.securityContextHolderStrategy.setContext(context); <3>
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public void login(@RequestBody LoginRequest loginRequest, HttpServletRequest req`
`157`	`157`	`Authentication authentication = authenticationManager.authenticate(token); <4>`
`158`	`158`	`SecurityContext context = securityContextHolderStrategy.createEmptyContext();`
`159`	`159`	`context.setAuthentication(authentication); <5>`
`160`		`- securityContextHolderStrategy.setContext(authentication);`
	`160`	`+ securityContextHolderStrategy.setContext(context);`
`161`	`161`	`securityContextRepository.saveContext(context, request, response); <6>`
`162`	`162`	`}`
`163`	`163`
`@@ -825,7 +825,7 @@ public class SomeClass {`
`825`	`825`	`// ...`
`826`	`826`	`SecurityContext context = this.securityContextHolderStrategy.createEmptyContext(); <1>`
`827`	`827`	`context.setAuthentication(authentication); <2>`
`828`		`- this.securityContextHolderStrategy.setContext(authentication); <3>`
	`828`	`+ this.securityContextHolderStrategy.setContext(context); <3>`
`829`	`829`	`}`
`830`	`830`
`831`	`831`	`}`