X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fcheck-params%2Fblocklist.ts;h=f745b9088137c8a2ca76cf53826ae65eea5d7605;hb=91a4893063402d7beabb3104f9b989b8f88b6038;hp=b2a1cc4e2227c0984457812c2669801880666d7c;hpb=254d3579f5338f5fd775c17d15cdfc37078bcfb4;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/check-params/blocklist.ts b/server/tests/api/check-params/blocklist.ts
index b2a1cc4e2..f745b9088 100644
--- a/server/tests/api/check-params/blocklist.ts
+++ b/server/tests/api/check-params/blocklist.ts
@@ -1,23 +1,17 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import 'mocha'
-
+import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '@server/tests/shared'
+import { HttpStatusCode } from '@shared/models'
 import {
   cleanupTests,
-  doubleFollow,
   createMultipleServers,
+  doubleFollow,
   makeDeleteRequest,
   makeGetRequest,
   makePostBodyRequest,
   PeerTubeServer,
   setAccessTokensToServers
-} from '../../../../shared/extra-utils'
-import {
-  checkBadCountPagination,
-  checkBadSortPagination,
-  checkBadStartPagination
-} from '../../../../shared/extra-utils/requests/check-api-params'
-import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
+} from '@shared/server-commands'
 
 describe('Test blocklist API validators', function () {
   let servers: PeerTubeServer[]
@@ -52,7 +46,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -75,7 +69,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -85,7 +79,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user2' },
-            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
+            expectedStatus: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -95,7 +89,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'root' },
-            statusCodeExpected: HttpStatusCode.CONFLICT_409
+            expectedStatus: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -105,7 +99,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -115,7 +109,7 @@ describe('Test blocklist API validators', function () {
           await makeDeleteRequest({
             url: server.url,
             path: path + '/user1',
-            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -124,7 +118,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user2',
             token: server.accessToken,
-            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
+            expectedStatus: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -133,7 +127,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user1',
             token: server.accessToken,
-            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -147,7 +141,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -170,7 +164,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path,
             fields: { host: 'localhost:9002' },
-            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -180,7 +174,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { host: 'localhost:9003' },
-            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
 
@@ -190,7 +184,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { host: 'localhost:' + server.port },
-            statusCodeExpected: HttpStatusCode.CONFLICT_409
+            expectedStatus: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -200,7 +194,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { host: 'localhost:' + servers[1].port },
-            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -210,7 +204,7 @@ describe('Test blocklist API validators', function () {
           await makeDeleteRequest({
             url: server.url,
             path: path + '/localhost:' + servers[1].port,
-            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -219,7 +213,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/localhost:9004',
             token: server.accessToken,
-            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
+            expectedStatus: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -228,7 +222,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/localhost:' + servers[1].port,
             token: server.accessToken,
-            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -245,7 +239,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -254,7 +248,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: userAccessToken,
             path,
-            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
+            expectedStatus: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -277,7 +271,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -287,7 +281,7 @@ describe('Test blocklist API validators', function () {
             token: userAccessToken,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
+            expectedStatus: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -297,7 +291,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user2' },
-            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
+            expectedStatus: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -307,7 +301,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'root' },
-            statusCodeExpected: HttpStatusCode.CONFLICT_409
+            expectedStatus: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -317,7 +311,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { accountName: 'user1' },
-            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -327,7 +321,7 @@ describe('Test blocklist API validators', function () {
           await makeDeleteRequest({
             url: server.url,
             path: path + '/user1',
-            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -336,7 +330,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user1',
             token: userAccessToken,
-            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
+            expectedStatus: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -345,7 +339,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user2',
             token: server.accessToken,
-            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
+            expectedStatus: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -354,7 +348,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/user1',
             token: server.accessToken,
-            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -368,7 +362,7 @@ describe('Test blocklist API validators', function () {
           await makeGetRequest({
             url: server.url,
             path,
-            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -377,7 +371,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             token: userAccessToken,
             path,
-            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
+            expectedStatus: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -400,7 +394,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path,
             fields: { host: 'localhost:' + servers[1].port },
-            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -410,7 +404,7 @@ describe('Test blocklist API validators', function () {
             token: userAccessToken,
             path,
             fields: { host: 'localhost:' + servers[1].port },
-            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
+            expectedStatus: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -420,7 +414,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { host: 'localhost:9003' },
-            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
 
@@ -430,7 +424,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { host: 'localhost:' + server.port },
-            statusCodeExpected: HttpStatusCode.CONFLICT_409
+            expectedStatus: HttpStatusCode.CONFLICT_409
           })
         })
 
@@ -440,7 +434,7 @@ describe('Test blocklist API validators', function () {
             token: server.accessToken,
             path,
             fields: { host: 'localhost:' + servers[1].port },
-            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
@@ -450,7 +444,7 @@ describe('Test blocklist API validators', function () {
           await makeDeleteRequest({
             url: server.url,
             path: path + '/localhost:' + servers[1].port,
-            statusCodeExpected: HttpStatusCode.UNAUTHORIZED_401
+            expectedStatus: HttpStatusCode.UNAUTHORIZED_401
           })
         })
 
@@ -459,7 +453,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/localhost:' + servers[1].port,
             token: userAccessToken,
-            statusCodeExpected: HttpStatusCode.FORBIDDEN_403
+            expectedStatus: HttpStatusCode.FORBIDDEN_403
           })
         })
 
@@ -468,7 +462,7 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/localhost:9004',
             token: server.accessToken,
-            statusCodeExpected: HttpStatusCode.NOT_FOUND_404
+            expectedStatus: HttpStatusCode.NOT_FOUND_404
           })
         })
 
@@ -477,13 +471,85 @@ describe('Test blocklist API validators', function () {
             url: server.url,
             path: path + '/localhost:' + servers[1].port,
             token: server.accessToken,
-            statusCodeExpected: HttpStatusCode.NO_CONTENT_204
+            expectedStatus: HttpStatusCode.NO_CONTENT_204
           })
         })
       })
     })
   })
 
+  describe('When getting blocklist status', function () {
+    const path = '/api/v1/blocklist/status'
+
+    it('Should fail with a bad token', async function () {
+      await makeGetRequest({
+        url: server.url,
+        path,
+        token: 'false',
+        expectedStatus: HttpStatusCode.UNAUTHORIZED_401
+      })
+    })
+
+    it('Should fail with a bad accounts field', async function () {
+      await makeGetRequest({
+        url: server.url,
+        path,
+        query: {
+          accounts: 1
+        },
+        expectedStatus: HttpStatusCode.BAD_REQUEST_400
+      })
+
+      await makeGetRequest({
+        url: server.url,
+        path,
+        query: {
+          accounts: [ 1 ]
+        },
+        expectedStatus: HttpStatusCode.BAD_REQUEST_400
+      })
+    })
+
+    it('Should fail with a bad hosts field', async function () {
+      await makeGetRequest({
+        url: server.url,
+        path,
+        query: {
+          hosts: 1
+        },
+        expectedStatus: HttpStatusCode.BAD_REQUEST_400
+      })
+
+      await makeGetRequest({
+        url: server.url,
+        path,
+        query: {
+          hosts: [ 1 ]
+        },
+        expectedStatus: HttpStatusCode.BAD_REQUEST_400
+      })
+    })
+
+    it('Should succeed with the correct parameters', async function () {
+      await makeGetRequest({
+        url: server.url,
+        path,
+        query: {},
+        expectedStatus: HttpStatusCode.OK_200
+      })
+
+      await makeGetRequest({
+        url: server.url,
+        path,
+        query: {
+          hosts: [ 'example.com' ],
+          accounts: [ 'john@example.com' ]
+        },
+        expectedStatus: HttpStatusCode.OK_200
+      })
+    })
+  })
+
   after(async function () {
     await cleanupTests(servers)
   })