Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.8.x' into 6.0.x

This commit is contained in:
Josh Cummings 2023-08-07 14:48:12 -06:00
parent c4b773b150 e8b9a35494
commit 1f27b18398
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/modules/ROOT/pages/servlet/oauth2/resource-server/bearer-tokens.adoc
View File

@ -241,16 +241,15 @@ fun rest(): RestTemplate {
val rest = RestTemplate() val rest = RestTemplate()
rest.interceptors.add(ClientHttpRequestInterceptor { request, body, execution -> rest.interceptors.add(ClientHttpRequestInterceptor { request, body, execution ->
val authentication: Authentication? = SecurityContextHolder.getContext().authentication val authentication: Authentication? = SecurityContextHolder.getContext().authentication
if (authentication != null) { if (authentication == null) {
execution.execute(request, body) return execution.execute(request, body)
} }
if (authentication!!.credentials !is AbstractOAuth2Token) { if (authentication.credentials !is AbstractOAuth2Token) {
execution.execute(request, body) return execution.execute(request, body)
} }
val token: AbstractOAuth2Token = authentication.credentials as AbstractOAuth2Token request.headers.setBearerAuth(authentication.credentials.tokenValue)
request.headers.setBearerAuth(token.tokenValue)
execution.execute(request, body) execution.execute(request, body)
}) })
return rest return rest