From 26d21b7867c225d99e0625af51da4643e351d86d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 28 Dec 2017 15:25:31 +0100 Subject: [PATCH] Improve check users parameters tests --- server/tests/api/check-params/services.ts | 1 - server/tests/api/check-params/users.ts | 423 ++++++---------------- server/tests/api/users/users.ts | 4 +- server/tests/utils/miscs/miscs.ts | 7 +- server/tests/utils/users/users.ts | 78 ++-- 5 files changed, 172 insertions(+), 341 deletions(-) diff --git a/server/tests/api/check-params/services.ts b/server/tests/api/check-params/services.ts index 62a14f51f..fcde7e179 100644 --- a/server/tests/api/check-params/services.ts +++ b/server/tests/api/check-params/services.ts @@ -102,7 +102,6 @@ function checkParamEmbed (server: ServerInfo, embedUrl: string, statusCodeExpect url: server.url, path, query: Object.assign(query, { url: embedUrl }), - token: server.accessToken, statusCodeExpected }) } diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts index b566a2f1e..0c126dbff 100644 --- a/server/tests/api/check-params/users.ts +++ b/server/tests/api/check-params/users.ts @@ -1,25 +1,15 @@ /* tslint:disable:no-unused-expression */ -import * as request from 'supertest' +import { omit } from 'lodash' import 'mocha' +import { UserRole } from '../../../../shared' import { - ServerInfo, - flushTests, - runServer, - uploadVideo, - getVideosList, - makePutBodyRequest, - createUser, - serverLogin, - getUsersList, - registerUser, - setAccessTokensToServers, - killallServers, - makePostBodyRequest, - userLogin + createUser, flushTests, getMyUserInformation, getMyUserVideoRating, getUsersList, immutableAssign, killallServers, makeGetRequest, + makePostBodyRequest, makePutBodyRequest, registerUser, removeUser, runServer, ServerInfo, setAccessTokensToServers, updateUser, + uploadVideo, userLogin } from '../../utils' -import { UserRole } from '../../../../shared' +import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '../../utils/requests/check-api-params' describe('Test users API validators', function () { const path = '/api/v1/users/' @@ -42,269 +32,169 @@ describe('Test users API validators', function () { await setAccessTokensToServers([ server ]) - const username = 'user1' - const password = 'my super password' - const videoQuota = 42000000 - await createUser(server.url, server.accessToken, username, password, videoQuota) - - const videoAttributes = {} - await uploadVideo(server.url, server.accessToken, videoAttributes) - - const res = await getVideosList(server.url) - const videos = res.body.data - videoId = videos[0].id - const user = { username: 'user1', password: 'my super password' } + const videoQuota = 42000000 + await createUser(server.url, server.accessToken, user.username, user.password, videoQuota) userAccessToken = await userLogin(server, user) + + const res = await uploadVideo(server.url, server.accessToken, {}) + videoId = res.body.video.id }) describe('When listing users', function () { it('Should fail with a bad start pagination', async function () { - await request(server.url) - .get(path) - .query({ start: 'hello' }) - .set('Accept', 'application/json') - .set('Authorization', 'Bearer ' + server.accessToken) - .expect(400) + await checkBadStartPagination(server.url, path, server.accessToken) }) it('Should fail with a bad count pagination', async function () { - await request(server.url) - .get(path) - .query({ count: 'hello' }) - .set('Accept', 'application/json') - .set('Authorization', 'Bearer ' + server.accessToken) - .expect(400) + await checkBadCountPagination(server.url, path, server.accessToken) }) it('Should fail with an incorrect sort', async function () { - await request(server.url) - .get(path) - .query({ sort: 'hello' }) - .set('Accept', 'application/json') - .set('Authorization', 'Bearer ' + server.accessToken) - .expect(400) + await checkBadSortPagination(server.url, path, server.accessToken) }) it('Should fail with a non authenticated user', async function () { - await request(server.url) - .get(path) - .set('Accept', 'application/json') - .expect(401) + await makeGetRequest({ + url: server.url, + path, + statusCodeExpected: 401 + }) }) it('Should fail with a non admin user', async function () { - await request(server.url) - .get(path) - .set('Accept', 'application/json') - .set('Authorization', 'Bearer ' + userAccessToken) - .expect(403) + await makeGetRequest({ + url: server.url, + path, + token: userAccessToken, + statusCodeExpected: 403 + }) }) }) describe('When adding a new user', function () { + const baseCorrectParams = { + username: 'user2', + email: 'test@example.com', + password: 'my super password', + videoQuota: -1, + role: UserRole.USER + } + it('Should fail with a too small username', async function () { - const fields = { - username: 'ji', - email: 'test@example.com', - password: 'my_super_password', - role: UserRole.USER, - videoQuota: 42000000 - } + const fields = immutableAssign(baseCorrectParams, { username: 'fi' }) await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) it('Should fail with a too long username', async function () { - const fields = { - username: 'my_super_username_which_is_very_long', - email: 'test@example.com', - password: 'my_super_password', - videoQuota: 42000000, - role: UserRole.USER - } + const fields = immutableAssign(baseCorrectParams, { username: 'my_super_username_which_is_very_long' }) await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) it('Should fail with a not lowercase username', async function () { - const fields = { - username: 'Toto', - email: 'test@example.com', - password: 'my_super_password', - videoQuota: 42000000, - role: UserRole.USER - } + const fields = immutableAssign(baseCorrectParams, { username: 'Toto' }) await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) it('Should fail with an incorrect username', async function () { - const fields = { - username: 'my username', - email: 'test@example.com', - password: 'my_super_password', - videoQuota: 42000000, - role: UserRole.USER - } + const fields = immutableAssign(baseCorrectParams, { username: 'my username' }) await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) it('Should fail with a missing email', async function () { - const fields = { - username: 'ji', - password: 'my_super_password', - videoQuota: 42000000, - role: UserRole.USER - } + const fields = omit(baseCorrectParams, 'email') await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) it('Should fail with an invalid email', async function () { - const fields = { - username: 'my_super_username_which_is_very_long', - email: 'test_example.com', - password: 'my_super_password', - videoQuota: 42000000, - role: UserRole.USER - } + const fields = immutableAssign(baseCorrectParams, { email: 'test_example.com' }) await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) it('Should fail with a too small password', async function () { - const fields = { - username: 'my_username', - email: 'test@example.com', - password: 'bla', - videoQuota: 42000000, - role: UserRole.USER - } + const fields = immutableAssign(baseCorrectParams, { password: 'bla' }) await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) it('Should fail with a too long password', async function () { - const fields = { - username: 'my_username', - email: 'test@example.com', - password: 'my super long password which is very very very very very very very very very very very very very very' + - 'very very very very very very very very very very very very very very very veryv very very very very' + - 'very very very very very very very very very very very very very very very very very very very very long', - videoQuota: 42000000, - role: UserRole.USER - } + const fields = immutableAssign(baseCorrectParams, { password: 'super'.repeat(61) }) await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) it('Should fail with an non authenticated user', async function () { - const fields = { - username: 'my_username', - email: 'test@example.com', - password: 'my super password', - videoQuota: 42000000, - role: UserRole.USER - } - - await makePostBodyRequest({ url: server.url, path, token: 'super token', fields, statusCodeExpected: 401 }) + await makePostBodyRequest({ + url: server.url, + path, + token: 'super token', + fields: baseCorrectParams, + statusCodeExpected: 401 + }) }) it('Should fail if we add a user with the same username', async function () { - const fields = { - username: 'user1', - email: 'test@example.com', - password: 'my super password', - videoQuota: 42000000, - role: UserRole.USER - } + const fields = immutableAssign(baseCorrectParams, { username: 'user1' }) await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields, statusCodeExpected: 409 }) }) it('Should fail if we add a user with the same email', async function () { - const fields = { - username: 'my_username', - email: 'user1@example.com', - password: 'my super password', - videoQuota: 42000000, - role: UserRole.USER - } + const fields = immutableAssign(baseCorrectParams, { email: 'user1@example.com' }) await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields, statusCodeExpected: 409 }) }) it('Should fail without a videoQuota', async function () { - const fields = { - username: 'my_username', - email: 'user1@example.com', - password: 'my super password', - role: UserRole.USER - } + const fields = omit(baseCorrectParams, 'videoQuota') await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) it('Should fail with an invalid videoQuota', async function () { - const fields = { - username: 'my_username', - email: 'user1@example.com', - password: 'my super password', - videoQuota: -5, - role: UserRole.USER - } + const fields = immutableAssign(baseCorrectParams, { videoQuota: -5 }) await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) it('Should fail without a user role', async function () { - const fields = { - username: 'my_username', - email: 'user1@example.com', - password: 'my super password', - videoQuota: 0 - } + const fields = omit(baseCorrectParams, 'role') await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) it('Should fail with an invalid user role', async function () { - const fields = { - username: 'my_username', - email: 'user1@example.com', - password: 'my super password', - videoQuota: 0, - role: 88989 - } + const fields = immutableAssign(baseCorrectParams, { role: 88989 }) await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) it('Should succeed with the correct params', async function () { - const fields = { - username: 'user2', - email: 'test@example.com', - password: 'my super password', - videoQuota: -1, - role: UserRole.USER - } - - await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields, statusCodeExpected: 204 }) + await makePostBodyRequest({ + url: server.url, + path, + token: server.accessToken, + fields: baseCorrectParams, + statusCodeExpected: 204 + }) }) it('Should fail with a non admin user', async function () { - server.user = { + const user = { username: 'user1', - email: 'test@example.com', password: 'my super password' } + userAccessToken = await userLogin(server, user) - userAccessToken = await serverLogin(server) const fields = { username: 'user3', email: 'test@example.com', @@ -334,9 +224,7 @@ describe('Test users API validators', function () { it('Should fail with a too long password', async function () { const fields = { - password: 'my super long password which is very very very very very very very very very very very very very very' + - 'very very very very very very very very very very very very very very very veryv very very very very' + - 'very very very very very very very very very very very very very very very very very very very very long' + password: 'super'.repeat(61) } await makePutBodyRequest({ url: server.url, path: path + 'me', token: userAccessToken, fields }) @@ -432,204 +320,128 @@ describe('Test users API validators', function () { describe('When getting my information', function () { it('Should fail with a non authenticated user', async function () { - await request(server.url) - .get(path + 'me') - .set('Authorization', 'Bearer fake_token') - .set('Accept', 'application/json') - .expect(401) + await getMyUserInformation(server.url, 'fake_token', 401) }) it('Should success with the correct parameters', async function () { - await request(server.url) - .get(path + 'me') - .set('Authorization', 'Bearer ' + userAccessToken) - .set('Accept', 'application/json') - .expect(200) + await getMyUserInformation(server.url, userAccessToken) }) }) describe('When getting my video rating', function () { it('Should fail with a non authenticated user', async function () { - await request(server.url) - .get(path + 'me/videos/' + videoId + '/rating') - .set('Authorization', 'Bearer fake_token') - .set('Accept', 'application/json') - .expect(401) + await getMyUserVideoRating(server.url, 'fake_token', videoId, 401) }) it('Should fail with an incorrect video uuid', async function () { - await request(server.url) - .get(path + 'me/videos/blabla/rating') - .set('Authorization', 'Bearer ' + userAccessToken) - .set('Accept', 'application/json') - .expect(400) + await getMyUserVideoRating(server.url, server.accessToken, 'blabla', 400) }) it('Should fail with an unknown video', async function () { - await request(server.url) - .get(path + 'me/videos/4da6fde3-88f7-4d16-b119-108df5630b06/rating') - .set('Authorization', 'Bearer ' + userAccessToken) - .set('Accept', 'application/json') - .expect(404) + await getMyUserVideoRating(server.url, server.accessToken, '4da6fde3-88f7-4d16-b119-108df5630b06', 404) }) - it('Should success with the correct parameters', async function () { - await request(server.url) - .get(path + 'me/videos/' + videoId + '/rating') - .set('Authorization', 'Bearer ' + userAccessToken) - .set('Accept', 'application/json') - .expect(200) - }) - }) - - describe('When removing an user', function () { - it('Should fail with an incorrect id', async function () { - await request(server.url) - .delete(path + 'bla-bla') - .set('Authorization', 'Bearer ' + server.accessToken) - .expect(400) - }) - - it('Should fail with the root user', async function () { - await request(server.url) - .delete(path + rootId) - .set('Authorization', 'Bearer ' + server.accessToken) - .expect(400) - }) - - it('Should return 404 with a non existing id', async function () { - await request(server.url) - .delete(path + '45') - .set('Authorization', 'Bearer ' + server.accessToken) - .expect(404) + it('Should succeed with the correct parameters', async function () { + await getMyUserVideoRating(server.url, server.accessToken, videoId) }) }) describe('When removing an user', function () { it('Should fail with an incorrect id', async function () { - await request(server.url) - .delete(path + 'bla-bla') - .set('Authorization', 'Bearer ' + server.accessToken) - .expect(400) + await removeUser(server.url, 'blabla', server.accessToken, 400) }) it('Should fail with the root user', async function () { - await request(server.url) - .delete(path + rootId) - .set('Authorization', 'Bearer ' + server.accessToken) - .expect(400) + await removeUser(server.url, rootId, server.accessToken, 400) }) it('Should return 404 with a non existing id', async function () { - await request(server.url) - .delete(path + '45') - .set('Authorization', 'Bearer ' + server.accessToken) - .expect(404) + await removeUser(server.url, 4545454, server.accessToken, 404) }) }) describe('When register a new user', function () { const registrationPath = path + '/register' + const baseCorrectParams = { + username: 'user3', + email: 'test3@example.com', + password: 'my super password' + } it('Should fail with a too small username', async function () { - const fields = { - username: 'ji', - email: 'test@example.com', - password: 'my_super_password' - } + const fields = immutableAssign(baseCorrectParams, { username: 'ji' }) await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields }) }) it('Should fail with a too long username', async function () { - const fields = { - username: 'my_super_username_which_is_very_long', - email: 'test@example.com', - password: 'my_super_password' - } + const fields = immutableAssign(baseCorrectParams, { username: 'my_super_username_which_is_very_long' }) await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields }) }) it('Should fail with an incorrect username', async function () { - const fields = { - username: 'my username', - email: 'test@example.com', - password: 'my_super_password' - } + const fields = immutableAssign(baseCorrectParams, { username: 'my username' }) await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields }) }) it('Should fail with a missing email', async function () { - const fields = { - username: 'ji', - password: 'my_super_password' - } + const fields = omit(baseCorrectParams, 'email') await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields }) }) it('Should fail with an invalid email', async function () { - const fields = { - username: 'my_super_username_which_is_very_long', - email: 'test_example.com', - password: 'my_super_password' - } + const fields = immutableAssign(baseCorrectParams, { email: 'test_example.com' }) await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields }) }) it('Should fail with a too small password', async function () { - const fields = { - username: 'my_username', - email: 'test@example.com', - password: 'bla' - } + const fields = immutableAssign(baseCorrectParams, { password: 'bla' }) await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields }) }) it('Should fail with a too long password', async function () { - const fields = { - username: 'my_username', - email: 'test@example.com', - password: 'my super long password which is very very very very very very very very very very very very very very' + - 'very very very very very very very very very very very very very very very veryv very very very very' + - 'very very very very very very very very very very very very very very very very very very very very long' - } + const fields = immutableAssign(baseCorrectParams, { password: 'super'.repeat(61) }) await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields }) }) it('Should fail if we register a user with the same username', async function () { - const fields = { - username: 'root', - email: 'test@example.com', - password: 'my super password' - } + const fields = immutableAssign(baseCorrectParams, { username: 'root' }) - await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields, statusCodeExpected: 409 }) + await makePostBodyRequest({ + url: server.url, + path: registrationPath, + token: server.accessToken, + fields, + statusCodeExpected: 409 + }) }) it('Should fail if we register a user with the same email', async function () { - const fields = { - username: 'my_username', - email: 'admin1@example.com', - password: 'my super password' - } + const fields = immutableAssign(baseCorrectParams, { email: 'admin1@example.com' }) - await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields, statusCodeExpected: 409 }) + await makePostBodyRequest({ + url: server.url, + path: registrationPath, + token: server.accessToken, + fields, + statusCodeExpected: 409 + }) }) it('Should succeed with the correct params', async function () { - const fields = { - username: 'user3', - email: 'test3@example.com', - password: 'my super password' - } - - await makePostBodyRequest({ url: server.url, path: registrationPath, token: server.accessToken, fields, statusCodeExpected: 204 }) + await makePostBodyRequest({ + url: server.url, + path: registrationPath, + token: server.accessToken, + fields: baseCorrectParams, + statusCodeExpected: 204 + }) }) it('Should fail on a server with registration disabled', async function () { @@ -657,25 +469,24 @@ describe('Test users API validators', function () { describe('When having a video quota', function () { it('Should fail with a user having too many video', async function () { - const fields = { + await updateUser({ + url: server.url, + userId: rootId, + accessToken: server.accessToken, videoQuota: 42 - } - - await makePutBodyRequest({ url: server.url, path: path + rootId, token: server.accessToken, fields, statusCodeExpected: 204 }) + }) - const videoAttributes = {} - await uploadVideo(server.url, server.accessToken, videoAttributes, 403) + await uploadVideo(server.url, server.accessToken, {}, 403) }) it('Should fail with a registered user having too many video', async function () { this.timeout(10000) - server.user = { + const user = { username: 'user3', - email: 'test3@example.com', password: 'my super password' } - userAccessToken = await serverLogin(server) + userAccessToken = await userLogin(server, user) const videoAttributes = { fixture: 'video_short2.webm' } await uploadVideo(server.url, userAccessToken, videoAttributes) diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts index 298dbce2c..ec164cadc 100644 --- a/server/tests/api/users/users.ts +++ b/server/tests/api/users/users.ts @@ -11,7 +11,7 @@ import { getUserInformation, getUsersList, getUsersListPaginationAndSort, - getUserVideoRating, + getMyUserVideoRating, getVideosList, killallServers, login, @@ -130,7 +130,7 @@ describe('Test users', function () { it('Should retrieve a video rating', async function () { await rateVideo(server.url, accessToken, videoId, 'like') - const res = await getUserVideoRating(server.url, accessToken, videoId) + const res = await getMyUserVideoRating(server.url, accessToken, videoId) const rating = res.body expect(rating.videoId) diff --git a/server/tests/utils/miscs/miscs.ts b/server/tests/utils/miscs/miscs.ts index 424b0db98..2147a07ff 100644 --- a/server/tests/utils/miscs/miscs.ts +++ b/server/tests/utils/miscs/miscs.ts @@ -3,6 +3,10 @@ import { readFile, readdir } from 'fs' let webtorrent = new WebTorrent() +function immutableAssign (target: T, source: U) { + return Object.assign<{}, T, U>({}, target, source) +} + function readFilePromise (path: string) { return new Promise((res, rej) => { readFile(path, (err, data) => { @@ -48,5 +52,6 @@ export { readdirPromise, dateIsValid, wait, - webtorrentAdd + webtorrentAdd, + immutableAssign } diff --git a/server/tests/utils/users/users.ts b/server/tests/utils/users/users.ts index bd8d7ab04..e0cca3f51 100644 --- a/server/tests/utils/users/users.ts +++ b/server/tests/utils/users/users.ts @@ -1,4 +1,5 @@ import * as request from 'supertest' +import { makePutBodyRequest } from '../' import { UserRole } from '../../../../shared/index' @@ -43,14 +44,14 @@ function registerUser (url: string, username: string, password: string, specialS .expect(specialStatus) } -function getMyUserInformation (url: string, accessToken: string) { +function getMyUserInformation (url: string, accessToken: string, specialStatus = 200) { const path = '/api/v1/users/me' return request(url) .get(path) .set('Accept', 'application/json') .set('Authorization', 'Bearer ' + accessToken) - .expect(200) + .expect(specialStatus) .expect('Content-Type', /json/) } @@ -65,14 +66,14 @@ function getUserInformation (url: string, accessToken: string, userId: number) { .expect('Content-Type', /json/) } -function getUserVideoRating (url: string, accessToken: string, videoId: number) { +function getMyUserVideoRating (url: string, accessToken: string, videoId: number | string, specialStatus = 200) { const path = '/api/v1/users/me/videos/' + videoId + '/rating' return request(url) .get(path) .set('Accept', 'application/json') .set('Authorization', 'Bearer ' + accessToken) - .expect(200) + .expect(specialStatus) .expect('Content-Type', /json/) } @@ -101,7 +102,7 @@ function getUsersListPaginationAndSort (url: string, accessToken: string, start: .expect('Content-Type', /json/) } -function removeUser (url: string, userId: number, accessToken: string, expectedStatus = 204) { +function removeUser (url: string, userId: number | string, accessToken: string, expectedStatus = 204) { const path = '/api/v1/users' return request(url) @@ -111,38 +112,53 @@ function removeUser (url: string, userId: number, accessToken: string, expectedS .expect(expectedStatus) } -function updateMyUser (url: string, accessToken: string, newPassword: string, displayNSFW?: boolean, - email?: string, autoPlayVideo?: boolean) { +function updateMyUser (options: { + url: string + accessToken: string, + newPassword?: string, + displayNSFW?: boolean, + email?: string, + autoPlayVideo?: boolean +}) { const path = '/api/v1/users/me' const toSend = {} - if (newPassword !== undefined && newPassword !== null) toSend['password'] = newPassword - if (displayNSFW !== undefined && displayNSFW !== null) toSend['displayNSFW'] = displayNSFW - if (autoPlayVideo !== undefined && autoPlayVideo !== null) toSend['autoPlayVideo'] = autoPlayVideo - if (email !== undefined && email !== null) toSend['email'] = email - - return request(url) - .put(path) - .set('Accept', 'application/json') - .set('Authorization', 'Bearer ' + accessToken) - .send(toSend) - .expect(204) + if (options.newPassword !== undefined && options.newPassword !== null) toSend['password'] = options.newPassword + if (options.displayNSFW !== undefined && options.displayNSFW !== null) toSend['displayNSFW'] = options.displayNSFW + if (options.autoPlayVideo !== undefined && options.autoPlayVideo !== null) toSend['autoPlayVideo'] = options.autoPlayVideo + if (options.email !== undefined && options.email !== null) toSend['email'] = options.email + + return makePutBodyRequest({ + url: options.url, + path, + token: options.accessToken, + fields: toSend, + statusCodeExpected: 204 + }) } -function updateUser (url: string, userId: number, accessToken: string, email: string, videoQuota: number, role: UserRole) { - const path = '/api/v1/users/' + userId +function updateUser (options: { + url: string + userId: number, + accessToken: string, + email?: string, + videoQuota?: number, + role?: UserRole +}) { + const path = '/api/v1/users/' + options.userId const toSend = {} - if (email !== undefined && email !== null) toSend['email'] = email - if (videoQuota !== undefined && videoQuota !== null) toSend['videoQuota'] = videoQuota - if (role !== undefined && role !== null) toSend['role'] = role - - return request(url) - .put(path) - .set('Accept', 'application/json') - .set('Authorization', 'Bearer ' + accessToken) - .send(toSend) - .expect(204) + if (options.email !== undefined && options.email !== null) toSend['email'] = options.email + if (options.videoQuota !== undefined && options.videoQuota !== null) toSend['videoQuota'] = options.videoQuota + if (options.role !== undefined && options.role !== null) toSend['role'] = options.role + + return makePutBodyRequest({ + url: options.url, + path, + token: options.accessToken, + fields: toSend, + statusCodeExpected: 204 + }) } // --------------------------------------------------------------------------- @@ -151,7 +167,7 @@ export { createUser, registerUser, getMyUserInformation, - getUserVideoRating, + getMyUserVideoRating, getUsersList, getUsersListPaginationAndSort, removeUser, -- 2.25.1