X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fusers%2Fusers.ts;h=6e7de9c3853a537598748f98f39d4ed08055ce52;hb=22834691abb6e74d31654ffd2ebeaaaa8ef3ac7b;hp=2e3a0b94fc29c727dee2a04d541af129690c7a32;hpb=c5d31dba56d669c0df0209761c43c5a6ac7cec4a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/users/users.ts b/server/tests/api/users/users.ts
index 2e3a0b94f..6e7de9c38 100644
--- a/server/tests/api/users/users.ts
+++ b/server/tests/api/users/users.ts
@@ -2,20 +2,23 @@
 
 import * as chai from 'chai'
 import 'mocha'
-import { UserRole } from '../../../../shared/index'
+import { User, UserRole } from '../../../../shared/index'
 import {
+  blockUser,
   createUser,
+  deleteMe,
   flushTests,
+  getAccountRatings,
   getBlacklistedVideosList,
   getMyUserInformation,
+  getMyUserVideoQuotaUsed,
+  getMyUserVideoRating,
   getUserInformation,
   getUsersList,
   getUsersListPaginationAndSort,
-  getUserVideoRating,
   getVideosList,
   killallServers,
   login,
-  loginAndGetAccessToken,
   makePutBodyRequest,
   rateVideo,
   registerUser,
@@ -23,13 +26,17 @@ import {
   removeVideo,
   runServer,
   ServerInfo,
+  testImage,
+  unblockUser,
+  updateMyAvatar,
   updateMyUser,
   updateUser,
-  uploadVideo
-} from '../../utils/index'
-import { follow } from '../../utils/server/follows'
-import { getMyVideos } from '../../utils/videos/videos'
-import { setAccessTokensToServers } from '../../utils/users/login'
+  uploadVideo,
+  userLogin
+} from '../../../../shared/utils'
+import { follow } from '../../../../shared/utils/server/follows'
+import { setAccessTokensToServers } from '../../../../shared/utils/users/login'
+import { getMyVideos } from '../../../../shared/utils/videos/videos'
 
 const expect = chai.expect
 
