From 9ef6fa49afe0efb64ee87aa2485f95a7716e4259 Mon Sep 17 00:00:00 2001 From: pujavs <43700552+pujavs@users.noreply.github.com> Date: Mon, 28 Feb 2022 17:29:06 +0530 Subject: [PATCH] fix(jans-config-api): multiple custom lib not working (#907) * feat: config api fixes * feat: jetty classpath issue * feat: multiple custom lib issue --- .../plugins/scim-plugin/src/main/assembly/assembly.xml | 1 - .../security/service/OpenIdAuthorizationService.java | 3 --- jans-config-api/server/src/main/resources/log4j2.xml | 2 +- .../java/io/jans/configapi/core/service/ClientService.java | 2 ++ .../src/main/java/io/jans/configapi/core/util/AuthUtil.java | 4 ++-- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/jans-config-api/plugins/scim-plugin/src/main/assembly/assembly.xml b/jans-config-api/plugins/scim-plugin/src/main/assembly/assembly.xml index 6d916563516..b0926380f6a 100644 --- a/jans-config-api/plugins/scim-plugin/src/main/assembly/assembly.xml +++ b/jans-config-api/plugins/scim-plugin/src/main/assembly/assembly.xml @@ -15,7 +15,6 @@ io.jans:jans-scim-model io.jans:jans-scim-client - io.jans:jans-config-api-shared runtime diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/security/service/OpenIdAuthorizationService.java b/jans-config-api/server/src/main/java/io/jans/configapi/security/service/OpenIdAuthorizationService.java index 7f5b31cf11f..c9cfa8d6d90 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/security/service/OpenIdAuthorizationService.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/security/service/OpenIdAuthorizationService.java @@ -52,9 +52,6 @@ public class OpenIdAuthorizationService extends AuthorizationService implements @Inject JwtUtil jwtUtil; - @Inject - Jackson jackson; - @Inject OpenIdService openIdService; diff --git a/jans-config-api/server/src/main/resources/log4j2.xml b/jans-config-api/server/src/main/resources/log4j2.xml index 753018fa46d..72a6b477b95 100644 --- a/jans-config-api/server/src/main/resources/log4j2.xml +++ b/jans-config-api/server/src/main/resources/log4j2.xml @@ -106,7 +106,7 @@ - + diff --git a/jans-config-api/shared/src/main/java/io/jans/configapi/core/service/ClientService.java b/jans-config-api/shared/src/main/java/io/jans/configapi/core/service/ClientService.java index deab7ea2b57..9d72d039cf5 100644 --- a/jans-config-api/shared/src/main/java/io/jans/configapi/core/service/ClientService.java +++ b/jans-config-api/shared/src/main/java/io/jans/configapi/core/service/ClientService.java @@ -12,11 +12,13 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import javax.inject.Named; import java.io.Serializable; import org.slf4j.Logger; @ApplicationScoped +@Named("cltSrv") public class ClientService implements Serializable { private static final long serialVersionUID = 7912416439116338984L; diff --git a/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/AuthUtil.java b/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/AuthUtil.java index 82f91ba5dc0..49c7dd20b60 100644 --- a/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/AuthUtil.java +++ b/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/AuthUtil.java @@ -22,7 +22,7 @@ public class AuthUtil { ConfService confService; @Inject - ClientService clientService; + ClientService cltSrv; public String getOpenIdConfigurationEndpoint() { return this.confService.find().getOpenIdConfigurationEndpoint(); @@ -33,7 +33,7 @@ public String getIssuer() { } public Client getClient(String clientId) { - return clientService.getClientByInum(clientId); + return cltSrv.getClientByInum(clientId); } public List findMissingElements(List list1, List list2) {