fix(config-api): source LDAP server test (#5840)

JanssenProject · Aug 11, 2023 · 5379b36 · 5379b36
1 parent ed0be7f
commit 5379b36
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 26 deletions.
diff --git a/jans-config-api/docs/jans-config-api-swagger.yaml b/jans-config-api/docs/jans-config-api-swagger.yaml
@@ -7450,20 +7450,20 @@ components:
           $ref: '#/components/schemas/AttributeValidation'
         tooltip:
           type: string
+        whitePagesCanView:
+          type: boolean
+        adminCanEdit:
+          type: boolean
         adminCanAccess:
           type: boolean
-        adminCanView:
+        userCanEdit:
           type: boolean
-        adminCanEdit:
+        adminCanView:
           type: boolean
         userCanAccess:
           type: boolean
         userCanView:
           type: boolean
-        whitePagesCanView:
-          type: boolean
-        userCanEdit:
-          type: boolean
         baseDn:
           type: string
     PatchRequest:
@@ -8206,8 +8206,6 @@ components:
           type: boolean
         skipAuthenticationFilterOptionsMethod:
           type: boolean
-        fapi:
-          type: boolean
         allResponseTypesSupported:
           uniqueItems: true
           type: array
@@ -8217,6 +8215,8 @@ components:
             - code
             - token
             - id_token
+        fapi:
+          type: boolean
     AuthenticationFilter:
       required:
       - baseDn
@@ -8956,10 +8956,10 @@ components:
           type: array
           items:
             type: object
-        displayValue:
-          type: string
         value:
           type: object
+        displayValue:
+          type: string
     LocalizedString:
       type: object
       properties:
@@ -9196,14 +9196,14 @@ components:
           type: boolean
         internal:
           type: boolean
+        locationPath:
+          type: string
         locationType:
           type: string
           enum:
           - ldap
           - db
           - file
-        locationPath:
-          type: string
         baseDn:
           type: string
     ScriptError:

diff --git a/jans-config-api/plugins/docs/user-mgt-plugin-swagger.yaml b/jans-config-api/plugins/docs/user-mgt-plugin-swagger.yaml
@@ -838,10 +838,10 @@ components:
           type: array
           items:
             type: object
-        displayValue:
-          type: string
         value:
           type: object
+        displayValue:
+          type: string
     CustomUser:
       type: object
       properties:

diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/util/ConnectionStatus.java b/jans-config-api/server/src/main/java/io/jans/configapi/util/ConnectionStatus.java
@@ -34,37 +34,34 @@ public class ConnectionStatus {
     ConfigurationFactory configurationFactory;
 
     public boolean isUp(GluuLdapConfiguration ldapConfiguration) {
-
-        FileConfiguration configuration = loadFileConfiguration();
-        logger.debug(
-                " configuration:{}, ldapConfiguration:{}, ldapConfiguration.getBindDN():{}, ldapConfiguration.getBindPassword()):{}, ldapConfiguration.isUseSSL():{} ",
-                configuration, ldapConfiguration, ldapConfiguration.getBindDN(), ldapConfiguration.getBindPassword(),
+        logger.info(" LDAP Connection Status parameters - ldapConfiguration:{}, ldapConfiguration.getBindDN():{}, ldapConfiguration.getBindPassword()):{}, ldapConfiguration.isUseSSL():{} ",
+                ldapConfiguration, ldapConfiguration.getBindDN(), ldapConfiguration.getBindPassword(),
                 ldapConfiguration.isUseSSL());
 
-        Properties properties = configuration.getProperties();
+        Properties properties = System.getProperties();
         properties.setProperty("bindDN", ldapConfiguration.getBindDN());
         properties.setProperty("bindPassword", ldapConfiguration.getBindPassword());
         properties.setProperty("servers", buildServersString(getServers(ldapConfiguration)));
         properties.setProperty("useSSL", Boolean.toString(ldapConfiguration.isUseSSL()));
         Properties ldapDecryptedProperties = PropertiesDecrypter.decryptProperties(properties,
                 configurationFactory.getCryptoConfigurationSalt());
-       
+
         logger.trace("Attempting to create LDAP connection with properties: {}", ldapDecryptedProperties);
-        
+
         LdapConnectionProvider connectionProvider = new LdapConnectionProvider(
                 PropertiesDecrypter.decryptProperties(properties, configurationFactory.getCryptoConfigurationSalt()));
 
         logger.trace("connectionProvider: {}", connectionProvider);
         connectionProvider.create(ldapDecryptedProperties);
-        
-        logger.debug("Connection status connectionProvider.isConnected(): {}", connectionProvider.isConnected());
-        
+
+        logger.info("Connection status connectionProvider.isConnected(): {}", connectionProvider.isConnected());
+
         if (connectionProvider.isConnected()) {
             logger.trace("Connect to LDAP");
             connectionProvider.closeConnectionPool();
             return true;
         }
-       
+
         return false;
     }