import { Netrc } from 'netrc-parser'
import { join } from 'path'
import { createLogger, format, transports } from 'winston'
-import { assignCommands, ServerInfo } from '@shared/extra-utils'
-import { getAccessToken } from '@shared/extra-utils/users/login'
-import { getMyUserInformation } from '@shared/extra-utils/users/users'
-import { User, UserRole } from '@shared/models'
-import { root } from '../../shared/extra-utils/miscs/miscs'
+import { loadLanguages } from '@server/initializers/constants'
+import { root } from '@shared/core-utils'
+import { UserRole } from '@shared/models'
+import { PeerTubeServer } from '@shared/server-commands'
import { VideoPrivacy } from '../../shared/models/videos'
import { getAppNumber, isTestInstance } from '../helpers/core-utils'
const config = require('application-config')(configName)
-const version = require('../../../package.json').version
+const version = require(join(root(), 'package.json')).version
-async function getAdminTokenOrDie (url: string, username: string, password: string) {
- const accessToken = await getAccessToken(url, username, password)
- const resMe = await getMyUserInformation(url, accessToken)
- const me: User = resMe.body
+async function getAdminTokenOrDie (server: PeerTubeServer, username: string, password: string) {
+ const token = await server.login.getAccessToken(username, password)
+ const me = await server.users.getMyInfo({ token })
if (me.role !== UserRole.ADMINISTRATOR) {
console.error('You must be an administrator.')
process.exit(-1)
}
- return accessToken
-}
-
-async function getAccessTokenOrDie (url: string, username: string, password: string) {
- return getAccessToken(url, username, password)
+ return token
}
interface Settings {
): { url: string, username: string, password: string } {
const options = program.opts()
- if (!options.url || !options.username || !options.password) {
- // No remote and we don't have program parameters: quit
- if (settings.remotes.length === 0 || Object.keys(netrc.machines).length === 0) {
- 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.')
+ const manualOptionMode = options.url || options.username || options.password
- return process.exit(-1)
+ // Check parameters validity
+ if (manualOptionMode || settings.remotes.length === 0 || Object.keys(netrc.machines).length === 0) {
+ let exit = false
+
+ for (const key of [ 'url', 'username', 'password' ]) {
+ if (!options[key]) {
+ console.error(`--${key} field is required`)
+ exit = true
+ }
}
+ if (exit) process.exit(-1)
+ }
+
+ if (!manualOptionMode) {
let url: string = options.url
let username: string = options.username
let password: string = options.password
.option('-v, --verbose <verbose>', 'Verbosity, from 0/\'error\' to 4/\'debug\'', 'info')
}
-async function buildVideoAttributesFromCommander (server: ServerInfo, command: Command, defaultAttributes: any = {}) {
+async function buildVideoAttributesFromCommander (server: PeerTubeServer, command: Command, defaultAttributes: any = {}) {
const options = command.opts()
const defaultBooleanAttributes = {
Object.assign(videoAttributes, booleanAttributes)
if (options.channelName) {
- const videoChannel = await server.channelsCommand.get({ channelName: options.channelName })
+ const videoChannel = await server.channels.get({ channelName: options.channelName })
Object.assign(videoAttributes, { channelId: videoChannel.id })
})
}
-function buildServer (url: string, accessToken?: string): ServerInfo {
- const server = { url, accessToken, internalServerNumber: undefined }
- assignCommands(server)
+function buildServer (url: string) {
+ loadLanguages()
+ return new PeerTubeServer({ url })
+}
+
+async function assignToken (server: PeerTubeServer, username: string, password: string) {
+ const bodyClient = await server.login.getClient()
+ const client = { id: bodyClient.client_id, secret: bodyClient.client_secret }
+
+ const body = await server.login.login({ client, user: { username, password } })
- return server
+ server.accessToken = body.access_token
}
function getLogger (logLevel = 'info') {
buildVideoAttributesFromCommander,
getAdminTokenOrDie,
- getAccessTokenOrDie,
- buildServer
+ buildServer,
+ assignToken
}