import 'mocha'
import { omit } from 'lodash'
-import { UserRole, VideoCreateResult } from '../../../../shared'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
import {
buildAbsoluteFixturePath,
+ checkBadCountPagination,
+ checkBadSortPagination,
+ checkBadStartPagination,
cleanupTests,
- flushAndRunServer,
+ createSingleServer,
killallServers,
makeGetRequest,
makePostBodyRequest,
makePutBodyRequest,
makeUploadRequest,
- reRunServer,
- ServerInfo,
+ MockSmtpServer,
+ PeerTubeServer,
setAccessTokensToServers,
- uploadVideo,
UsersCommand
-} from '../../../../shared/extra-utils'
-import { MockSmtpServer } from '../../../../shared/extra-utils/mock-servers/mock-email'
-import {
- checkBadCountPagination,
- checkBadSortPagination,
- checkBadStartPagination
-} from '../../../../shared/extra-utils/requests/check-api-params'
-import { UserAdminFlag } from '../../../../shared/models/users/user-flag.model'
+} from '@shared/extra-utils'
+import { HttpStatusCode, UserAdminFlag, UserRole, VideoCreateResult } from '@shared/models'
describe('Test users API validators', function () {
const path = '/api/v1/users/'
let rootId: number
let moderatorId: number
let video: VideoCreateResult
- let server: ServerInfo
- let serverWithRegistrationDisabled: ServerInfo
+ let server: PeerTubeServer
+ let serverWithRegistrationDisabled: PeerTubeServer
let userToken = ''
let moderatorToken = ''
let emailPort: number
{
const res = await Promise.all([
- flushAndRunServer(1, overrideConfig),
- flushAndRunServer(2)
+ createSingleServer(1, overrideConfig),
+ createSingleServer(2)
])
server = res[0]
{
const user = { username: 'user1' }
- await server.usersCommand.create({ ...user })
- userToken = await server.loginCommand.getAccessToken(user)
+ await server.users.create({ ...user })
+ userToken = await server.login.getAccessToken(user)
}
{
const moderator = { username: 'moderator1' }
- await server.usersCommand.create({ ...moderator, role: UserRole.MODERATOR })
- moderatorToken = await server.loginCommand.getAccessToken(moderator)
+ await server.users.create({ ...moderator, role: UserRole.MODERATOR })
+ moderatorToken = await server.login.getAccessToken(moderator)
}
{
const moderator = { username: 'moderator2' }
- await server.usersCommand.create({ ...moderator, role: UserRole.MODERATOR })
+ await server.users.create({ ...moderator, role: UserRole.MODERATOR })
}
{
- const res = await uploadVideo(server.url, server.accessToken, {})
- video = res.body.video
+ video = await server.videos.upload()
}
{
- const { data } = await server.usersCommand.list()
+ const { data } = await server.users.list()
userId = data.find(u => u.username === 'user1').id
rootId = data.find(u => u.username === 'root').id
moderatorId = data.find(u => u.username === 'moderator2').id
await makeGetRequest({
url: server.url,
path,
- statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+ expectedStatus: HttpStatusCode.UNAUTHORIZED_401
})
})
url: server.url,
path,
token: userToken,
- statusCodeExpected: HttpStatusCode.FORBIDDEN_403
+ expectedStatus: HttpStatusCode.FORBIDDEN_403
})
})
})
port: emailPort
}
}
- await reRunServer(server, config)
+ await server.run(config)
const fields = {
...baseCorrectParams,
path: path,
token: server.accessToken,
fields,
- statusCodeExpected: HttpStatusCode.OK_200
+ expectedStatus: HttpStatusCode.OK_200
})
})
path,
token: 'super token',
fields: baseCorrectParams,
- statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+ expectedStatus: HttpStatusCode.UNAUTHORIZED_401
})
})
path,
token: server.accessToken,
fields,
- statusCodeExpected: HttpStatusCode.CONFLICT_409
+ expectedStatus: HttpStatusCode.CONFLICT_409
})
})
path,
token: server.accessToken,
fields,
- statusCodeExpected: HttpStatusCode.CONFLICT_409
+ expectedStatus: HttpStatusCode.CONFLICT_409
})
})
path,
token: server.accessToken,
fields,
- statusCodeExpected: HttpStatusCode.CONFLICT_409
+ expectedStatus: HttpStatusCode.CONFLICT_409
})
})
path,
token: moderatorToken,
fields,
- statusCodeExpected: HttpStatusCode.FORBIDDEN_403
+ expectedStatus: HttpStatusCode.FORBIDDEN_403
})
}
})
path,
token: moderatorToken,
fields,
- statusCodeExpected: HttpStatusCode.OK_200
+ expectedStatus: HttpStatusCode.OK_200
})
})
path,
token: server.accessToken,
fields: baseCorrectParams,
- statusCodeExpected: HttpStatusCode.OK_200
+ expectedStatus: HttpStatusCode.OK_200
})
})
it('Should fail with a non admin user', async function () {
const user = { username: 'user1' }
- userToken = await server.loginCommand.getAccessToken(user)
+ userToken = await server.login.getAccessToken(user)
const fields = {
username: 'user3',
password: 'my super password',
videoQuota: 42000000
}
- await makePostBodyRequest({ url: server.url, path, token: userToken, fields, statusCodeExpected: HttpStatusCode.FORBIDDEN_403 })
+ await makePostBodyRequest({ url: server.url, path, token: userToken, fields, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
})
})
path: path + 'me',
token: userToken,
fields,
- statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+ expectedStatus: HttpStatusCode.UNAUTHORIZED_401
})
})
path: path + 'me',
token: 'super token',
fields,
- statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+ expectedStatus: HttpStatusCode.UNAUTHORIZED_401
})
})
await makePutBodyRequest({ url: server.url, path: path + 'me', token: userToken, fields })
})
- it('Should fail with an invalid noInstanceConfigWarningModal attribute', async function () {
- const fields = {
- noInstanceConfigWarningModal: -1
- }
+ it('Should fail with invalid no modal attributes', async function () {
+ const keys = [
+ 'noInstanceConfigWarningModal',
+ 'noAccountSetupWarningModal',
+ 'noWelcomeModal'
+ ]
- await makePutBodyRequest({ url: server.url, path: path + 'me', token: userToken, fields })
- })
+ for (const key of keys) {
+ const fields = {
+ [key]: -1
+ }
- it('Should fail with an invalid noWelcomeModal attribute', async function () {
- const fields = {
- noWelcomeModal: -1
+ await makePutBodyRequest({ url: server.url, path: path + 'me', token: userToken, fields })
}
-
- await makePutBodyRequest({ url: server.url, path: path + 'me', token: userToken, fields })
})
it('Should succeed to change password with the correct params', async function () {
email: 'super_email@example.com',
theme: 'default',
noInstanceConfigWarningModal: true,
- noWelcomeModal: true
+ noWelcomeModal: true,
+ noAccountSetupWarningModal: true
}
await makePutBodyRequest({
path: path + 'me',
token: userToken,
fields,
- statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+ expectedStatus: HttpStatusCode.NO_CONTENT_204
})
})
path: path + 'me',
token: userToken,
fields,
- statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+ expectedStatus: HttpStatusCode.NO_CONTENT_204
})
})
})
path: path + '/me/avatar/pick',
fields,
attaches,
- statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+ expectedStatus: HttpStatusCode.UNAUTHORIZED_401
})
})
token: server.accessToken,
fields,
attaches,
- statusCodeExpected: HttpStatusCode.OK_200
+ expectedStatus: HttpStatusCode.OK_200
})
})
})
describe('When managing my scoped tokens', function () {
it('Should fail to get my scoped tokens with an non authenticated user', async function () {
- await server.usersCommand.getMyScopedTokens({ token: null, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
+ await server.users.getMyScopedTokens({ token: null, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should fail to get my scoped tokens with a bad token', async function () {
- await server.usersCommand.getMyScopedTokens({ token: 'bad', expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
+ await server.users.getMyScopedTokens({ token: 'bad', expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should succeed to get my scoped tokens', async function () {
- await server.usersCommand.getMyScopedTokens()
+ await server.users.getMyScopedTokens()
})
it('Should fail to renew my scoped tokens with an non authenticated user', async function () {
- await server.usersCommand.renewMyScopedTokens({ token: null, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
+ await server.users.renewMyScopedTokens({ token: null, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should fail to renew my scoped tokens with a bad token', async function () {
- await server.usersCommand.renewMyScopedTokens({ token: 'bad', expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
+ await server.users.renewMyScopedTokens({ token: 'bad', expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should succeed to renew my scoped tokens', async function () {
- await server.usersCommand.renewMyScopedTokens()
+ await server.users.renewMyScopedTokens()
})
})
url: server.url,
path: path + userId,
token: 'super token',
- statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+ expectedStatus: HttpStatusCode.UNAUTHORIZED_401
})
})
it('Should fail with a non admin user', async function () {
- await makeGetRequest({ url: server.url, path, token: userToken, statusCodeExpected: HttpStatusCode.FORBIDDEN_403 })
+ await makeGetRequest({ url: server.url, path, token: userToken, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
})
it('Should succeed with the correct params', async function () {
- await makeGetRequest({ url: server.url, path: path + userId, token: server.accessToken, statusCodeExpected: HttpStatusCode.OK_200 })
+ await makeGetRequest({ url: server.url, path: path + userId, token: server.accessToken, expectedStatus: HttpStatusCode.OK_200 })
})
})
path: path + userId,
token: 'super token',
fields,
- statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+ expectedStatus: HttpStatusCode.UNAUTHORIZED_401
})
})
path: path + moderatorId,
token: moderatorToken,
fields,
- statusCodeExpected: HttpStatusCode.FORBIDDEN_403
+ expectedStatus: HttpStatusCode.FORBIDDEN_403
})
})
path: path + userId,
token: moderatorToken,
fields,
- statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+ expectedStatus: HttpStatusCode.NO_CONTENT_204
})
})
path: path + userId,
token: server.accessToken,
fields,
- statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+ expectedStatus: HttpStatusCode.NO_CONTENT_204
})
})
})
describe('When getting my information', function () {
it('Should fail with a non authenticated user', async function () {
- await server.usersCommand.getMyInfo({ token: 'fake_token', expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
+ await server.users.getMyInfo({ token: 'fake_token', expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should success with the correct parameters', async function () {
- await server.usersCommand.getMyInfo({ token: userToken })
+ await server.users.getMyInfo({ token: userToken })
})
})
let command: UsersCommand
before(function () {
- command = server.usersCommand
+ command = server.users
})
it('Should fail with a non authenticated user', async function () {
})
it('Should fail with a unauthenticated user', async function () {
- await makeGetRequest({ url: server.url, path, statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401 })
+ await makeGetRequest({ url: server.url, path, expectedStatus: HttpStatusCode.UNAUTHORIZED_401 })
})
it('Should fail with a another user', async function () {
- await makeGetRequest({ url: server.url, path, token: server.accessToken, statusCodeExpected: HttpStatusCode.FORBIDDEN_403 })
+ await makeGetRequest({ url: server.url, path, token: server.accessToken, expectedStatus: HttpStatusCode.FORBIDDEN_403 })
})
it('Should fail with a bad type', async function () {
path,
token: userToken,
query: { rating: 'toto ' },
- statusCodeExpected: HttpStatusCode.BAD_REQUEST_400
+ expectedStatus: HttpStatusCode.BAD_REQUEST_400
})
})
it('Should succeed with the correct params', async function () {
- await makeGetRequest({ url: server.url, path, token: userToken, statusCodeExpected: HttpStatusCode.OK_200 })
+ await makeGetRequest({ url: server.url, path, token: userToken, expectedStatus: HttpStatusCode.OK_200 })
})
})
it('Should fail with an incorrect id', async function () {
const options = { userId: 'blabla' as any, expectedStatus: HttpStatusCode.BAD_REQUEST_400 }
- await server.usersCommand.remove(options)
- await server.usersCommand.banUser({ userId: 'blabla' as any, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
- await server.usersCommand.unbanUser({ userId: 'blabla' as any, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
+ await server.users.remove(options)
+ await server.users.banUser({ userId: 'blabla' as any, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
+ await server.users.unbanUser({ userId: 'blabla' as any, expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
})
it('Should fail with the root user', async function () {
const options = { userId: rootId, expectedStatus: HttpStatusCode.BAD_REQUEST_400 }
- await server.usersCommand.remove(options)
- await server.usersCommand.banUser(options)
- await server.usersCommand.unbanUser(options)
+ await server.users.remove(options)
+ await server.users.banUser(options)
+ await server.users.unbanUser(options)
})
it('Should return 404 with a non existing id', async function () {
const options = { userId: 4545454, expectedStatus: HttpStatusCode.NOT_FOUND_404 }
- await server.usersCommand.remove(options)
- await server.usersCommand.banUser(options)
- await server.usersCommand.unbanUser(options)
+ await server.users.remove(options)
+ await server.users.banUser(options)
+ await server.users.unbanUser(options)
})
it('Should fail with a non admin user', async function () {
const options = { userId, token: userToken, expectedStatus: HttpStatusCode.FORBIDDEN_403 }
- await server.usersCommand.remove(options)
- await server.usersCommand.banUser(options)
- await server.usersCommand.unbanUser(options)
+ await server.users.remove(options)
+ await server.users.banUser(options)
+ await server.users.unbanUser(options)
})
it('Should fail on a moderator with a moderator', async function () {
const options = { userId: moderatorId, token: moderatorToken, expectedStatus: HttpStatusCode.FORBIDDEN_403 }
- await server.usersCommand.remove(options)
- await server.usersCommand.banUser(options)
- await server.usersCommand.unbanUser(options)
+ await server.users.remove(options)
+ await server.users.banUser(options)
+ await server.users.unbanUser(options)
})
it('Should succeed on a user with a moderator', async function () {
const options = { userId, token: moderatorToken }
- await server.usersCommand.banUser(options)
- await server.usersCommand.unbanUser(options)
+ await server.users.banUser(options)
+ await server.users.unbanUser(options)
})
})
describe('When deleting our account', function () {
it('Should fail with with the root account', async function () {
- await server.usersCommand.deleteMe({ expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
+ await server.users.deleteMe({ expectedStatus: HttpStatusCode.BAD_REQUEST_400 })
})
})
path: registrationPath,
token: server.accessToken,
fields,
- statusCodeExpected: HttpStatusCode.CONFLICT_409
+ expectedStatus: HttpStatusCode.CONFLICT_409
})
})
path: registrationPath,
token: server.accessToken,
fields,
- statusCodeExpected: HttpStatusCode.CONFLICT_409
+ expectedStatus: HttpStatusCode.CONFLICT_409
})
})
path: registrationPath,
token: server.accessToken,
fields,
- statusCodeExpected: HttpStatusCode.CONFLICT_409
+ expectedStatus: HttpStatusCode.CONFLICT_409
})
})
it('Should fail with an existing channel', async function () {
const attributes = { name: 'existing_channel', displayName: 'hello', description: 'super description' }
- await server.channelsCommand.create({ attributes })
+ await server.channels.create({ attributes })
const fields = { ...baseCorrectParams, channel: { name: 'existing_channel', displayName: 'toto' } }
path: registrationPath,
token: server.accessToken,
fields,
- statusCodeExpected: HttpStatusCode.CONFLICT_409
+ expectedStatus: HttpStatusCode.CONFLICT_409
})
})
path: registrationPath,
token: server.accessToken,
fields: fields,
- statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+ expectedStatus: HttpStatusCode.NO_CONTENT_204
})
})
path: registrationPath,
token: serverWithRegistrationDisabled.accessToken,
fields,
- statusCodeExpected: HttpStatusCode.FORBIDDEN_403
+ expectedStatus: HttpStatusCode.FORBIDDEN_403
})
})
})
describe('When registering multiple users on a server with users limit', function () {
it('Should fail when after 3 registrations', async function () {
- await server.usersCommand.register({ username: 'user42', expectedStatus: HttpStatusCode.FORBIDDEN_403 })
+ await server.users.register({ username: 'user42', expectedStatus: HttpStatusCode.FORBIDDEN_403 })
})
})
path,
token: server.accessToken,
fields,
- statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+ expectedStatus: HttpStatusCode.NO_CONTENT_204
})
})
})
path,
token: server.accessToken,
fields,
- statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+ expectedStatus: HttpStatusCode.NO_CONTENT_204
})
})
})
projects / github / Chocobozzz / PeerTube.git / blobdiff