fix(config-api): fixed start-up issue due to scope objectclass case (#…

…3697) * fix(config-api): fixed startup issue due to scope objectclass case * fix(config-api): renamed swagger file name in plugin
JanssenProject · Jan 25, 2023 · eac6440 · eac6440
1 parent 5ba6c35
commit eac6440
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 30 deletions.
diff --git a/jans-config-api/docs/jans-config-api-swagger.yaml b/jans-config-api/docs/jans-config-api-swagger.yaml
@@ -7316,6 +7316,10 @@ components:
           type: array
           items:
             type: string
+        libs:
+          type: array
+          items:
+            type: string
         flowsError:
           type: object
           additionalProperties:
@@ -7520,19 +7524,19 @@ components:
           $ref: '#/components/schemas/AttributeValidation'
         tooltip:
           type: string
-        adminCanEdit:
+        whitePagesCanView:
           type: boolean
         userCanEdit:
           type: boolean
-        adminCanView:
-          type: boolean
         userCanAccess:
           type: boolean
+        adminCanAccess:
+          type: boolean
         userCanView:
           type: boolean
-        adminCanAccess:
+        adminCanEdit:
           type: boolean
-        whitePagesCanView:
+        adminCanView:
           type: boolean
         baseDn:
           type: string
@@ -8900,10 +8904,10 @@ components:
           type: array
           items:
             type: object
-        displayValue:
-          type: string
         value:
           type: object
+        displayValue:
+          type: string
     LocalizedString:
       type: object
       properties:
@@ -9117,13 +9121,13 @@ components:
           type: boolean
         internal:
           type: boolean
+        locationPath:
+          type: string
         locationType:
           type: string
           enum:
           - ldap
           - 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
@@ -794,10 +794,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/pom.xml b/jans-config-api/server/pom.xml
@@ -312,7 +312,7 @@
 					<execution>
 						<configuration>
 							<alwaysResolveAppPath>true</alwaysResolveAppPath>
-							<outputFileName>jans-config-api-swagger-auto</outputFileName>
+							<outputFileName>jans-config-api-swagger</outputFileName>
 							<contextId>${project.artifactId}</contextId>
 							<prettyPrint>true</prettyPrint>
 							<resourcePackages>

diff --git a/...-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/PluginResource.java b/...-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/PluginResource.java
@@ -76,7 +76,7 @@ public Response isPluginDeployed(
 
         List<PluginConf> plugins = getPluginNames();
         Boolean deployed = false;
-        logger.debug("All plugins:{} ", plugins);
+        logger.info("All plugins:{} ", plugins);
         if (StringUtils.isNotBlank(pluginName) && !plugins.isEmpty()) {
             Optional<PluginConf> pluginNameOptional = plugins.stream()
                     .filter(plugin -> pluginName.equalsIgnoreCase(plugin.getName())).findAny();
@@ -86,32 +86,34 @@ public Response isPluginDeployed(
                 deployed = true;
             }
         }
-        logger.debug("deployed:{} ", deployed);
+        logger.info("deployed:{} ", deployed);
         return Response.ok(deployed).build();
     }
 
     private List<PluginConf> getPluginNames() {
 
         List<PluginConf> plugins = this.authUtil.getPluginConf();
-        logger.debug("Config plugins:{} ", plugins);
+        logger.info("Config plugins:{} ", plugins);
         List<PluginConf> pluginInfo = new ArrayList<>();
-        for (PluginConf pluginConf : plugins) {
-            logger.debug("pluginConf:{} ", pluginConf);
-            if (StringUtils.isNotBlank(pluginConf.getClassName())) {
-                try {
-                    logger.debug("pluginConf.getClassName():{} ", pluginConf.getClassName());
-                    Class.forName(pluginConf.getClassName());
-                    PluginConf conf = new PluginConf();
-                    conf.setName(pluginConf.getName());
-                    conf.setDescription(pluginConf.getDescription());
-                    pluginInfo.add(conf);
-                } catch (ClassNotFoundException ex) {
-                    logger.error("'{}' plugin not deployed", pluginConf.getName());
+        if (plugins != null && !plugins.isEmpty()) {
+            for (PluginConf pluginConf : plugins) {
+                logger.debug("pluginConf:{} ", pluginConf);
+                if (StringUtils.isNotBlank(pluginConf.getClassName())) {
+                    try {
+                        logger.debug("pluginConf.getClassName():{} ", pluginConf.getClassName());
+                        Class.forName(pluginConf.getClassName());
+                        PluginConf conf = new PluginConf();
+                        conf.setName(pluginConf.getName());
+                        conf.setDescription(pluginConf.getDescription());
+                        pluginInfo.add(conf);
+                    } catch (ClassNotFoundException ex) {
+                        logger.error("'{}' plugin not deployed", pluginConf.getName());
+                    }
                 }
-            }
 
+            }
         }
-        logger.debug("pluginInfo:{} ", pluginInfo);
+        logger.info("pluginInfo:{} ", pluginInfo);
         return pluginInfo;
     }
 

diff --git a/jans-linux-setup/jans_setup/setup_app/installers/config_api.py b/jans-linux-setup/jans_setup/setup_app/installers/config_api.py
@@ -132,7 +132,7 @@ def generate_configuration(self):
                             display_name = 'Config API scope {}'.format(scope['name'])
                             description = 'Config API {} scope {}'.format(scope_level, scope['name'])
                             ldif_dict = {
-                                        'objectclass': ['top', 'jansScope'],
+                                        'objectClass': ['top', 'jansScope'],
                                         'description': [description],
                                         'displayName': [display_name],
                                         'inum': [scope['inum']],