OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix client error logging

pull/789/head
Chocobozzz 2018-07-09 15:56:02 +02:00
parent 5634dfc811
commit e4f0e92e75
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/app/shared/users/user.service.ts
View File

@ -25,7 +25,7 @@ export class UserService {
return this.authHttp.put(url, body) return this.authHttp.put(url, body)
.pipe( .pipe(
map(this.restExtractor.extractDataBool), map(this.restExtractor.extractDataBool),
catchError(res => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -35,7 +35,7 @@ export class UserService {
return this.authHttp.put(url, profile) return this.authHttp.put(url, profile)
.pipe( .pipe(
map(this.restExtractor.extractDataBool), map(this.restExtractor.extractDataBool),
catchError(res => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -43,14 +43,14 @@ export class UserService {
const url = UserService.BASE_USERS_URL + 'me/avatar/pick' const url = UserService.BASE_USERS_URL + 'me/avatar/pick'
return this.authHttp.post<{ avatar: Avatar }>(url, avatarForm) return this.authHttp.post<{ avatar: Avatar }>(url, avatarForm)
.pipe(catchError(this.restExtractor.handleError)) .pipe(catchError(err => this.restExtractor.handleError(err)))
} }
signup (userCreate: UserCreate) { signup (userCreate: UserCreate) {
return this.authHttp.post(UserService.BASE_USERS_URL + 'register', userCreate) return this.authHttp.post(UserService.BASE_USERS_URL + 'register', userCreate)
.pipe( .pipe(
map(this.restExtractor.extractDataBool), map(this.restExtractor.extractDataBool),
catchError(res => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -58,7 +58,7 @@ export class UserService {
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) return this.authHttp.get<UserVideoQuota>(url)
.pipe(catchError(res => this.restExtractor.handleError(res))) .pipe(catchError(err => this.restExtractor.handleError(err)))
} }
askResetPassword (email: string) { askResetPassword (email: string) {
@ -67,7 +67,7 @@ export class UserService {
return this.authHttp.post(url, { email }) return this.authHttp.post(url, { email })
.pipe( .pipe(
map(this.restExtractor.extractDataBool), map(this.restExtractor.extractDataBool),
catchError(res => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }

6
client/src/app/shared/video-channel/video-channel.service.ts
View File

@ -27,7 +27,7 @@ export class VideoChannelService {
.pipe( .pipe(
map(videoChannelHash => new VideoChannel(videoChannelHash)), map(videoChannelHash => new VideoChannel(videoChannelHash)),
tap(videoChannel => this.videoChannelLoaded.next(videoChannel)), tap(videoChannel => this.videoChannelLoaded.next(videoChannel)),
catchError(res => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -35,7 +35,7 @@ export class VideoChannelService {
return this.authHttp.get<ResultList<VideoChannelServer>>(AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/video-channels') return this.authHttp.get<ResultList<VideoChannelServer>>(AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/video-channels')
.pipe( .pipe(
map(res => this.extractVideoChannels(res)), map(res => this.extractVideoChannels(res)),
catchError((res) => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -59,7 +59,7 @@ export class VideoChannelService {
const url = VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannelUUID + '/avatar/pick' const url = VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannelUUID + '/avatar/pick'
return this.authHttp.post<{ avatar: Avatar }>(url, avatarForm) return this.authHttp.post<{ avatar: Avatar }>(url, avatarForm)
.pipe(catchError(this.restExtractor.handleError)) .pipe(catchError(err => this.restExtractor.handleError(err)))
} }
removeVideoChannel (videoChannel: VideoChannel) { removeVideoChannel (videoChannel: VideoChannel) {

26
client/src/app/shared/video/video.service.ts
View File

@ -50,7 +50,7 @@ export class VideoService {
.pipe(map(videoHash => ({ videoHash, translations }))) .pipe(map(videoHash => ({ videoHash, translations })))
}), }),
map(({ videoHash, translations }) => new VideoDetails(videoHash, translations)), map(({ videoHash, translations }) => new VideoDetails(videoHash, translations)),
catchError(res => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -58,7 +58,7 @@ export class VideoService {
return this.authHttp.post(this.getVideoViewUrl(uuid), {}) return this.authHttp.post(this.getVideoViewUrl(uuid), {})
.pipe( .pipe(
map(this.restExtractor.extractDataBool), map(this.restExtractor.extractDataBool),
catchError(this.restExtractor.handleError) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -93,7 +93,7 @@ export class VideoService {
return this.authHttp.put(VideoService.BASE_VIDEO_URL + video.id, data) return this.authHttp.put(VideoService.BASE_VIDEO_URL + video.id, data)
.pipe( .pipe(
map(this.restExtractor.extractDataBool), map(this.restExtractor.extractDataBool),
catchError(this.restExtractor.handleError) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -102,7 +102,7 @@ export class VideoService {
return this.authHttp return this.authHttp
.request<{ video: { id: number, uuid: string } }>(req) .request<{ video: { id: number, uuid: string } }>(req)
.pipe(catchError(this.restExtractor.handleError)) .pipe(catchError(err => this.restExtractor.handleError(err)))
} }
getMyVideos (videoPagination: ComponentPagination, sort: VideoSortField): Observable<{ videos: Video[], totalVideos: number }> { getMyVideos (videoPagination: ComponentPagination, sort: VideoSortField): Observable<{ videos: Video[], totalVideos: number }> {
@ -115,7 +115,7 @@ export class VideoService {
.get<ResultList<Video>>(UserService.BASE_USERS_URL + '/me/videos', { params }) .get<ResultList<Video>>(UserService.BASE_USERS_URL + '/me/videos', { params })
.pipe( .pipe(
switchMap(res => this.extractVideos(res)), switchMap(res => this.extractVideos(res)),
catchError(res => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -133,7 +133,7 @@ export class VideoService {
.get<ResultList<Video>>(AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/videos', { params }) .get<ResultList<Video>>(AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/videos', { params })
.pipe( .pipe(
switchMap(res => this.extractVideos(res)), switchMap(res => this.extractVideos(res)),
catchError(res => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -151,7 +151,7 @@ export class VideoService {
.get<ResultList<Video>>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.uuid + '/videos', { params }) .get<ResultList<Video>>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.uuid + '/videos', { params })
.pipe( .pipe(
switchMap(res => this.extractVideos(res)), switchMap(res => this.extractVideos(res)),
catchError(res => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -178,7 +178,7 @@ export class VideoService {
.get<ResultList<Video>>(VideoService.BASE_VIDEO_URL, { params }) .get<ResultList<Video>>(VideoService.BASE_VIDEO_URL, { params })
.pipe( .pipe(
switchMap(res => this.extractVideos(res)), switchMap(res => this.extractVideos(res)),
catchError(res => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -248,7 +248,7 @@ export class VideoService {
.get<ResultList<VideoServerModel>>(url, { params }) .get<ResultList<VideoServerModel>>(url, { params })
.pipe( .pipe(
switchMap(res => this.extractVideos(res)), switchMap(res => this.extractVideos(res)),
catchError(res => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -257,7 +257,7 @@ export class VideoService {
.delete(VideoService.BASE_VIDEO_URL + id) .delete(VideoService.BASE_VIDEO_URL + id)
.pipe( .pipe(
map(this.restExtractor.extractDataBool), map(this.restExtractor.extractDataBool),
catchError(res => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -266,7 +266,7 @@ export class VideoService {
.get(environment.apiUrl + descriptionPath) .get(environment.apiUrl + descriptionPath)
.pipe( .pipe(
map(res => res[ 'description' ]), map(res => res[ 'description' ]),
catchError(res => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -286,7 +286,7 @@ export class VideoService {
const url = UserService.BASE_USERS_URL + 'me/videos/' + id + '/rating' const url = UserService.BASE_USERS_URL + 'me/videos/' + id + '/rating'
return this.authHttp.get<UserVideoRate>(url) return this.authHttp.get<UserVideoRate>(url)
.pipe(catchError(res => this.restExtractor.handleError(res))) .pipe(catchError(err => this.restExtractor.handleError(err)))
} }
private setVideoRate (id: number, rateType: VideoRateType) { private setVideoRate (id: number, rateType: VideoRateType) {
@ -299,7 +299,7 @@ export class VideoService {
.put(url, body) .put(url, body)
.pipe( .pipe(
map(this.restExtractor.extractDataBool), map(this.restExtractor.extractDataBool),
catchError(res => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }

12
client/src/app/videos/+video-watch/comment/video-comment.service.ts
View File

@ -31,8 +31,8 @@ export class VideoCommentService {
return this.authHttp.post(url, normalizedComment) return this.authHttp.post(url, normalizedComment)
.pipe( .pipe(
map(data => this.extractVideoComment(data['comment'])), map(data => this.extractVideoComment(data['comment'])),
catchError(this.restExtractor.handleError) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -43,7 +43,7 @@ export class VideoCommentService {
return this.authHttp.post(url, normalizedComment) return this.authHttp.post(url, normalizedComment)
.pipe( .pipe(
map(data => this.extractVideoComment(data[ 'comment' ])), map(data => this.extractVideoComment(data[ 'comment' ])),
catchError(this.restExtractor.handleError) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -62,7 +62,7 @@ export class VideoCommentService {
.get(url, { params }) .get(url, { params })
.pipe( .pipe(
map(this.extractVideoComments), map(this.extractVideoComments),
catchError((res) => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -73,7 +73,7 @@ export class VideoCommentService {
.get(url) .get(url)
.pipe( .pipe(
map(tree => this.extractVideoCommentTree(tree as VideoCommentThreadTree)), map(tree => this.extractVideoCommentTree(tree as VideoCommentThreadTree)),
catchError((res) => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }
@ -84,7 +84,7 @@ export class VideoCommentService {
.delete(url) .delete(url)
.pipe( .pipe(
map(this.restExtractor.extractDataBool), map(this.restExtractor.extractDataBool),
catchError((res) => this.restExtractor.handleError(res)) catchError(err => this.restExtractor.handleError(err))
) )
} }