From ea7337cfdee00894792762660fa3c3412aeccccb Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Fri, 3 Jul 2020 10:28:19 +0200
Subject: [PATCH] add check-params test for user list

fixes #2918
---
 client/src/app/+admin/admin.component.ts             |  4 ++--
 .../following-list/following-list.component.html     |  2 +-
 .../+admin/users/user-list/user-list.component.html  |  2 +-
 .../app/shared/shared-icons/global-icon.component.ts |  2 ++
 .../shared-main/buttons/edit-button.component.html   |  4 ++--
 .../shared-video-miniature/abstract-video-list.html  |  2 +-
 client/src/assets/images/misc/account-arrow-left.svg |  1 +
 .../src/assets/images/misc/account-arrow-right.svg   |  1 +
 server/controllers/api/users/index.ts                |  2 +-
 server/middlewares/validators/users.ts               |  3 +--
 server/tests/api/check-params/users.ts               | 12 ++++++++++++
 11 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 client/src/assets/images/misc/account-arrow-left.svg
 create mode 100644 client/src/assets/images/misc/account-arrow-right.svg

diff --git a/client/src/app/+admin/admin.component.ts b/client/src/app/+admin/admin.component.ts
index 51c64694f..6f340884f 100644
--- a/client/src/app/+admin/admin.component.ts
+++ b/client/src/app/+admin/admin.component.ts
@@ -25,12 +25,12 @@ export class AdminComponent implements OnInit {
         {
           label: this.i18n('Instances you follow'),
           routerLink: '/admin/follows/following-list',
-          iconName: 'sign-out'
+          iconName: 'following'
         },
         {
           label: this.i18n('Instances following you'),
           routerLink: '/admin/follows/followers-list',
-          iconName: 'sign-in'
+          iconName: 'follower'
         },
         {
           label: this.i18n('Video redundancies'),
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.html b/client/src/app/+admin/follows/following-list/following-list.component.html
index a8fbf65d4..500ab13fd 100644
--- a/client/src/app/+admin/follows/following-list/following-list.component.html
+++ b/client/src/app/+admin/follows/following-list/following-list.component.html
@@ -15,7 +15,7 @@
         <span class="sr-only" i18n>Clear filters</span>
       </div>
       <a class="ml-2 follow-button" (click)="addDomainsToFollow()" (key.enter)="addDomainsToFollow()">
-        <my-global-icon iconName="add" aria-hidden="true"></my-global-icon>
+        <my-global-icon iconName="following" aria-hidden="true"></my-global-icon>
         <ng-container i18n>Follow domain</ng-container>
       </a>
     </div>
diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html
index 9580a3c8a..b022331db 100644
--- a/client/src/app/+admin/users/user-list/user-list.component.html
+++ b/client/src/app/+admin/users/user-list/user-list.component.html
@@ -38,7 +38,7 @@
       </div>
 
       <a class="ml-2 add-button" routerLink="/admin/users/create">
-        <my-global-icon iconName="add" aria-hidden="true"></my-global-icon>
+        <my-global-icon iconName="user-add" aria-hidden="true"></my-global-icon>
         <ng-container i18n>Create user</ng-container>
       </a>
     </div>
diff --git a/client/src/app/shared/shared-icons/global-icon.component.ts b/client/src/app/shared/shared-icons/global-icon.component.ts
index 7f7315f06..6527c27a6 100644
--- a/client/src/app/shared/shared-icons/global-icon.component.ts
+++ b/client/src/app/shared/shared-icons/global-icon.component.ts
@@ -12,6 +12,8 @@ const icons = {
   'history': require('!!raw-loader?!../../../assets/images/misc/history.svg').default, // material ui
   'subscriptions': require('!!raw-loader?!../../../assets/images/misc/subscriptions.svg').default, // material ui
   'playlist-add': require('!!raw-loader?!../../../assets/images/misc/playlist-add.svg').default, // material ui
+  'follower': require('!!raw-loader?!../../../assets/images/misc/account-arrow-left.svg').default, // material ui
+  'following': require('!!raw-loader?!../../../assets/images/misc/account-arrow-right.svg').default, // material ui
 
   // feather icons
   'flag': require('!!raw-loader?!../../../assets/images/feather/flag.svg').default,
diff --git a/client/src/app/shared/shared-main/buttons/edit-button.component.html b/client/src/app/shared/shared-main/buttons/edit-button.component.html
index b852bb38a..8a97c6c1e 100644
--- a/client/src/app/shared/shared-main/buttons/edit-button.component.html
+++ b/client/src/app/shared/shared-main/buttons/edit-button.component.html
@@ -1,6 +1,6 @@
-<a class="action-button action-button-edit grey-button" [routerLink]="routerLink" i18n-title title="Edit">
+<a class="action-button action-button-edit grey-button" [routerLink]="routerLink" i18n-title title="Update">
   <my-global-icon iconName="edit" aria-hidden="true"></my-global-icon>
 
   <span class="button-label" *ngIf="label">{{ label }}</span>
-  <span i18n class="button-label" *ngIf="!label">Edit</span>
+  <span i18n class="button-label" *ngIf="!label">Update</span>
 </a>
diff --git a/client/src/app/shared/shared-video-miniature/abstract-video-list.html b/client/src/app/shared/shared-video-miniature/abstract-video-list.html
index 6df589c38..08962dff8 100644
--- a/client/src/app/shared/shared-video-miniature/abstract-video-list.html
+++ b/client/src/app/shared/shared-video-miniature/abstract-video-list.html
@@ -14,7 +14,7 @@
     </div>
 
     <div class="moderation-block" *ngIf="displayModerationBlock">
-      <div class="c-hand" ngbDropdown container="body" placement="bottom-right auto">
+      <div class="c-hand" ngbDropdown placement="bottom-right auto">
         <my-global-icon iconName="cog" ngbDropdownToggle></my-global-icon>
 
         <div role="menu" class="dropdown-menu" ngbDropdownMenu>
diff --git a/client/src/assets/images/misc/account-arrow-left.svg b/client/src/assets/images/misc/account-arrow-left.svg
new file mode 100644
index 000000000..154bce0e9
--- /dev/null
+++ b/client/src/assets/images/misc/account-arrow-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" focusable="false" width="1em" height="1em" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><path d="M18 21l-3-3l3-3v2h4v2h-4v2M10 4a4 4 0 0 1 4 4a4 4 0 0 1-4 4a4 4 0 0 1-4-4a4 4 0 0 1 4-4m0 10c1.15 0 2.25.12 3.24.34A5.964 5.964 0 0 0 12 18c0 .7.12 1.37.34 2H2v-2c0-2.21 3.58-4 8-4z" fill="currentColor" class="material"/></svg>
diff --git a/client/src/assets/images/misc/account-arrow-right.svg b/client/src/assets/images/misc/account-arrow-right.svg
new file mode 100644
index 000000000..50de9686b
--- /dev/null
+++ b/client/src/assets/images/misc/account-arrow-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" focusable="false" width="1em" height="1em" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><path d="M19 21v-2h-4v-2h4v-2l3 3l-3 3M10 4a4 4 0 0 1 4 4a4 4 0 0 1-4 4a4 4 0 0 1-4-4a4 4 0 0 1 4-4m0 10c1.15 0 2.25.12 3.24.34A5.964 5.964 0 0 0 12 18c0 .7.12 1.37.34 2H2v-2c0-2.21 3.58-4 8-4z" fill="currentColor" class="material"/></svg>
diff --git a/server/controllers/api/users/index.ts b/server/controllers/api/users/index.ts
index 839431afb..fcd828ae3 100644
--- a/server/controllers/api/users/index.ts
+++ b/server/controllers/api/users/index.ts
@@ -86,7 +86,7 @@ usersRouter.get('/',
   usersSortValidator,
   setDefaultSort,
   setDefaultPagination,
-  asyncMiddleware(usersListValidator),
+  usersListValidator,
   asyncMiddleware(listUsers)
 )
 
diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts
index 6860a3bed..423da9bc0 100644
--- a/server/middlewares/validators/users.ts
+++ b/server/middlewares/validators/users.ts
@@ -41,10 +41,9 @@ import { Hooks } from '@server/lib/plugins/hooks'
 const usersListValidator = [
   query('blocked')
     .optional()
-    .customSanitizer(toBooleanOrNull)
     .isBoolean().withMessage('Should be a valid boolean banned state'),
 
-  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
     logger.debug('Checking usersList parameters', { parameters: req.query })
 
     if (areValidationErrors(req, res)) return
diff --git a/server/tests/api/check-params/users.ts b/server/tests/api/check-params/users.ts
index 74f0a2d3f..2fea2cbd5 100644
--- a/server/tests/api/check-params/users.ts
+++ b/server/tests/api/check-params/users.ts
@@ -155,6 +155,18 @@ describe('Test users API validators', function () {
       await checkBadSortPagination(server.url, path, server.accessToken)
     })
 
+    it('Should fail with a bad blocked/banned user filter', async function () {
+      await makeGetRequest({
+        url: server.url,
+        path,
+        query: {
+          blocked: 42
+        },
+        token: server.accessToken,
+        statusCodeExpected: 400
+      })
+    })
+
     it('Should fail with a non authenticated user', async function () {
       await makeGetRequest({
         url: server.url,
-- 
2.41.0