-import { from, Observable } from 'rxjs'
-import { catchError, concatMap, map, toArray } from 'rxjs/operators'
+import { from, Observable, of } from 'rxjs'
+import { catchError, concatMap, map, share, shareReplay, tap, toArray } from 'rxjs/operators'
import { HttpClient, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
import { ResultList, User, UserCreate, UserRole, UserUpdate, UserUpdateMe, UserVideoQuota } from '../../../../../shared'
private bytesPipe = new BytesPipe()
+ private userCache: { [ id: number ]: Observable<User> } = {}
+
constructor (
private authHttp: HttpClient,
private restExtractor: RestExtractor,
)
}
+ changeEmail (password: string, newEmail: string) {
+ const url = UserService.BASE_USERS_URL + 'me'
+ const body: UserUpdateMe = {
+ currentPassword: password,
+ email: newEmail
+ }
+
+ return this.authHttp.put(url, body)
+ .pipe(
+ map(this.restExtractor.extractDataBool),
+ catchError(err => this.restExtractor.handleError(err))
+ )
+ }
+
updateMyProfile (profile: UserUpdateMe) {
const url = UserService.BASE_USERS_URL + 'me'
}
getMyVideoQuotaUsed () {
- const url = UserService.BASE_USERS_URL + '/me/video-quota-used'
+ const url = UserService.BASE_USERS_URL + 'me/video-quota-used'
return this.authHttp.get<UserVideoQuota>(url)
.pipe(catchError(err => this.restExtractor.handleError(err)))
)
}
- verifyEmail (userId: number, verificationString: string) {
+ verifyEmail (userId: number, verificationString: string, isPendingEmail: boolean) {
const url = `${UserService.BASE_USERS_URL}/${userId}/verify-email`
const body = {
- verificationString
+ verificationString,
+ isPendingEmail
}
return this.authHttp.post(url, body)
.pipe(catchError(res => this.restExtractor.handleError(res)))
}
+ getNewUsername (oldDisplayName: string, newDisplayName: string, currentUsername: string) {
+ // Don't update display name, the user seems to have changed it
+ if (this.displayNameToUsername(oldDisplayName) !== currentUsername) return currentUsername
+
+ return this.displayNameToUsername(newDisplayName)
+ }
+
+ displayNameToUsername (displayName: string) {
+ if (!displayName) return ''
+
+ return displayName
+ .toLowerCase()
+ .replace(/\s/g, '_')
+ .replace(/[^a-z0-9_.]/g, '')
+ }
+
/* ###### Admin methods ###### */
addUser (userCreate: UserCreate) {
)
}
+ getUserWithCache (userId: number) {
+ if (!this.userCache[userId]) {
+ this.userCache[ userId ] = this.getUser(userId).pipe(shareReplay())
+ }
+
+ return this.userCache[userId]
+ }
+
getUser (userId: number) {
return this.authHttp.get<User>(UserService.BASE_USERS_URL + userId)
.pipe(catchError(err => this.restExtractor.handleError(err)))