+import { Observable } from 'rxjs'
import { catchError, map } from 'rxjs/operators'
-import { HttpClient } from '@angular/common/http'
+import { HttpClient, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
-import { UserCreate, UserUpdateMe } from '../../../../../shared'
+import { UserCreate, UserUpdateMe, UserVideoQuota } from '../../../../../shared'
import { environment } from '../../../environments/environment'
import { RestExtractor } from '../rest'
+import { Avatar } from '../../../../../shared/models/avatars/avatar.model'
@Injectable()
export class UserService {
return this.authHttp.put(url, body)
.pipe(
map(this.restExtractor.extractDataBool),
- catchError(res => this.restExtractor.handleError(res))
+ catchError(err => this.restExtractor.handleError(err))
)
}
return this.authHttp.put(url, profile)
.pipe(
map(this.restExtractor.extractDataBool),
- catchError(res => this.restExtractor.handleError(res))
+ 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))
)
}
changeAvatar (avatarForm: FormData) {
const url = UserService.BASE_USERS_URL + 'me/avatar/pick'
- return this.authHttp.post(url, avatarForm)
- .pipe(catchError(this.restExtractor.handleError))
+ return this.authHttp.post<{ avatar: Avatar }>(url, avatarForm)
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
}
signup (userCreate: UserCreate) {
return this.authHttp.post(UserService.BASE_USERS_URL + 'register', userCreate)
.pipe(
map(this.restExtractor.extractDataBool),
- catchError(res => this.restExtractor.handleError(res))
+ catchError(err => this.restExtractor.handleError(err))
)
}
getMyVideoQuotaUsed () {
const url = UserService.BASE_USERS_URL + '/me/video-quota-used'
- return this.authHttp.get(url)
- .pipe(catchError(res => this.restExtractor.handleError(res)))
+ return this.authHttp.get<UserVideoQuota>(url)
+ .pipe(catchError(err => this.restExtractor.handleError(err)))
}
askResetPassword (email: string) {
return this.authHttp.post(url, { email })
.pipe(
map(this.restExtractor.extractDataBool),
- catchError(res => this.restExtractor.handleError(res))
+ catchError(err => this.restExtractor.handleError(err))
)
}
catchError(res => this.restExtractor.handleError(res))
)
}
+
+ verifyEmail (userId: number, verificationString: string) {
+ const url = `${UserService.BASE_USERS_URL}/${userId}/verify-email`
+ const body = {
+ verificationString
+ }
+
+ 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))
+ )
+ }
+
+ autocomplete (search: string): Observable<string[]> {
+ const url = UserService.BASE_USERS_URL + 'autocomplete'
+ const params = new HttpParams().append('search', search)
+
+ return this.authHttp
+ .get<string[]>(url, { params })
+ .pipe(catchError(res => this.restExtractor.handleError(res)))
+ }
}