From 1acd784cf984bb91d39c37a248805a7f96ea6643 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 13 May 2019 11:25:13 +0200 Subject: Fix playlists with unauthenticated users --- .../video-channel-playlists/video-channel-playlists.component.ts | 6 +----- .../src/app/videos/+video-watch/video-watch-playlist.component.ts | 4 +++- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'client/src/app') diff --git a/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.ts b/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.ts index f878a5a24..907aefae1 100644 --- a/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.ts +++ b/client/src/app/+video-channels/video-channel-playlists/video-channel-playlists.component.ts @@ -1,9 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core' -import { AuthService } from '../../core/auth' import { ConfirmService } from '../../core/confirm' import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' import { VideoChannel } from '@app/shared/video-channel/video-channel.model' -import { flatMap } from 'rxjs/operators' import { Subscription } from 'rxjs' import { Notifier } from '@app/core' import { VideoPlaylist } from '@app/shared/video-playlist/video-playlist.model' @@ -28,7 +26,6 @@ export class VideoChannelPlaylistsComponent implements OnInit, OnDestroy { private videoChannel: VideoChannel constructor ( - private authService: AuthService, private notifier: Notifier, private confirmService: ConfirmService, private videoPlaylistService: VideoPlaylistService, @@ -57,8 +54,7 @@ export class VideoChannelPlaylistsComponent implements OnInit, OnDestroy { } private loadVideoPlaylists () { - this.authService.userInformationLoaded - .pipe(flatMap(() => this.videoPlaylistService.listChannelPlaylists(this.videoChannel))) + this.videoPlaylistService.listChannelPlaylists(this.videoChannel) .subscribe(res => { this.videoPlaylists = this.videoPlaylists.concat(res.data) this.pagination.totalItems = res.total diff --git a/client/src/app/videos/+video-watch/video-watch-playlist.component.ts b/client/src/app/videos/+video-watch/video-watch-playlist.component.ts index 3ac06c099..bccdaf7b2 100644 --- a/client/src/app/videos/+video-watch/video-watch-playlist.component.ts +++ b/client/src/app/videos/+video-watch/video-watch-playlist.component.ts @@ -47,7 +47,9 @@ export class VideoWatchPlaylistComponent { } isPlaylistOwned () { - return this.playlist.isLocal === true && this.playlist.ownerAccount.name === this.auth.getUser().username + return this.playlist.isLocal === true && + this.auth.isLoggedIn() && + this.playlist.ownerAccount.name === this.auth.getUser().username } isUnlistedPlaylist () { -- cgit v1.2.3