From 37b1d97f226aa83f47cb27eae00f2d2821759457 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 28 Jul 2022 16:26:34 +0200 Subject: Prevent fetching playlist status after logout --- .../shared/shared-video-playlist/video-playlist.service.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/client/src/app/shared/shared-video-playlist/video-playlist.service.ts b/client/src/app/shared/shared-video-playlist/video-playlist.service.ts index 81ae0f292..d71f8f72e 100644 --- a/client/src/app/shared/shared-video-playlist/video-playlist.service.ts +++ b/client/src/app/shared/shared-video-playlist/video-playlist.service.ts @@ -3,7 +3,7 @@ import { merge, Observable, of, ReplaySubject, Subject } from 'rxjs' import { catchError, filter, map, share, switchMap, tap } from 'rxjs/operators' import { HttpClient, HttpContext, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' -import { AuthUser, ComponentPaginationLight, RestExtractor, RestService, ServerService } from '@app/core' +import { AuthService, AuthUser, ComponentPaginationLight, RestExtractor, RestService, ServerService } from '@app/core' import { buildBulkObservable, objectToFormData } from '@app/helpers' import { Account, AccountService, VideoChannel, VideoChannelService } from '@app/shared/shared-main' import { NGX_LOADING_BAR_IGNORED } from '@ngx-loading-bar/http-client' @@ -46,6 +46,7 @@ export class VideoPlaylistService { constructor ( private authHttp: HttpClient, + private auth: AuthService, private serverService: ServerService, private restExtractor: RestExtractor, private restService: RestService @@ -53,7 +54,14 @@ export class VideoPlaylistService { this.videoExistsInPlaylistObservable = merge( buildBulkObservable({ time: 500, - bulkGet: this.doVideosExistInPlaylist.bind(this), + bulkGet: (videoIds: number[]) => { + // We added a delay to the request, so ensure the user is still logged in + if (this.auth.isLoggedIn()) { + return this.doVideosExistInPlaylist(videoIds) + } + + return of({}) + }, notifierObservable: this.videoExistsInPlaylistNotifier }).pipe(map(({ response }) => response)), -- cgit v1.2.3