@@ -39,9 +46,13 @@ describe('Test users', function () {
   let accessTokenUser: string
   let videoId: number
   let userId: number
+  const user = {
+    username: 'user_1',
+    password: 'super password'
+  }
 
   before(async function () {
-    this.timeout(10000)
+    this.timeout(30000)
 
     await flushTests()
     server = await runServer(1)
@@ -59,36 +70,28 @@ describe('Test users', function () {
     const client = { id: 'client', secret: server.client.secret }
     const res = await login(server.url, client, server.user, 400)
 
-    expect(res.body.error)
-      .to
-      .equal('invalid_client')
+    expect(res.body.error).to.contain('client is invalid')
   })
 
   it('Should not login with an invalid client secret', async function () {
     const client = { id: server.client.id, secret: 'coucou' }
     const res = await login(server.url, client, server.user, 400)
 
-    expect(res.body.error)
-      .to
-      .equal('invalid_client')
+    expect(res.body.error).to.contain('client is invalid')
   })
 
   it('Should not login with an invalid username', async function () {
     const user = { username: 'captain crochet', password: server.user.password }
     const res = await login(server.url, server.client, user, 400)
 
-    expect(res.body.error)
-      .to
-      .equal('invalid_grant')
+    expect(res.body.error).to.contain('credentials are invalid')
   })
 
   it('Should not login with an invalid password', async function () {
     const user = { username: server.user.username, password: 'mew_three' }
     const res = await login(server.url, server.client, user, 400)
 
-    expect(res.body.error)
-      .to
-      .equal('invalid_grant')
+    expect(res.body.error).to.contain('credentials are invalid')
   })
 
   it('Should not be able to upload a video', async function () {
@@ -117,9 +120,7 @@ describe('Test users', function () {
     const res = await getVideosList(server.url)
     const video = res.body.data[ 0 ]
 
-    expect(video.accountName)
-      .to
-      .equal('root')
+    expect(video.account.name).to.equal('root')
     videoId = video.id
   })
 
@@ -130,15 +131,36 @@ 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)
-      .to
-      .equal(videoId)
-    expect(rating.rating)
-      .to
-      .equal('like')
+    expect(rating.videoId).to.equal(videoId)
+    expect(rating.rating).to.equal('like')
+  })
+
+  it('Should retrieve ratings list', async function () {
+    await rateVideo(server.url, accessToken, videoId, 'like')
+
+    const res = await getAccountRatings(server.url, server.user.username, server.accessToken, null, 200)
+    const ratings = res.body
+
+    expect(ratings.total).to.equal(1)
+    expect(ratings.data[0].video.id).to.equal(videoId)
+    expect(ratings.data[0].rating).to.equal('like')
+  })
+
+  it('Should retrieve ratings list by rating type', async function () {
+    {
+      const res = await getAccountRatings(server.url, server.user.username, server.accessToken, 'like')
+      const ratings = res.body
+      expect(ratings.data.length).to.equal(1)
+    }
+
+    {
+      const res = await getAccountRatings(server.url, server.user.username, server.accessToken, 'dislike')
+      const ratings = res.body
+      expect(ratings.data.length).to.equal(0)
+    }
   })
 
   it('Should not be able to remove the video with an incorrect token', async function () {
@@ -184,65 +206,58 @@ describe('Test users', function () {
   it('Should be able to upload a video again')
 
   it('Should be able to create a new user', async function () {
-    await createUser(server.url, accessToken, 'user_1', 'super password', 2 * 1024 * 1024)
+    await createUser(server.url, accessToken, user.username, user.password, 2 * 1024 * 1024)
   })
 
   it('Should be able to login with this user', async function () {
-    server.user = {
-      username: 'user_1',
-      password: 'super password'
-    }
-
-    accessTokenUser = await loginAndGetAccessToken(server)
+    accessTokenUser = await userLogin(server, user)
   })
 
   it('Should be able to get the user information', async function () {
     const res = await getMyUserInformation(server.url, accessTokenUser)
     const user = res.body
 
-    expect(user.username)
-      .to
-      .equal('user_1')
-    expect(user.email)
-      .to
-      .equal('user_1@example.com')
-    expect(user.displayNSFW).to.be.false
-    expect(user.videoQuota)
-      .to
-      .equal(2 * 1024 * 1024)
-    expect(user.roleLabel)
-      .to
-      .equal('User')
-    expect(user.id)
-      .to
-      .be
-      .a('number')
+    expect(user.username).to.equal('user_1')
+    expect(user.email).to.equal('user_1@example.com')
+    expect(user.nsfwPolicy).to.equal('display')
+    expect(user.videoQuota).to.equal(2 * 1024 * 1024)
+    expect(user.roleLabel).to.equal('User')
+    expect(user.id).to.be.a('number')
+    expect(user.account.displayName).to.equal('user_1')
+    expect(user.account.description).to.be.null
   })
 
   it('Should be able to upload a video with this user', async function () {
     this.timeout(5000)
 
     const videoAttributes = {
-      name: 'super user video'
+      name: 'super user video',
+      fixture: 'video_short.webm'
     }
     await uploadVideo(server.url, accessTokenUser, videoAttributes)
   })
 
+  it('Should have video quota updated', async function () {
+    const res = await getMyUserVideoQuotaUsed(server.url, accessTokenUser)
+    const data = res.body
+
+    expect(data.videoQuotaUsed).to.equal(218910)
+
+    const resUsers = await getUsersList(server.url, server.accessToken)
+
+    const users: User[] = resUsers.body.data
+    const tmpUser = users.find(u => u.username === user.username)
+    expect(tmpUser.videoQuotaUsed).to.equal(218910)
+  })
+
   it('Should be able to list my videos', async function () {
     const res = await getMyVideos(server.url, accessTokenUser, 0, 5)
-    expect(res.body.total)
-      .to
-      .equal(1)
+    expect(res.body.total).to.equal(1)
 
     const videos = res.body.data
-    expect(videos)
-      .to
-      .have
-      .lengthOf(1)
+    expect(videos).to.have.lengthOf(1)
 
-    expect(videos[ 0 ].name)
-      .to
-      .equal('super user video')
+    expect(videos[ 0 ].name).to.equal('super user video')
   })
 
   it('Should list all the users', async function () {
@@ -251,34 +266,19 @@ describe('Test users', function () {
     const total = result.total
     const users = result.data
 
-    expect(total)
-      .to
-      .equal(2)
-    expect(users)
-      .to
-      .be
-      .an('array')
-    expect(users.length)
-      .to
-      .equal(2)
+    expect(total).to.equal(2)
+    expect(users).to.be.an('array')
+    expect(users.length).to.equal(2)
 
     const user = users[ 0 ]
-    expect(user.username)
-      .to
-      .equal('user_1')
-    expect(user.email)
-      .to
-      .equal('user_1@example.com')
-    expect(user.displayNSFW).to.be.false
+    expect(user.username).to.equal('user_1')
+    expect(user.email).to.equal('user_1@example.com')
+    expect(user.nsfwPolicy).to.equal('display')
 
     const rootUser = users[ 1 ]
-    expect(rootUser.username)
-      .to
-      .equal('root')
-    expect(rootUser.email)
-      .to
-      .equal('admin1@example.com')
-    expect(rootUser.displayNSFW).to.be.false
+    expect(rootUser.username).to.equal('root')
+    expect(rootUser.email).to.equal('admin1@example.com')
+    expect(user.nsfwPolicy).to.equal('display')
 
     userId = user.id
   })
@@ -290,24 +290,14 @@ describe('Test users', function () {
     const total = result.total
     const users = result.data
 
-    expect(total)
-      .to
-      .equal(2)
-    expect(users.length)
-      .to
-      .equal(1)
+    expect(total).to.equal(2)
+    expect(users.length).to.equal(1)
 
     const user = users[ 0 ]
-    expect(user.username)
-      .to
-      .equal('root')
-    expect(user.email)
-      .to
-      .equal('admin1@example.com')
-    expect(user.roleLabel)
-      .to
-      .equal('Administrator')
-    expect(user.displayNSFW).to.be.false
+    expect(user.username).to.equal('root')
+    expect(user.email).to.equal('admin1@example.com')
+    expect(user.roleLabel).to.equal('Administrator')
+    expect(user.nsfwPolicy).to.equal('display')
   })
 
   it('Should list only the first user by username desc', async function () {
@@ -316,21 +306,13 @@ describe('Test users', function () {
     const total = result.total
     const users = result.data
 
-    expect(total)
-      .to
-      .equal(2)
-    expect(users.length)
-      .to
-      .equal(1)
+    expect(total).to.equal(2)
+    expect(users.length).to.equal(1)
 
     const user = users[ 0 ]
-    expect(user.username)
-      .to
-      .equal('user_1')
-    expect(user.email)
-      .to
-      .equal('user_1@example.com')
-    expect(user.displayNSFW).to.be.false
+    expect(user.username).to.equal('user_1')
+    expect(user.email).to.equal('user_1@example.com')
+    expect(user.nsfwPolicy).to.equal('display')
   })
 
   it('Should list only the second user by createdAt desc', async function () {
@@ -339,21 +321,13 @@ describe('Test users', function () {
     const total = result.total
     const users = result.data
 
-    expect(total)
-      .to
-      .equal(2)
-    expect(users.length)
-      .to
-      .equal(1)
+    expect(total).to.equal(2)
+    expect(users.length).to.equal(1)
 
     const user = users[ 0 ]
-    expect(user.username)
-      .to
-      .equal('user_1')
-    expect(user.email)
-      .to
-      .equal('user_1@example.com')
-    expect(user.displayNSFW).to.be.false
+    expect(user.username).to.equal('user_1')
+    expect(user.email).to.equal('user_1@example.com')
+    expect(user.nsfwPolicy).to.equal('display')
   })
 
   it('Should list all the users by createdAt asc', async function () {
@@ -362,61 +336,89 @@ describe('Test users', function () {
     const total = result.total
     const users = result.data
 
-    expect(total)
-      .to
-      .equal(2)
-    expect(users.length)
-      .to
-      .equal(2)
-
-    expect(users[ 0 ].username)
-      .to
-      .equal('root')
-    expect(users[ 0 ].email)
-      .to
-      .equal('admin1@example.com')
-    expect(users[ 0 ].displayNSFW).to.be.false
-
-    expect(users[ 1 ].username)
-      .to
-      .equal('user_1')
-    expect(users[ 1 ].email)
-      .to
-      .equal('user_1@example.com')
-    expect(users[ 1 ].displayNSFW).to.be.false
+    expect(total).to.equal(2)
+    expect(users.length).to.equal(2)
+
+    expect(users[ 0 ].username).to.equal('root')
+    expect(users[ 0 ].email).to.equal('admin1@example.com')
+    expect(users[ 0 ].nsfwPolicy).to.equal('display')
+
+    expect(users[ 1 ].username).to.equal('user_1')
+    expect(users[ 1 ].email).to.equal('user_1@example.com')
+    expect(users[ 1 ].nsfwPolicy).to.equal('display')
+  })
+
+  it('Should search user by username', async function () {
+    const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt', 'oot')
+    const users = res.body.data as User[]
+
+    expect(res.body.total).to.equal(1)
+    expect(users.length).to.equal(1)
+
+    expect(users[ 0 ].username).to.equal('root')
+  })
+
+  it('Should search user by email', async function () {
+    {
+      const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt', 'r_1@exam')
+      const users = res.body.data as User[]
+
+      expect(res.body.total).to.equal(1)
+      expect(users.length).to.equal(1)
+
+      expect(users[ 0 ].username).to.equal('user_1')
+      expect(users[ 0 ].email).to.equal('user_1@example.com')
+    }
+
+    {
+      const res = await getUsersListPaginationAndSort(server.url, server.accessToken, 0, 2, 'createdAt', 'example')
+      const users = res.body.data as User[]
+
+      expect(res.body.total).to.equal(2)
+      expect(users.length).to.equal(2)
+
+      expect(users[ 0 ].username).to.equal('root')
+      expect(users[ 1 ].username).to.equal('user_1')
+    }
   })
 
   it('Should update my password', async function () {
-    await updateMyUser(server.url, accessTokenUser, 'new password')
-    server.user.password = 'new password'
+    await updateMyUser({
+      url: server.url,
+      accessToken: accessTokenUser,
+      currentPassword: 'super password',
+      newPassword: 'new password'
+    })
+    user.password = 'new password'
 
-    await login(server.url, server.client, server.user, 200)
+    await userLogin(server, user, 200)
   })
 
   it('Should be able to change the NSFW display attribute', async function () {
-    await updateMyUser(server.url, accessTokenUser, undefined, true)
+    await updateMyUser({
+      url: server.url,
+      accessToken: accessTokenUser,
+      nsfwPolicy: 'do_not_list'
+    })
 
     const res = await getMyUserInformation(server.url, accessTokenUser)
     const user = res.body
 
-    expect(user.username)
-      .to
-      .equal('user_1')
-    expect(user.email)
-      .to
-      .equal('user_1@example.com')
-    expect(user.displayNSFW).to.be.ok
-    expect(user.videoQuota)
-      .to
-      .equal(2 * 1024 * 1024)
-    expect(user.id)
-      .to
-      .be
-      .a('number')
+    expect(user.username).to.equal('user_1')
+    expect(user.email).to.equal('user_1@example.com')
+    expect(user.nsfwPolicy).to.equal('do_not_list')
+    expect(user.videoQuota).to.equal(2 * 1024 * 1024)
+    expect(user.id).to.be.a('number')
+    expect(user.account.displayName).to.equal('user_1')
+    expect(user.account.description).to.be.null
   })
 
   it('Should be able to change the autoPlayVideo attribute', async function () {
-    await updateMyUser(server.url, accessTokenUser, undefined, undefined, undefined, false)
+    await updateMyUser({
+      url: server.url,
+      accessToken: accessTokenUser,
+      autoPlayVideo: false
+    })
 
     const res = await getMyUserInformation(server.url, accessTokenUser)
     const user = res.body
@@ -425,54 +427,120 @@ describe('Test users', function () {
   })
 
   it('Should be able to change the email display attribute', async function () {
-    await updateMyUser(server.url, accessTokenUser, undefined, undefined, 'updated@example.com')
+    await updateMyUser({
+      url: server.url,
+      accessToken: accessTokenUser,
+      email: 'updated@example.com'
+    })
+
+    const res = await getMyUserInformation(server.url, accessTokenUser)
+    const user = res.body
+
+    expect(user.username).to.equal('user_1')
+    expect(user.email).to.equal('updated@example.com')
+    expect(user.nsfwPolicy).to.equal('do_not_list')
+    expect(user.videoQuota).to.equal(2 * 1024 * 1024)
+    expect(user.id).to.be.a('number')
+    expect(user.account.displayName).to.equal('user_1')
+    expect(user.account.description).to.be.null
+  })
+
+  it('Should be able to update my avatar', async function () {
+    const fixture = 'avatar.png'
+
+    await updateMyAvatar({
+      url: server.url,
+      accessToken: accessTokenUser,
+      fixture
+    })
 
     const res = await getMyUserInformation(server.url, accessTokenUser)
     const user = res.body
 
-    expect(user.username)
-      .to
-      .equal('user_1')
-    expect(user.email)
-      .to
-      .equal('updated@example.com')
-    expect(user.displayNSFW).to.be.ok
-    expect(user.videoQuota)
-      .to
-      .equal(2 * 1024 * 1024)
-    expect(user.id)
-      .to
-      .be
-      .a('number')
+    await testImage(server.url, 'avatar-resized', user.account.avatar.path, '.png')
+  })
+
+  it('Should be able to update my display name', async function () {
+    await updateMyUser({
+      url: server.url,
+      accessToken: accessTokenUser,
+      displayName: 'new display name'
+    })
+
+    const res = await getMyUserInformation(server.url, accessTokenUser)
+    const user = res.body
+
+    expect(user.username).to.equal('user_1')
+    expect(user.email).to.equal('updated@example.com')
+    expect(user.nsfwPolicy).to.equal('do_not_list')
+    expect(user.videoQuota).to.equal(2 * 1024 * 1024)
+    expect(user.id).to.be.a('number')
+    expect(user.account.displayName).to.equal('new display name')
+    expect(user.account.description).to.be.null
+  })
+
+  it('Should be able to update my description', async function () {
+    await updateMyUser({
+      url: server.url,
+      accessToken: accessTokenUser,
+      description: 'my super description updated'
+    })
+
+    const res = await getMyUserInformation(server.url, accessTokenUser)
+    const user = res.body
+
+    expect(user.username).to.equal('user_1')
+    expect(user.email).to.equal('updated@example.com')
+    expect(user.nsfwPolicy).to.equal('do_not_list')
+    expect(user.videoQuota).to.equal(2 * 1024 * 1024)
+    expect(user.id).to.be.a('number')
+    expect(user.account.displayName).to.equal('new display name')
+    expect(user.account.description).to.equal('my super description updated')
   })
 
   it('Should be able to update another user', async function () {
-    await updateUser(server.url, userId, accessToken, 'updated2@example.com', 42, UserRole.MODERATOR)
+    await updateUser({
+      url: server.url,
+      userId,
+      accessToken,
+      email: 'updated2@example.com',
+      emailVerified: true,
+      videoQuota: 42,
+      role: UserRole.MODERATOR
+    })
 
     const res = await getUserInformation(server.url, accessToken, userId)
     const user = res.body
 
-    expect(user.username)
-      .to
-      .equal('user_1')
-    expect(user.email)
-      .to
-      .equal('updated2@example.com')
-    expect(user.displayNSFW).to.be.ok
-    expect(user.videoQuota)
-      .to
-      .equal(42)
-    expect(user.roleLabel)
-      .to
-      .equal('Moderator')
-    expect(user.id)
-      .to
-      .be
-      .a('number')
-  })
-
-  it('Should not be able to delete a user by a moderator', async function () {
-    await removeUser(server.url, 2, accessTokenUser, 403)
+    expect(user.username).to.equal('user_1')
+    expect(user.email).to.equal('updated2@example.com')
+    expect(user.emailVerified).to.be.true
+    expect(user.nsfwPolicy).to.equal('do_not_list')
+    expect(user.videoQuota).to.equal(42)
+    expect(user.roleLabel).to.equal('Moderator')
+    expect(user.id).to.be.a('number')
+  })
+
+  it('Should have removed the user token', async function () {
+    await getMyUserVideoQuotaUsed(server.url, accessTokenUser, 401)
+
+    accessTokenUser = await userLogin(server, user)
+  })
+
+  it('Should be able to update another user password', async function () {
+    await updateUser({
+      url: server.url,
+      userId,
+      accessToken,
+      password: 'password updated'
+    })
+
+    await getMyUserVideoQuotaUsed(server.url, accessTokenUser, 401)
+
+    await userLogin(server, user, 400)
+
+    user.password = 'password updated'
+    accessTokenUser = await userLogin(server, user)
   })
 
   it('Should be able to list video blacklist by a moderator', async function () {
@@ -484,21 +552,16 @@ describe('Test users', function () {
   })
 
   it('Should not be able to login with this user', async function () {
-    // server.user is already set to user 1
-    await login(server.url, server.client, server.user, 400)
+    await userLogin(server, user, 400)
   })
 
   it('Should not have videos of this user', async function () {
     const res = await getVideosList(server.url)
 
-    expect(res.body.total)
-      .to
-      .equal(1)
+    expect(res.body.total).to.equal(1)
 
     const video = res.body.data[ 0 ]
-    expect(video.accountName)
-      .to
-      .equal('root')
+    expect(video.account.name).to.equal('root')
   })
 
   it('Should register a new user', async function () {
@@ -506,21 +569,54 @@ describe('Test users', function () {
   })
 
   it('Should be able to login with this registered user', async function () {
-    server.user = {
+    const user15 = {
       username: 'user_15',
       password: 'my super password'
     }
 
-    accessToken = await loginAndGetAccessToken(server)
+    accessToken = await userLogin(server, user15)
   })
 
   it('Should have the correct video quota', async function () {
     const res = await getMyUserInformation(server.url, accessToken)
     const user = res.body
 
-    expect(user.videoQuota)
-      .to
-      .equal(5 * 1024 * 1024)
+    expect(user.videoQuota).to.equal(5 * 1024 * 1024)
+  })
+
+  it('Should remove me', async function () {
+    {
+      const res = await getUsersList(server.url, server.accessToken)
+      expect(res.body.data.find(u => u.username === 'user_15')).to.not.be.undefined
+    }
+
+    await deleteMe(server.url, accessToken)
+
+    {
+      const res = await getUsersList(server.url, server.accessToken)
+      expect(res.body.data.find(u => u.username === 'user_15')).to.be.undefined
+    }
+  })
+
+  it('Should block and unblock a user', async function () {
+    const user16 = {
+      username: 'user_16',
+      password: 'my super password'
+    }
+    const resUser = await createUser(server.url, server.accessToken, user16.username, user16.password)
+    const user16Id = resUser.body.user.id
+
+    accessToken = await userLogin(server, user16)
+
+    await getMyUserInformation(server.url, accessToken, 200)
+    await blockUser(server.url, user16Id, server.accessToken)
+
+    await getMyUserInformation(server.url, accessToken, 401)
+    await userLogin(server, user16, 400)
+
+    await unblockUser(server.url, user16Id, server.accessToken)
+    accessToken = await userLogin(server, user16)
+    await getMyUserInformation(server.url, accessToken, 200)
   })
 
   after(async function () {