Fix CLI tools

1 files changed, 15 insertions, 34 deletions

diff --git a/server/tools/peertube-plugins.ts b/server/tools/peertube-plugins.ts
index 54ea1264d..63541bf2c 100644
--- a/server/tools/peertube-plugins.ts
+++ b/server/tools/peertube-plugins.ts
@@ -4,9 +4,8 @@ import { registerTSPaths } from '../helpers/register-ts-paths'
 registerTSPaths()
 
 import { program, Command, OptionValues } from 'commander'
-import { installPlugin, listPlugins, uninstallPlugin, updatePlugin } from '../../shared/extra-utils/server/plugins'
-import { getAdminTokenOrDie, getServerCredentials } from './cli'
-import { PeerTubePlugin, PluginType } from '../../shared/models'
+import { buildServer, getAdminTokenOrDie, getServerCredentials } from './cli'
+import { PluginType } from '../../shared/models'
 import { isAbsolute } from 'path'
 import * as CliTable3 from 'cli-table3'
 
@@ -63,28 +62,21 @@ program.parse(process.argv)
 
 async function pluginsListCLI (command: Command, options: OptionValues) {
   const { url, username, password } = await getServerCredentials(command)
-  const accessToken = await getAdminTokenOrDie(url, username, password)
+  const token = await getAdminTokenOrDie(url, username, password)
+  const server = buildServer(url, token)
 
   let pluginType: PluginType
   if (options.onlyThemes) pluginType = PluginType.THEME
   if (options.onlyPlugins) pluginType = PluginType.PLUGIN
 
-  const res = await listPlugins({
-    url,
-    accessToken,
-    start: 0,
-    count: 100,
-    sort: 'name',
-    pluginType
-  })
-  const plugins: PeerTubePlugin[] = res.body.data
+  const { data } = await server.pluginsCommand.list({ start: 0, count: 100, sort: 'name', pluginType })
 
   const table = new CliTable3({
     head: [ 'name', 'version', 'homepage' ],
     colWidths: [ 50, 10, 50 ]
   }) as any
 
-  for (const plugin of plugins) {
+  for (const plugin of data) {
     const npmName = plugin.type === PluginType.PLUGIN
       ? 'peertube-plugin-' + plugin.name
       : 'peertube-theme-' + plugin.name
@@ -113,15 +105,11 @@ async function installPluginCLI (command: Command, options: OptionValues) {
   }
 
   const { url, username, password } = await getServerCredentials(command)
-  const accessToken = await getAdminTokenOrDie(url, username, password)
+  const token = await getAdminTokenOrDie(url, username, password)
+  const server = buildServer(url, token)
 
   try {
-    await installPlugin({
-      url,
-      accessToken,
-      npmName: options.npmName,
-      path: options.path
-    })
+    await server.pluginsCommand.install({ npmName: options.npmName, path: options.path })
   } catch (err) {
     console.error('Cannot install plugin.', err)
     process.exit(-1)
@@ -144,15 +132,11 @@ async function updatePluginCLI (command: Command, options: OptionValues) {
   }
 
   const { url, username, password } = await getServerCredentials(command)
-  const accessToken = await getAdminTokenOrDie(url, username, password)
+  const token = await getAdminTokenOrDie(url, username, password)
+  const server = buildServer(url, token)
 
   try {
-    await updatePlugin({
-      url,
-      accessToken,
-      npmName: options.npmName,
-      path: options.path
-    })
+    await server.pluginsCommand.update({ npmName: options.npmName, path: options.path })
   } catch (err) {
     console.error('Cannot update plugin.', err)
     process.exit(-1)
@@ -170,14 +154,11 @@ async function uninstallPluginCLI (command: Command, options: OptionValues) {
   }
 
   const { url, username, password } = await getServerCredentials(command)
-  const accessToken = await getAdminTokenOrDie(url, username, password)
+  const token = await getAdminTokenOrDie(url, username, password)
+  const server = buildServer(url, token)
 
   try {
-    await uninstallPlugin({
-      url,
-      accessToken,
-      npmName: options.npmName
-    })
+    await server.pluginsCommand.uninstall({ npmName: options.npmName })
   } catch (err) {
     console.error('Cannot uninstall plugin.', err)
     process.exit(-1)