X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftools%2Fpeertube-get-access-token.ts;h=d59a3632e4e4bec56fccebbaf05d501db500b308;hb=4b3145a7f8f5f1e24f9ea7874dee387204e65fcb;hp=103495347c7ca6025d3a23ba365ecb51749e7c08;hpb=b6a1dd4d1b3b0032f8b968e72cbd074f646e8827;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tools/peertube-get-access-token.ts b/server/tools/peertube-get-access-token.ts
index 103495347..d59a3632e 100644
--- a/server/tools/peertube-get-access-token.ts
+++ b/server/tools/peertube-get-access-token.ts
@@ -1,5 +1,5 @@
-import * as program from 'commander'
-import { getClient, Server, serverLogin } from '../../shared/extra-utils'
+import { program } from 'commander'
+import { assignToken, buildServer } from './cli'
 
 program
   .option('-u, --url <url>', 'Server url')
@@ -7,36 +7,25 @@ program
   .option('-p, --password <token>', 'Password')
   .parse(process.argv)
 
+const options = program.opts()
+
 if (
-  !program['url'] ||
-  !program['username'] ||
-  !program['password']
+  !options.url ||
+  !options.username ||
+  !options.password
 ) {
-  if (!program['url']) console.error('--url field is required.')
-  if (!program['username']) console.error('--username field is required.')
-  if (!program['password']) console.error('--password field is required.')
+  if (!options.url) console.error('--url field is required.')
+  if (!options.username) console.error('--username field is required.')
+  if (!options.password) console.error('--password field is required.')
 
   process.exit(-1)
 }
 
-getClient(program.url)
-  .then(res => {
-    const server = {
-      url: program['url'],
-      user: {
-        username: program['username'],
-        password: program['password']
-      },
-      client: {
-        id: res.body.client_id,
-        secret: res.body.client_secret
-      }
-    } as Server
+const server = buildServer(options.url)
 
-    return serverLogin(server)
-  })
-  .then(accessToken => {
-    console.log(accessToken)
+assignToken(server, options.username, options.password)
+  .then(() => {
+    console.log(server.accessToken)
     process.exit(0)
   })
   .catch(err => {