From 53ed5b8481db59f86fa165be608864f7076e8126 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Fri, 13 Aug 2021 04:11:31 -0400 Subject: [PATCH] Polish OAuth2TokenContext --- .../oauth2/server/authorization/JwtEncodingContext.java | 2 +- .../oauth2/server/authorization/OAuth2TokenContext.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JwtEncodingContext.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JwtEncodingContext.java index edc1f815..33d48ac8 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JwtEncodingContext.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/JwtEncodingContext.java @@ -84,7 +84,7 @@ public final class JwtEncodingContext implements OAuth2TokenContext { } public JwtEncodingContext build() { - return new JwtEncodingContext(this.context); + return new JwtEncodingContext(getContext()); } } } diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenContext.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenContext.java index 9dfc1d09..d586d2a3 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenContext.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2TokenContext.java @@ -72,7 +72,7 @@ public interface OAuth2TokenContext extends Context { Authentication.class.getName().concat(".PRINCIPAL"); private static final String AUTHORIZATION_GRANT_AUTHENTICATION_KEY = Authentication.class.getName().concat(".AUTHORIZATION_GRANT"); - protected final Map context = new HashMap<>(); + private final Map context = new HashMap<>(); public B registeredClient(RegisteredClient registeredClient) { return put(RegisteredClient.class, registeredClient); @@ -119,8 +119,12 @@ public interface OAuth2TokenContext extends Context { return (V) this.context.get(key); } + protected Map getContext() { + return this.context; + } + @SuppressWarnings("unchecked") - protected B getThis() { + protected final B getThis() { return (B) this; }