feat: Add EL support for the cache resource field

gravitee-io · Apr 23, 2024 · 6aceaa8 · 6aceaa8
1 parent 3f0d056
commit 6aceaa8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>io.gravitee.policy</groupId>
     <artifactId>gravitee-policy-oauth2</artifactId>
-    <version>3.0.4</version>
+    <version>3.0.5</version>
 
     <name>Gravitee.io APIM - Policy - OAuth2</name>
     <description>Check access token validity during request processing using token introspection</description>

diff --git a/src/main/java/io/gravitee/policy/oauth2/Oauth2Policy.java b/src/main/java/io/gravitee/policy/oauth2/Oauth2Policy.java
@@ -315,7 +315,10 @@ private Cache getPolicyTokenIntrospectionCache(HttpExecutionContext ctx) {
         if (oAuth2PolicyConfiguration.getOauthCacheResource() != null) {
             CacheResource cacheResource = ctx
                 .getComponent(ResourceManager.class)
-                .getResource(oAuth2PolicyConfiguration.getOauthCacheResource(), CacheResource.class);
+                .getResource(
+                    ctx.getTemplateEngine().getValue(oAuth2PolicyConfiguration.getOauthCacheResource(), String.class),
+                    CacheResource.class
+                );
             if (cacheResource != null) {
                 return cacheResource.getCache(ctx);
             }

diff --git a/src/main/java/io/gravitee/policy/v3/oauth2/Oauth2PolicyV3.java b/src/main/java/io/gravitee/policy/v3/oauth2/Oauth2PolicyV3.java
@@ -128,6 +128,12 @@ public void onRequest(Request request, Response response, ExecutionContext execu
         // Set access_token in context
         executionContext.setAttribute(CONTEXT_ATTRIBUTE_OAUTH_ACCESS_TOKEN, accessToken);
 
+        if (oAuth2PolicyConfiguration.getOauthCacheResource() != null) {
+            oAuth2PolicyConfiguration.setOauthCacheResource(
+                executionContext.getTemplateEngine().getValue(oAuth2PolicyConfiguration.getOauthCacheResource(), String.class)
+            );
+        }
+
         CacheResource<?> cacheResource = executionContext
             .getComponent(ResourceManager.class)
             .getResource(oAuth2PolicyConfiguration.getOauthCacheResource(), CacheResource.class);

diff --git a/src/main/resources/schemas/schema-form.json b/src/main/resources/schemas/schema-form.json
@@ -22,7 +22,7 @@
         },
         "oauthCacheResource": {
             "title": "Cache resource",
-            "description": "Cache resource used to store the tokens.",
+            "description": "Cache resource used to store the tokens. Supports EL.",
             "type": "string",
             "x-schema-form": {
                 "event": {

diff --git a/src/test/java/io/gravitee/policy/oauth2/Oauth2PolicyTest.java b/src/test/java/io/gravitee/policy/oauth2/Oauth2PolicyTest.java
@@ -435,6 +435,7 @@ void shouldPutIntrospectionToCache() throws IOException {
 
     private void prepareCacheResource() {
         when(configuration.getOauthCacheResource()).thenReturn(OAUTH_CACHE_RESOURCE);
+        when(templateEngine.getValue(OAUTH_CACHE_RESOURCE, String.class)).thenReturn(OAUTH_CACHE_RESOURCE);
         when(cacheResource.getCache(any(HttpExecutionContext.class))).thenReturn(cache);
         when(resourceManager.getResource(OAUTH_CACHE_RESOURCE, CacheResource.class)).thenReturn(cacheResource);
     }