Skip to content

Commit 19488f8

Browse files
authored
Make access token resolver optional (fix empty accessTokenResolver error) (#132)
1 parent ea52b69 commit 19488f8

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

openig-oauth2/src/main/java/org/forgerock/openig/filter/oauth2/OAuth2ResourceServerFilterHeaplet.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import static org.forgerock.openig.heap.Keys.CLIENT_HANDLER_HEAP_KEY;
2626
import static org.forgerock.openig.heap.Keys.SCHEDULED_EXECUTOR_SERVICE_HEAP_KEY;
2727
import static org.forgerock.openig.heap.Keys.TIME_SERVICE_HEAP_KEY;
28+
import static org.forgerock.openig.util.JsonValues.optionalHeapObject;
2829
import static org.forgerock.openig.util.JsonValues.requiredHeapObject;
2930

3031
import java.util.HashSet;
@@ -130,13 +131,14 @@ public Object create() throws HeapException {
130131

131132
TimeService time = heap.get(TIME_SERVICE_HEAP_KEY, TimeService.class);
132133

133-
AccessTokenResolver resolver = config.get("accessTokenResolver").defaultTo(
134-
new OpenAmAccessTokenResolver(httpHandler, time,
135-
config.get("tokenInfoEndpoint")
136-
.as(evaluatedWithHeapProperties())
137-
.required().asString()))
138-
.as(requiredHeapObject(heap, AccessTokenResolver.class));
139-
134+
AccessTokenResolver resolver = config.get("accessTokenResolver")
135+
.as(optionalHeapObject(heap, AccessTokenResolver.class));
136+
if(resolver == null) {
137+
resolver = new OpenAmAccessTokenResolver(httpHandler, time,
138+
config.get("tokenInfoEndpoint")
139+
.as(evaluatedWithHeapProperties())
140+
.required().asString());
141+
}
140142

141143
if(resolver instanceof ScriptableAccessTokenResolver) {
142144
((ScriptableAccessTokenResolver) resolver)

0 commit comments

Comments
 (0)