From e724fa93c71d76d709e819a05e5e2904a3c4205b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 5 Oct 2018 15:24:29 +0200 Subject: Move user moderation tool in a separate component --- client/src/app/shared/users/user.service.ts | 91 +++++++++++++++++++++++++++-- 1 file changed, 86 insertions(+), 5 deletions(-) (limited to 'client/src/app/shared/users') diff --git a/client/src/app/shared/users/user.service.ts b/client/src/app/shared/users/user.service.ts index bd5cd45d4..5ab290a59 100644 --- a/client/src/app/shared/users/user.service.ts +++ b/client/src/app/shared/users/user.service.ts @@ -2,20 +2,26 @@ import { Observable } from 'rxjs' import { catchError, map } from 'rxjs/operators' import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' -import { UserCreate, UserUpdateMe, UserVideoQuota } from '../../../../../shared' +import { ResultList, User, UserCreate, UserRole, UserUpdate, UserUpdateMe, UserVideoQuota } from '../../../../../shared' import { environment } from '../../../environments/environment' -import { RestExtractor } from '../rest' +import { RestExtractor, RestPagination, RestService } from '../rest' import { Avatar } from '../../../../../shared/models/avatars/avatar.model' +import { SortMeta } from 'primeng/api' +import { BytesPipe } from 'ngx-pipes' +import { I18n } from '@ngx-translate/i18n-polyfill' @Injectable() export class UserService { static BASE_USERS_URL = environment.apiUrl + '/api/v1/users/' + private bytesPipe = new BytesPipe() + constructor ( private authHttp: HttpClient, - private restExtractor: RestExtractor - ) { - } + private restExtractor: RestExtractor, + private restService: RestService, + private i18n: I18n + ) { } changePassword (currentPassword: string, newPassword: string) { const url = UserService.BASE_USERS_URL + 'me' @@ -128,4 +134,79 @@ export class UserService { .get(url, { params }) .pipe(catchError(res => this.restExtractor.handleError(res))) } + + /* ###### Admin methods ###### */ + + addUser (userCreate: UserCreate) { + return this.authHttp.post(UserService.BASE_USERS_URL, userCreate) + .pipe( + map(this.restExtractor.extractDataBool), + catchError(err => this.restExtractor.handleError(err)) + ) + } + + updateUser (userId: number, userUpdate: UserUpdate) { + return this.authHttp.put(UserService.BASE_USERS_URL + userId, userUpdate) + .pipe( + map(this.restExtractor.extractDataBool), + catchError(err => this.restExtractor.handleError(err)) + ) + } + + getUser (userId: number) { + return this.authHttp.get(UserService.BASE_USERS_URL + userId) + .pipe(catchError(err => this.restExtractor.handleError(err))) + } + + getUsers (pagination: RestPagination, sort: SortMeta): Observable> { + let params = new HttpParams() + params = this.restService.addRestGetParams(params, pagination, sort) + + return this.authHttp.get>(UserService.BASE_USERS_URL, { params }) + .pipe( + map(res => this.restExtractor.convertResultListDateToHuman(res)), + map(res => this.restExtractor.applyToResultListData(res, this.formatUser.bind(this))), + catchError(err => this.restExtractor.handleError(err)) + ) + } + + removeUser (user: User) { + return this.authHttp.delete(UserService.BASE_USERS_URL + user.id) + .pipe(catchError(err => this.restExtractor.handleError(err))) + } + + banUser (user: User, reason?: string) { + const body = reason ? { reason } : {} + + return this.authHttp.post(UserService.BASE_USERS_URL + user.id + '/block', body) + .pipe(catchError(err => this.restExtractor.handleError(err))) + } + + unbanUser (user: User) { + return this.authHttp.post(UserService.BASE_USERS_URL + user.id + '/unblock', {}) + .pipe(catchError(err => this.restExtractor.handleError(err))) + } + + private formatUser (user: User) { + let videoQuota + if (user.videoQuota === -1) { + videoQuota = this.i18n('Unlimited') + } else { + videoQuota = this.bytesPipe.transform(user.videoQuota, 0) + } + + const videoQuotaUsed = this.bytesPipe.transform(user.videoQuotaUsed, 0) + + const roleLabels: { [ id in UserRole ]: string } = { + [UserRole.USER]: this.i18n('User'), + [UserRole.ADMINISTRATOR]: this.i18n('Administrator'), + [UserRole.MODERATOR]: this.i18n('Moderator') + } + + return Object.assign(user, { + roleLabel: roleLabels[user.role], + videoQuota, + videoQuotaUsed + }) + } } -- cgit v1.2.3