From 135dcefa19b992dad85ff2f440894111344bc841 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 08 Jun 2016 14:37:08 +0000
Subject: [PATCH] OPENDJ-3067 Make authzIdTemplate config parameter specific to each resolver config

---
 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java
index 0c53d23..b994823 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java
@@ -224,8 +224,9 @@
         final Set<String> scopes = config.get(SCOPES).required().asSet(String.class);
         final AccessTokenResolver resolver =
                 createCachedTokenResolverIfNeeded(config, parseUnderlyingResolver(config));
+        final String resolverName = config.get(RESOLVER_CONFIG_OBJECT).asString();
         final ConditionalFilter oAuth2Filter = newConditionalOAuth2ResourceServerFilter(
-                realm, scopes, resolver, config.get(AUTHZID_TEMPLATE).required().asString());
+                realm, scopes, resolver, config.get(resolverName).get(AUTHZID_TEMPLATE).required().asString());
         return newConditionalFilter(
                 Filters.chainOf(oAuth2Filter.getFilter(),
                                 newProxyAuthzFilter(getConnectionFactory(DEFAULT_ROOT_FACTORY))),

--
Gitblit v1.10.0