-import { SortMeta } from 'primeng/api'
-import { from, Observable, of } from 'rxjs'
-import { catchError, concatMap, filter, first, map, shareReplay, throttleTime, toArray } from 'rxjs/operators'
+import { Observable, of } from 'rxjs'
+import { catchError, first, map, shareReplay } from 'rxjs/operators'
import { HttpClient, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
import { AuthService } from '@app/core/auth'
-import { getBytes } from '@root-helpers/bytes'
-import { UserLocalStorageKeys } from '@root-helpers/users'
-import {
- Avatar,
- NSFWPolicyType,
- ResultList,
- User as UserServerModel,
- UserCreate,
- UserRegister,
- UserRole,
- UserUpdate,
- UserUpdateMe,
- UserVideoQuota
-} from '@shared/models'
+import { ActorImage, User as UserServerModel, UserUpdateMe, UserVideoQuota } from '@shared/models'
import { environment } from '../../../environments/environment'
-import { RestExtractor, RestPagination, RestService } from '../rest'
-import { LocalStorageService, SessionStorageService } from '../wrappers/storage.service'
+import { RestExtractor } from '../rest'
+import { UserLocalStorageService } from './user-local-storage.service'
import { User } from './user.model'
@Injectable()
static BASE_USERS_URL = environment.apiUrl + '/api/v1/users/'
private userCache: { [ id: number ]: Observable<UserServerModel> } = {}
+ private signupInThisSession = false
constructor (
private authHttp: HttpClient,
private authService: AuthService,
private restExtractor: RestExtractor,
- private restService: RestService,
- private localStorageService: LocalStorageService,
- private sessionStorageService: SessionStorageService
- ) { }
+ private userLocalStorageService: UserLocalStorageService
+ ) { }
+
+ // ---------------------------------------------------------------------------
+
+ getUserWithCache (userId: number) {
+ if (!this.userCache[userId]) {
+ this.userCache[userId] = this.getUser(userId).pipe(shareReplay())
+ }
+
+ return this.userCache[userId]
+ }
+
+ getUser (userId: number, withStats = false) {
+ const params = new HttpParams().append('withStats', withStats + '')
+
+ return this.authHttp.get<UserServerModel>(UserService.BASE_USERS_URL + userId, { params })
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
+ }
+
+ // ---------------------------------------------------------------------------
+
+ setSignupInThisSession (value: boolean) {
+ this.signupInThisSession = value
+ }
+
+ hasSignupInThisSession () {
+ return this.signupInThisSession
+ }
+
+ // ---------------------------------------------------------------------------
+
+ updateMyAnonymousProfile (profile: UserUpdateMe) {
+ this.userLocalStorageService.setUserInfo(profile)
+ }
+
+ listenAnonymousUpdate () {
+ return this.userLocalStorageService.listenUserInfoChange()
+ .pipe(map(() => this.getAnonymousUser()))
+ }
+
+ getAnonymousUser () {
+ return new User(this.userLocalStorageService.getUserInfo())
+ }
+
+ getAnonymousOrLoggedUser () {
+ if (!this.authService.isLoggedIn()) {
+ return of(this.getAnonymousUser())
+ }
+
+ return this.authService.userInformationLoaded
+ .pipe(
+ first(),
+ map(() => this.authService.getUser())
+ )
+ }
+
+ // ---------------------------------------------------------------------------
changePassword (currentPassword: string, newPassword: string) {
const url = UserService.BASE_USERS_URL + 'me'
}
return this.authHttp.put(url, body)
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(err => this.restExtractor.handleError(err))
- )
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
}
changeEmail (password: string, newEmail: string) {
}
return this.authHttp.put(url, body)
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(err => this.restExtractor.handleError(err))
- )
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
}
updateMyProfile (profile: UserUpdateMe) {
const url = UserService.BASE_USERS_URL + 'me'
return this.authHttp.put(url, profile)
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(err => this.restExtractor.handleError(err))
- )
- }
-
- updateMyAnonymousProfile (profile: UserUpdateMe) {
- try {
- this.localStorageService.setItem(UserLocalStorageKeys.NSFW_POLICY, profile.nsfwPolicy)
- this.localStorageService.setItem(UserLocalStorageKeys.WEBTORRENT_ENABLED, profile.webTorrentEnabled)
-
- this.localStorageService.setItem(UserLocalStorageKeys.AUTO_PLAY_VIDEO, profile.autoPlayNextVideo)
- this.localStorageService.setItem(UserLocalStorageKeys.AUTO_PLAY_VIDEO_PLAYLIST, profile.autoPlayNextVideoPlaylist)
-
- this.localStorageService.setItem(UserLocalStorageKeys.THEME, profile.theme)
- this.localStorageService.setItem(UserLocalStorageKeys.VIDEO_LANGUAGES, profile.videoLanguages)
- } catch (err) {
- console.error(`Cannot set item in localStorage. Likely due to a value impossible to stringify.`, err)
- }
- }
-
- listenAnonymousUpdate () {
- return this.localStorageService.watch([
- UserLocalStorageKeys.NSFW_POLICY,
- UserLocalStorageKeys.WEBTORRENT_ENABLED,
- UserLocalStorageKeys.AUTO_PLAY_VIDEO,
- UserLocalStorageKeys.AUTO_PLAY_VIDEO_PLAYLIST,
- UserLocalStorageKeys.THEME,
- UserLocalStorageKeys.VIDEO_LANGUAGES
- ]).pipe(
- throttleTime(200),
- filter(() => this.authService.isLoggedIn() !== true),
- map(() => this.getAnonymousUser())
- )
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
}
deleteMe () {
const url = UserService.BASE_USERS_URL + 'me'
return this.authHttp.delete(url)
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(err => this.restExtractor.handleError(err))
- )
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
}
changeAvatar (avatarForm: FormData) {
const url = UserService.BASE_USERS_URL + 'me/avatar/pick'
- return this.authHttp.post<{ avatar: Avatar }>(url, avatarForm)
+ return this.authHttp.post<{ avatars: ActorImage[] }>(url, avatarForm)
.pipe(catchError(err => this.restExtractor.handleError(err)))
}
- signup (userCreate: UserRegister) {
- return this.authHttp.post(UserService.BASE_USERS_URL + 'register', userCreate)
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(err => this.restExtractor.handleError(err))
- )
+ deleteAvatar () {
+ const url = UserService.BASE_USERS_URL + 'me/avatar'
+
+ return this.authHttp.delete(url)
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
}
getMyVideoQuotaUsed () {
const url = UserService.BASE_USERS_URL + '/ask-reset-password'
return this.authHttp.post(url, { email })
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(err => this.restExtractor.handleError(err))
- )
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
}
resetPassword (userId: number, verificationString: string, password: string) {
}
return this.authHttp.post(url, body)
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(res => this.restExtractor.handleError(res))
- )
- }
-
- verifyEmail (userId: number, verificationString: string, isPendingEmail: boolean) {
- const url = `${UserService.BASE_USERS_URL}/${userId}/verify-email`
- const body = {
- verificationString,
- isPendingEmail
- }
-
- return this.authHttp.post(url, body)
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(res => this.restExtractor.handleError(res))
- )
- }
-
- askSendVerifyEmail (email: string) {
- const url = UserService.BASE_USERS_URL + '/ask-send-verify-email'
-
- return this.authHttp.post(url, { email })
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(err => this.restExtractor.handleError(err))
- )
+ .pipe(catchError(res => this.restExtractor.handleError(res)))
}
autocomplete (search: string): Observable<string[]> {
.get<string[]>(url, { params })
.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) {
- 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))
- )
- }
-
- updateUsers (users: UserServerModel[], userUpdate: UserUpdate) {
- return from(users)
- .pipe(
- concatMap(u => this.authHttp.put(UserService.BASE_USERS_URL + u.id, userUpdate)),
- toArray(),
- catchError(err => this.restExtractor.handleError(err))
- )
- }
-
- getUserWithCache (userId: number) {
- if (!this.userCache[userId]) {
- this.userCache[ userId ] = this.getUser(userId).pipe(shareReplay())
- }
-
- return this.userCache[userId]
- }
-
- getUser (userId: number, withStats = false) {
- const params = new HttpParams().append('withStats', withStats + '')
- return this.authHttp.get<UserServerModel>(UserService.BASE_USERS_URL + userId, { params })
- .pipe(catchError(err => this.restExtractor.handleError(err)))
- }
-
- getAnonymousUser () {
- let videoLanguages: string[]
-
- try {
- videoLanguages = JSON.parse(this.localStorageService.getItem(UserLocalStorageKeys.VIDEO_LANGUAGES))
- } catch (err) {
- videoLanguages = null
- console.error('Cannot parse desired video languages from localStorage.', err)
- }
-
- return new User({
- // local storage keys
- nsfwPolicy: this.localStorageService.getItem(UserLocalStorageKeys.NSFW_POLICY) as NSFWPolicyType,
- webTorrentEnabled: this.localStorageService.getItem(UserLocalStorageKeys.WEBTORRENT_ENABLED) !== 'false',
- theme: this.localStorageService.getItem(UserLocalStorageKeys.THEME) || 'instance-default',
- videoLanguages,
-
- autoPlayNextVideoPlaylist: this.localStorageService.getItem(UserLocalStorageKeys.AUTO_PLAY_VIDEO_PLAYLIST) !== 'false',
- autoPlayVideo: this.localStorageService.getItem(UserLocalStorageKeys.AUTO_PLAY_VIDEO) === 'true',
-
- // session storage keys
- autoPlayNextVideo: this.sessionStorageService.getItem(UserLocalStorageKeys.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO) === 'true'
- })
- }
-
- getUsers (parameters: {
- pagination: RestPagination
- sort: SortMeta
- search?: string
- }): Observable<ResultList<UserServerModel>> {
- const { pagination, sort, search } = parameters
-
- let params = new HttpParams()
- params = this.restService.addRestGetParams(params, pagination, sort)
-
- if (search) {
- const filters = this.restService.parseQueryStringFilter(search, {
- blocked: {
- prefix: 'banned:',
- isBoolean: true,
- handler: v => {
- if (v === 'true') return v
- if (v === 'false') return v
-
- return undefined
- }
- }
- })
-
- params = this.restService.addObjectParams(params, filters)
- }
-
- return this.authHttp.get<ResultList<UserServerModel>>(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 (usersArg: UserServerModel | UserServerModel[]) {
- const users = Array.isArray(usersArg) ? usersArg : [ usersArg ]
-
- return from(users)
- .pipe(
- concatMap(u => this.authHttp.delete(UserService.BASE_USERS_URL + u.id)),
- toArray(),
- catchError(err => this.restExtractor.handleError(err))
- )
- }
-
- banUsers (usersArg: UserServerModel | UserServerModel[], reason?: string) {
- const body = reason ? { reason } : {}
- const users = Array.isArray(usersArg) ? usersArg : [ usersArg ]
-
- return from(users)
- .pipe(
- concatMap(u => this.authHttp.post(UserService.BASE_USERS_URL + u.id + '/block', body)),
- toArray(),
- catchError(err => this.restExtractor.handleError(err))
- )
- }
-
- unbanUsers (usersArg: UserServerModel | UserServerModel[]) {
- const users = Array.isArray(usersArg) ? usersArg : [ usersArg ]
-
- return from(users)
- .pipe(
- concatMap(u => this.authHttp.post(UserService.BASE_USERS_URL + u.id + '/unblock', {})),
- toArray(),
- catchError(err => this.restExtractor.handleError(err))
- )
- }
-
- getAnonymousOrLoggedUser () {
- if (!this.authService.isLoggedIn()) {
- return of(this.getAnonymousUser())
- }
-
- return this.authService.userInformationLoaded
- .pipe(
- first(),
- map(() => this.authService.getUser())
- )
- }
-
- private formatUser (user: UserServerModel) {
- let videoQuota
- if (user.videoQuota === -1) {
- videoQuota = '∞'
- } else {
- videoQuota = getBytes(user.videoQuota, 0)
- }
-
- const videoQuotaUsed = getBytes(user.videoQuotaUsed, 0)
-
- let videoQuotaDaily: string
- let videoQuotaUsedDaily: string
- if (user.videoQuotaDaily === -1) {
- videoQuotaDaily = '∞'
- videoQuotaUsedDaily = getBytes(0, 0) + ''
- } else {
- videoQuotaDaily = getBytes(user.videoQuotaDaily, 0) + ''
- videoQuotaUsedDaily = getBytes(user.videoQuotaUsedDaily || 0, 0) + ''
- }
-
- const roleLabels: { [ id in UserRole ]: string } = {
- [UserRole.USER]: $localize`User`,
- [UserRole.ADMINISTRATOR]: $localize`Administrator`,
- [UserRole.MODERATOR]: $localize`Moderator`
- }
-
- return Object.assign(user, {
- roleLabel: roleLabels[user.role],
- videoQuota,
- videoQuotaUsed,
- rawVideoQuota: user.videoQuota,
- rawVideoQuotaUsed: user.videoQuotaUsed,
- videoQuotaDaily,
- videoQuotaUsedDaily,
- rawVideoQuotaDaily: user.videoQuotaDaily,
- rawVideoQuotaUsedDaily: user.videoQuotaUsedDaily
- })
- }
}
projects / github / Chocobozzz / PeerTube.git / blobdiff