-import { has } from 'lodash-es'
-import { BytesPipe } from 'ngx-pipes'
import { SortMeta } from 'primeng/api'
import { from, Observable, of } from 'rxjs'
-import { catchError, concatMap, filter, first, map, shareReplay, throttleTime, toArray } from 'rxjs/operators'
+import { catchError, concatMap, first, map, shareReplay, tap, toArray } from 'rxjs/operators'
import { HttpClient, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
import { AuthService } from '@app/core/auth'
-import { I18n } from '@ngx-translate/i18n-polyfill'
+import { getBytes } from '@root-helpers/bytes'
import {
- Avatar,
- NSFWPolicyType,
+ ActorImage,
ResultList,
User as UserServerModel,
UserCreate,
} from '@shared/models'
import { environment } from '../../../environments/environment'
import { RestExtractor, RestPagination, RestService } from '../rest'
-import { LocalStorageService, SessionStorageService } from '../wrappers/storage.service'
+import { UserLocalStorageService } from './'
import { User } from './user.model'
@Injectable()
export class UserService {
static BASE_USERS_URL = environment.apiUrl + '/api/v1/users/'
- private bytesPipe = new BytesPipe()
-
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 i18n: I18n
+ private userLocalStorageService: UserLocalStorageService
) { }
+ hasSignupInThisSession () {
+ return this.signupInThisSession
+ }
+
changePassword (currentPassword: string, newPassword: string) {
const url = UserService.BASE_USERS_URL + 'me'
const body: UserUpdateMe = {
}
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) {
+ this.userLocalStorageService.setUserInfo(profile)
}
- updateMyAnonymousProfile (profile: UserUpdateMe) {
- const supportedKeys = {
- // local storage keys
- nsfwPolicy: (val: NSFWPolicyType) => this.localStorageService.setItem(User.KEYS.NSFW_POLICY, val),
- webTorrentEnabled: (val: boolean) => this.localStorageService.setItem(User.KEYS.WEBTORRENT_ENABLED, String(val)),
- autoPlayVideo: (val: boolean) => this.localStorageService.setItem(User.KEYS.AUTO_PLAY_VIDEO, String(val)),
- autoPlayNextVideoPlaylist: (val: boolean) => this.localStorageService.setItem(User.KEYS.AUTO_PLAY_VIDEO_PLAYLIST, String(val)),
- theme: (val: string) => this.localStorageService.setItem(User.KEYS.THEME, val),
- videoLanguages: (val: string[]) => this.localStorageService.setItem(User.KEYS.VIDEO_LANGUAGES, JSON.stringify(val)),
-
- // session storage keys
- autoPlayNextVideo: (val: boolean) =>
- this.sessionStorageService.setItem(User.KEYS.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO, String(val))
- }
+ listenAnonymousUpdate () {
+ return this.userLocalStorageService.listenUserInfoChange()
+ .pipe(map(() => this.getAnonymousUser()))
+ }
- for (const key of Object.keys(profile)) {
- try {
- if (has(supportedKeys, key)) supportedKeys[key](profile[key])
- } catch (err) {
- console.error(`Cannot set item ${key} in localStorage. Likely due to a value impossible to stringify.`, err)
- }
- }
+ getAnonymousUser () {
+ return new User(this.userLocalStorageService.getUserInfo())
}
- listenAnonymousUpdate () {
- return this.localStorageService.watch([
- User.KEYS.NSFW_POLICY,
- User.KEYS.WEBTORRENT_ENABLED,
- User.KEYS.AUTO_PLAY_VIDEO,
- User.KEYS.AUTO_PLAY_VIDEO_PLAYLIST,
- User.KEYS.THEME,
- User.KEYS.VIDEO_LANGUAGES
- ]).pipe(
- throttleTime(200),
- filter(() => this.authService.isLoggedIn() !== true),
- map(() => this.getAnonymousUser())
- )
+ // ---------------------------------------------------------------------------
+
+ updateMyProfile (profile: UserUpdateMe) {
+ const url = UserService.BASE_USERS_URL + 'me'
+
+ return this.authHttp.put(url, profile)
+ .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<{ avatar: ActorImage }>(url, avatarForm)
+ .pipe(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)))
}
signup (userCreate: UserRegister) {
return this.authHttp.post(UserService.BASE_USERS_URL + 'register', userCreate)
.pipe(
- map(this.restExtractor.extractDataBool),
+ tap(() => this.signupInThisSession = true),
catchError(err => this.restExtractor.handleError(err))
)
}
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))
- )
+ .pipe(catchError(res => this.restExtractor.handleError(res)))
}
verifyEmail (userId: number, verificationString: string, isPendingEmail: boolean) {
}
return this.authHttp.post(url, body)
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(res => this.restExtractor.handleError(res))
- )
+ .pipe(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(err => this.restExtractor.handleError(err)))
}
autocomplete (search: string): Observable<string[]> {
addUser (userCreate: UserCreate) {
return this.authHttp.post(UserService.BASE_USERS_URL, userCreate)
- .pipe(
- map(this.restExtractor.extractDataBool),
- catchError(err => this.restExtractor.handleError(err))
- )
+ .pipe(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))
- )
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
}
updateUsers (users: UserServerModel[], userUpdate: UserUpdate) {
getUserWithCache (userId: number) {
if (!this.userCache[userId]) {
- this.userCache[ userId ] = this.getUser(userId).pipe(shareReplay())
+ this.userCache[userId] = this.getUser(userId).pipe(shareReplay())
}
return this.userCache[userId]
.pipe(catchError(err => this.restExtractor.handleError(err)))
}
- getAnonymousUser () {
- let videoLanguages: string[]
-
- try {
- videoLanguages = JSON.parse(this.localStorageService.getItem(User.KEYS.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(User.KEYS.NSFW_POLICY) as NSFWPolicyType,
- webTorrentEnabled: this.localStorageService.getItem(User.KEYS.WEBTORRENT_ENABLED) !== 'false',
- theme: this.localStorageService.getItem(User.KEYS.THEME) || 'instance-default',
- videoLanguages,
-
- autoPlayNextVideoPlaylist: this.localStorageService.getItem(User.KEYS.AUTO_PLAY_VIDEO_PLAYLIST) !== 'false',
- autoPlayVideo: this.localStorageService.getItem(User.KEYS.AUTO_PLAY_VIDEO) === 'true',
-
- // session storage keys
- autoPlayNextVideo: this.sessionStorageService.getItem(User.KEYS.SESSION_STORAGE_AUTO_PLAY_NEXT_VIDEO) === 'true'
- })
- }
-
getUsers (parameters: {
pagination: RestPagination
sort: SortMeta
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
- }
+ isBoolean: true
}
})
if (user.videoQuota === -1) {
videoQuota = '∞'
} else {
- videoQuota = this.bytesPipe.transform(user.videoQuota, 0)
+ videoQuota = getBytes(user.videoQuota, 0)
}
- const videoQuotaUsed = this.bytesPipe.transform(user.videoQuotaUsed, 0)
+ const videoQuotaUsed = getBytes(user.videoQuotaUsed, 0)
let videoQuotaDaily: string
let videoQuotaUsedDaily: string
if (user.videoQuotaDaily === -1) {
videoQuotaDaily = '∞'
- videoQuotaUsedDaily = this.bytesPipe.transform(0, 0) + ''
+ videoQuotaUsedDaily = getBytes(0, 0) + ''
} else {
- videoQuotaDaily = this.bytesPipe.transform(user.videoQuotaDaily, 0) + ''
- videoQuotaUsedDaily = this.bytesPipe.transform(user.videoQuotaUsedDaily || 0, 0) + ''
+ videoQuotaDaily = getBytes(user.videoQuotaDaily, 0) + ''
+ videoQuotaUsedDaily = getBytes(user.videoQuotaUsedDaily || 0, 0) + ''
}
const roleLabels: { [ id in UserRole ]: string } = {
- [UserRole.USER]: this.i18n('User'),
- [UserRole.ADMINISTRATOR]: this.i18n('Administrator'),
- [UserRole.MODERATOR]: this.i18n('Moderator')
+ [UserRole.USER]: $localize`User`,
+ [UserRole.ADMINISTRATOR]: $localize`Administrator`,
+ [UserRole.MODERATOR]: $localize`Moderator`
}
return Object.assign(user, {
projects / github / Chocobozzz / PeerTube.git / blobdiff