From e4f0e92e755be1332dea7cb161e70a53af5c42ef Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 9 Jul 2018 15:56:02 +0200 Subject: [PATCH] Fix client error logging --- client/src/app/shared/users/user.service.ts | 12 ++++----- .../video-channel/video-channel.service.ts | 6 ++--- client/src/app/shared/video/video.service.ts | 26 +++++++++---------- .../comment/video-comment.service.ts | 12 ++++----- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/client/src/app/shared/users/user.service.ts b/client/src/app/shared/users/user.service.ts index 9fe6c8b60..365a21df7 100644 --- a/client/src/app/shared/users/user.service.ts +++ b/client/src/app/shared/users/user.service.ts @@ -25,7 +25,7 @@ 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)) ) } @@ -35,7 +35,7 @@ export class UserService { return this.authHttp.put(url, profile) .pipe( 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' return this.authHttp.post<{ avatar: Avatar }>(url, avatarForm) - .pipe(catchError(this.restExtractor.handleError)) + .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)) ) } @@ -58,7 +58,7 @@ export class UserService { const url = UserService.BASE_USERS_URL + '/me/video-quota-used' return this.authHttp.get(url) - .pipe(catchError(res => this.restExtractor.handleError(res))) + .pipe(catchError(err => this.restExtractor.handleError(err))) } askResetPassword (email: string) { @@ -67,7 +67,7 @@ export class UserService { return this.authHttp.post(url, { email }) .pipe( map(this.restExtractor.extractDataBool), - catchError(res => this.restExtractor.handleError(res)) + catchError(err => this.restExtractor.handleError(err)) ) } diff --git a/client/src/app/shared/video-channel/video-channel.service.ts b/client/src/app/shared/video-channel/video-channel.service.ts index 0b9900208..8c000665f 100644 --- a/client/src/app/shared/video-channel/video-channel.service.ts +++ b/client/src/app/shared/video-channel/video-channel.service.ts @@ -27,7 +27,7 @@ export class VideoChannelService { .pipe( map(videoChannelHash => new VideoChannel(videoChannelHash)), 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>(AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/video-channels') .pipe( 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' return this.authHttp.post<{ avatar: Avatar }>(url, avatarForm) - .pipe(catchError(this.restExtractor.handleError)) + .pipe(catchError(err => this.restExtractor.handleError(err))) } removeVideoChannel (videoChannel: VideoChannel) { diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index 4783adf42..9498a06fe 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts @@ -50,7 +50,7 @@ export class VideoService { .pipe(map(videoHash => ({ 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), {}) .pipe( 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) .pipe( map(this.restExtractor.extractDataBool), - catchError(this.restExtractor.handleError) + catchError(err => this.restExtractor.handleError(err)) ) } @@ -102,7 +102,7 @@ export class VideoService { return this.authHttp .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 }> { @@ -115,7 +115,7 @@ export class VideoService { .get>(UserService.BASE_USERS_URL + '/me/videos', { params }) .pipe( 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>(AccountService.BASE_ACCOUNT_URL + account.nameWithHost + '/videos', { params }) .pipe( 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>(VideoChannelService.BASE_VIDEO_CHANNEL_URL + videoChannel.uuid + '/videos', { params }) .pipe( 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>(VideoService.BASE_VIDEO_URL, { params }) .pipe( 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>(url, { params }) .pipe( 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) .pipe( 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) .pipe( 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' return this.authHttp.get(url) - .pipe(catchError(res => this.restExtractor.handleError(res))) + .pipe(catchError(err => this.restExtractor.handleError(err))) } private setVideoRate (id: number, rateType: VideoRateType) { @@ -299,7 +299,7 @@ export class VideoService { .put(url, body) .pipe( map(this.restExtractor.extractDataBool), - catchError(res => this.restExtractor.handleError(res)) + catchError(err => this.restExtractor.handleError(err)) ) } diff --git a/client/src/app/videos/+video-watch/comment/video-comment.service.ts b/client/src/app/videos/+video-watch/comment/video-comment.service.ts index 5b9a991a0..73526cb3e 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment.service.ts +++ b/client/src/app/videos/+video-watch/comment/video-comment.service.ts @@ -31,8 +31,8 @@ export class VideoCommentService { return this.authHttp.post(url, normalizedComment) .pipe( - map(data => this.extractVideoComment(data['comment'])), - catchError(this.restExtractor.handleError) + map(data => this.extractVideoComment(data['comment'])), + catchError(err => this.restExtractor.handleError(err)) ) } @@ -43,7 +43,7 @@ export class VideoCommentService { return this.authHttp.post(url, normalizedComment) .pipe( 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 }) .pipe( map(this.extractVideoComments), - catchError((res) => this.restExtractor.handleError(res)) + catchError(err => this.restExtractor.handleError(err)) ) } @@ -73,7 +73,7 @@ export class VideoCommentService { .get(url) .pipe( 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) .pipe( map(this.restExtractor.extractDataBool), - catchError((res) => this.restExtractor.handleError(res)) + catchError(err => this.restExtractor.handleError(err)) ) } -- 2.25.1