Lock health check plugin (#9928)

* fix(jans-lock): add health-check plugiun form jans-auth Signed-off-by: Yuriy Movchan <[email protected]> * fix(jans-lock): add health-check plugiun form jans-auth Signed-off-by: Yuriy Movchan <[email protected]> * fix(jans-lock): add health-check plugiun form jans-auth Signed-off-by: Yuriy Movchan <[email protected]> * feat(oxauth): ignore uid case when auth server is AD Signed-off-by: Yuriy Movchan <[email protected]> --------- Signed-off-by: Yuriy Movchan <[email protected]>
JanssenProject · Oct 29, 2024 · 873cf86 · 873cf86
1 parent 95abf4b
commit 873cf86
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthenticationService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthenticationService.java
@@ -455,7 +455,8 @@ private boolean authenticateImpl(GluuLdapConfiguration ldapAuthConfig, Persisten
                             log.debug("User authenticated: {}", userDn);
 
                             log.debug("Attempting to find userDN by local primary key: {}", localPrimaryKey);
-                            User localUser = userService.getUserByAttribute(localPrimaryKey, keyValue);
+							String lowerKeyValue = StringHelper.toLowerCase(keyValue);
+							User localUser = userService.getUserByAttributes(lowerKeyValue, new String[] {localPrimaryKey}, new String[] {"uid", "jansStatus"});
                             if (localUser != null) {
                                 if (!checkUserStatus(localUser)) {
                                     return false;

diff --git a/...server/server/src/main/java/io/jans/as/server/ws/rs/controller/HealthCheckController.java b/...server/server/src/main/java/io/jans/as/server/ws/rs/controller/HealthCheckController.java
@@ -76,7 +76,7 @@ public String healthCheckController(@Context HttpServletRequest httpRequest, @Co
     		String healthCheckService = healthCheckPluginService.provideServiceName();
     		String healthCheckData = healthCheckPluginService.provideHealthCheckData();
     		if (StringHelper.isNotEmpty(healthCheckService) && StringHelper.isNotEmpty(healthCheckData)) {
-        		sb.append(String.format("\"%s\": %s", healthCheckService, healthCheckData));
+        		sb.append(String.format(", \"%s\": %s", healthCheckService, healthCheckData));
     		}
     	}