diff --git a/jans-config-api/docs/jans-config-api-swagger-auto.yaml b/jans-config-api/docs/jans-config-api-swagger-auto.yaml index 4cad13c5846..8e109c3f3f6 100644 --- a/jans-config-api/docs/jans-config-api-swagger-auto.yaml +++ b/jans-config-api/docs/jans-config-api-swagger-auto.yaml @@ -5121,9 +5121,9 @@ paths: get: tags: - Plugins - summary: Gets list of Plugins - description: Gets list of Plugins - operationId: get-plugins_1 + summary: Get plugin by name + description: Get plugin by name + operationId: get-plugin-by-name parameters: - name: pluginName in: path @@ -7466,17 +7466,17 @@ components: $ref: '#/components/schemas/AttributeValidation' tooltip: type: string - adminCanView: - type: boolean - adminCanEdit: + userCanAccess: type: boolean adminCanAccess: type: boolean - userCanView: + adminCanEdit: type: boolean userCanEdit: type: boolean - userCanAccess: + adminCanView: + type: boolean + userCanView: type: boolean whitePagesCanView: type: boolean diff --git a/jans-config-api/profiles/local/test.properties b/jans-config-api/profiles/local/test.properties index 806a1ad8282..92aaa2de881 100644 --- a/jans-config-api/profiles/local/test.properties +++ b/jans-config-api/profiles/local/test.properties @@ -4,6 +4,6 @@ test.scopes=https://jans.io/oauth/config/acrs.readonly https://jans.io/oauth/con # jans.server token.endpoint=https://jans.server2/jans-auth/restv1/token token.grant.type=client_credentials -test.client.id=1800.e1ca6eff-0b46-423c-bed5-34aba0a9ac5a -test.client.secret=gfhn8mKT39uP +test.client.id=1800.c9c0b756-a1fc-4013-9feb-64d531ac2dc1 +test.client.secret=ONfjpemnGAFU test.issuer=https://jans.server2/ \ No newline at end of file diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/PluginResource.java b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/PluginResource.java index 4882524cf00..4d682cee603 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/PluginResource.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/PluginResource.java @@ -60,7 +60,7 @@ public Response getPlugins() { return Response.ok(getPluginNames()).build(); } - @Operation(summary = "Gets list of Plugins", description = "Gets list of Plugins", operationId = "get-plugins", tags = { + @Operation(summary = "Get plugin by name", description = "Get plugin by name", operationId = "get-plugin-by-name", tags = { "Plugins" }, security = @SecurityRequirement(name = "oauth2", scopes = { ApiAccessConstants.PLUGIN_READ_ACCESS })) @ApiResponses(value = { @@ -78,8 +78,9 @@ public Response isPluginDeployed( Boolean deployed = false; logger.debug("All plugins:{} ", plugins); if (StringUtils.isNotBlank(pluginName) && !plugins.isEmpty()) { - Optional pluginNameOptional = plugins.stream().findAny() - .filter(plugin -> pluginName.equalsIgnoreCase(plugin.getName())); + Optional pluginNameOptional = plugins.stream() + .filter(plugin -> pluginName.equalsIgnoreCase(plugin.getName())).findAny(); + logger.debug("pluginNameOptional:{} ", pluginNameOptional); if (pluginNameOptional.isPresent()) { deployed = true; @@ -92,15 +93,18 @@ public Response isPluginDeployed( private List getPluginNames() { List plugins = this.authUtil.getPluginConf(); - logger.debug("plugins:{} ", plugins); + logger.debug("Config plugins:{} ", plugins); List 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.setClassName(""); - pluginInfo.add(pluginConf); + 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()); }