From 742bdc0252ab868717538ff0eaae654c0186ce1d Mon Sep 17 00:00:00 2001 From: KOUNOIKE Yuusuke Date: Tue, 20 Mar 2018 09:28:33 +0900 Subject: [PATCH 1/2] Add plugin list API --- .../scala/gitbucket/core/api/ApiPlugin.scala | 17 +++++++++++++++++ .../core/controller/ApiController.scala | 7 +++++++ 2 files changed, 24 insertions(+) create mode 100644 src/main/scala/gitbucket/core/api/ApiPlugin.scala diff --git a/src/main/scala/gitbucket/core/api/ApiPlugin.scala b/src/main/scala/gitbucket/core/api/ApiPlugin.scala new file mode 100644 index 000000000..ac4003ac5 --- /dev/null +++ b/src/main/scala/gitbucket/core/api/ApiPlugin.scala @@ -0,0 +1,17 @@ +package gitbucket.core.api + +import gitbucket.core.plugin.{PluginRegistry, PluginInfo} + +case class ApiPlugin( + id: String, + name: String, + versino: String, + description: String, + jarFileName: String +) + +object ApiPlugin{ + def apply(plugin: PluginInfo): ApiPlugin = { + ApiPlugin(plugin.pluginId, plugin.pluginName, plugin.pluginVersion, plugin.description, plugin.pluginJar.getName) + } +} diff --git a/src/main/scala/gitbucket/core/controller/ApiController.scala b/src/main/scala/gitbucket/core/controller/ApiController.scala index 9054dfaaa..7d0f979dc 100644 --- a/src/main/scala/gitbucket/core/controller/ApiController.scala +++ b/src/main/scala/gitbucket/core/controller/ApiController.scala @@ -10,6 +10,7 @@ import gitbucket.core.util.Implicits._ import gitbucket.core.util.JGitUtil._ import gitbucket.core.util.SyntaxSugars._ import gitbucket.core.util._ +import gitbucket.core.plugin.PluginRegistry import gitbucket.core.view.helpers.{isRenderable, renderMarkup} import org.eclipse.jgit.api.Git import org.eclipse.jgit.revwalk.RevWalk @@ -717,5 +718,11 @@ trait ApiControllerBase extends ControllerBase { } }) + /** + * non-GitHub compatible API for listing plugins + */ + get("/api/v3/plugins"){ + PluginRegistry().getPlugins().map{ApiPlugin(_)} + } } From 08ac28902daa4a935d69501842b00caebedd8e8a Mon Sep 17 00:00:00 2001 From: KOUNOIKE Yuusuke Date: Wed, 21 Mar 2018 15:05:49 +0900 Subject: [PATCH 2/2] Change plugin list API URL --- src/main/scala/gitbucket/core/controller/ApiController.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/controller/ApiController.scala b/src/main/scala/gitbucket/core/controller/ApiController.scala index 7d0f979dc..5c3d55459 100644 --- a/src/main/scala/gitbucket/core/controller/ApiController.scala +++ b/src/main/scala/gitbucket/core/controller/ApiController.scala @@ -721,7 +721,7 @@ trait ApiControllerBase extends ControllerBase { /** * non-GitHub compatible API for listing plugins */ - get("/api/v3/plugins"){ + get("/api/v3/gitbucket/plugins"){ PluginRegistry().getPlugins().map{ApiPlugin(_)} } }