Добавлены права на воспроизведение.

2026-04-14 13:11:34 +03:00
parent 4b3036364b
commit 164cf455fd
16 changed files with 724 additions and 136 deletions
--- a/PlaylistShared.Pwa/Components/AudioPlayer.razor
+++ b/PlaylistShared.Pwa/Components/AudioPlayer.razor
@@ -65,6 +65,9 @@
    /// <summary>Требовать ли авторизацию для воспроизведения (по умолчанию true).</summary>
    [Parameter] public bool RequireAuth { get; set; } = true;

+    /// <summary>ID расшаренного плейлиста.</summary>
+    [Parameter] public string SharedPlaylistId { get; set; } = string.Empty;
+
    /// <summary>Событие при завершении трека.</summary>
    [Parameter] public EventCallback OnTrackEnded { get; set; }

@@ -139,16 +142,16 @@
        var tokens = await TokenStorage.GetTokensAsync();
        var accessToken = tokens.token;
        
-        if (string.IsNullOrEmpty(accessToken))
+        if (string.IsNullOrWhiteSpace(accessToken) && string.IsNullOrWhiteSpace(SharedPlaylistId))
        {
            Snackbar.Add("Токен авторизации не найден. Пожалуйста, войдите заново.", Severity.Error);
            return;
        }
        
-        var streamUrl = new Uri(Http.BaseAddress, $"/api/audio/track/{trackId}").ToString();
+        var streamUrl = new Uri(Http.BaseAddress!, $"/api/audio/track/{trackId}").ToString();

        await EnsureAudioModuleAsync();
-        await _audioElement!.InvokeVoidAsync("loadAndPlay", streamUrl, accessToken);
+        await _audioElement!.InvokeVoidAsync("loadAndPlay", streamUrl, accessToken, SharedPlaylistId);
        _isPlaying = true;
        StartProgressTimer();
        StateHasChanged();
--- a/PlaylistShared.Pwa/Pages/SharedPlaylistView.razor
+++ b/PlaylistShared.Pwa/Pages/SharedPlaylistView.razor
@@ -50,6 +50,12 @@
                                    <MudSelectItem Value="ViewPermission.AuthorizedOnly">Только авторизованные</MudSelectItem>
                                </MudSelect>
                            </MudItem>
+                            <MudItem xs="12" sm="4">
+                                <MudSelect T="ViewPermission" Label="Воспроизведение" @bind-Value="_editPermissions.PlayPermission" Variant="Variant.Outlined" FullWidth="true">
+                                    <MudSelectItem Value="ViewPermission.Everyone">Все</MudSelectItem>
+                                    <MudSelectItem Value="ViewPermission.AuthorizedOnly">Только авторизованные</MudSelectItem>
+                                </MudSelect>
+                            </MudItem>
                            <MudItem xs="12" sm="4">
                                <MudSelect T="EditPermission" Label="Добавление треков" @bind-Value="_editPermissions.AddPermission" Variant="Variant.Outlined" FullWidth="true">
                                    <MudSelectItem Value="EditPermission.Everyone">Все</MudSelectItem>
@@ -144,11 +150,19 @@
                            <MudTd DataLabel="Обложка">
                                @if (!string.IsNullOrEmpty(context.CoverUri))
                                {
-                                    <TrackCoverWithPlay CoverUrl="@context.CoverUri"
-                                                        TrackId="@context.Id"
-                                                        Width="50" Height="50"
-                                                        IsPlaying="@(_currentTrackId == context.Id && _isPlaying)"
-                                                        OnPlay="PlayTrack" />
+                                    @if (@_canPlay)
+                                    {
+                                        <TrackCoverWithPlay CoverUrl="@context.CoverUri"
+                                                            TrackId="@context.Id"
+                                                            Width="50" Height="50"
+                                                            IsPlaying="@(_currentTrackId == context.Id && _isPlaying)"
+                                                            OnPlay="PlayTrack" />
+                                    }
+                                    else
+                                    {
+                                        
+                                        <MudImage Src="@FormatCoverUrl(context.CoverUri, "50x50")" Height="50" Width="50" Class="rounded" Style="display: block;" />
+                                    }
                                }
                            </MudTd>
                            <MudTd DataLabel="Название">
@@ -174,7 +188,7 @@

    <!-- Фиксированный плеер внизу -->
    <div class="fixed-player" style="display: @(_isPlayerVisible ? "block" : "none");">
-        <AudioPlayer @ref="_audioPlayer" OnTrackEnded="OnTrackEnded" />
+        <AudioPlayer @ref="_audioPlayer" OnTrackEnded="OnTrackEnded" RequireAuth="false" SharedPlaylistId="@Token"/>
    </div>
 </MudContainer>

@@ -191,6 +205,7 @@
    private bool _loading = true;
    private bool _isAuthenticated;
    private bool _isCreator;
+    private bool _canPlay;
    private bool _canAdd;
    private bool _canRemove;
    private UpdatePermissionsDto _editPermissions = new();
@@ -211,6 +226,45 @@
        await LoadPlaylist();
    }

+    private async Task ConfigurePermissions()
+    {
+        if (_playlist is null)
+        {
+            _isCreator = false;
+            _canAdd = false;
+            _canRemove = false;
+            _canPlay = false;
+        }
+        else
+        {
+            _isCreator = _playlist.CreatorUserId.ToString() == _currentUserId;
+
+            _canAdd = _isCreator
+            || _playlist.AddPermission == EditPermission.Everyone
+            || (_playlist.AddPermission == EditPermission.AuthorizedOnly && _isAuthenticated);
+
+            _canRemove = _isCreator
+            || _playlist.RemovePermission == EditPermission.Everyone
+            || (_playlist.RemovePermission == EditPermission.AuthorizedOnly && _isAuthenticated);
+
+            _canPlay = _isCreator
+            || _playlist.PlayPermission == ViewPermission.Everyone
+            || (_playlist.PlayPermission == ViewPermission.AuthorizedOnly && _isAuthenticated);
+
+            if (_isCreator && _isAuthenticated)
+            {
+                _editPermissions = new UpdatePermissionsDto
+                {
+                    ViewPermission = _playlist.ViewPermission,
+                    AddPermission = _playlist.AddPermission,
+                    RemovePermission = _playlist.RemovePermission,
+                    PlayPermission = _playlist.PlayPermission,
+                };
+            }
+            
+        }
+    }
+
    private async Task LoadPlaylist()
    {
        try
@@ -219,25 +273,8 @@
            if (response?.Success == true)
            {
                _playlist = response.Data;
-                _isCreator = _playlist.CreatorUserId.ToString() == _currentUserId;

-                _canAdd = _isCreator 
-                || _playlist.AddPermission == EditPermission.Everyone 
-                || (_playlist.AddPermission == EditPermission.AuthorizedOnly && _isAuthenticated);
-
-                _canRemove = _isCreator 
-                || _playlist.RemovePermission == EditPermission.Everyone 
-                || (_playlist.RemovePermission == EditPermission.AuthorizedOnly && _isAuthenticated);
-
-                if (_isCreator && _isAuthenticated)
-                {
-                    _editPermissions = new UpdatePermissionsDto
-                    {
-                        ViewPermission = _playlist.ViewPermission,
-                        AddPermission = _playlist.AddPermission,
-                        RemovePermission = _playlist.RemovePermission
-                    };
-                }
+                await ConfigurePermissions();

                await LoadTracks();
            }
@@ -371,11 +408,8 @@
                if (result?.Success == true)
                {
                    _playlist = result.Data;
-                    Snackbar.Add("Права доступа обновлены", Severity.Success);
-                    _canAdd = _isCreator || _playlist.AddPermission == EditPermission.Everyone ||
-                             (_playlist.AddPermission == EditPermission.AuthorizedOnly && _isAuthenticated);
-                    _canRemove = _isCreator || _playlist.RemovePermission == EditPermission.Everyone ||
-                                (_playlist.RemovePermission == EditPermission.AuthorizedOnly && _isAuthenticated);
+
+                    await ConfigurePermissions();
                }
                else
                {
--- a/PlaylistShared.Pwa/wwwroot/index.html
+++ b/PlaylistShared.Pwa/wwwroot/index.html
@@ -16,74 +16,6 @@
    <link rel="apple-touch-icon" sizes="512x512" href="icon-512.png" />
    <link rel="apple-touch-icon" sizes="192x192" href="icon-192.png" />
    <script type="importmap"></script>
-    <style>
-        html, body {
-            background-color: #1a1a27 !important;
-            margin: 0;
-            padding: 0;
-            height: 100%;
-        }
-
-        /* Кастомный спиннер в стиле MudBlazor (тёмная тема) */
-        .loading-progress {
-            position: relative;
-            display: block;
-            width: 64px;
-            height: 64px;
-            margin: 0 auto;
-        }
-
-            .loading-progress circle {
-                fill: none;
-                stroke: #2a2833;
-                stroke-width: 4;
-                transform-origin: 50% 50%;
-                animation: spin 1.5s linear infinite;
-            }
-
-                .loading-progress circle:last-child {
-                    stroke: #7e6fff;
-                    stroke-dasharray: 126;
-                    stroke-dashoffset: 126;
-                    animation: dash 1.5s ease-in-out infinite;
-                }
-
-        @keyframes spin {
-            100% {
-                transform: rotate(360deg);
-            }
-        }
-
-        @keyframes dash {
-            0% {
-                stroke-dashoffset: 126;
-            }
-
-            50% {
-                stroke-dashoffset: 63;
-                transform: rotate(135deg);
-            }
-
-            100% {
-                stroke-dashoffset: 126;
-                transform: rotate(450deg);
-            }
-        }
-
-        .loading-progress-text {
-            text-align: center;
-            margin-top: 16px;
-            color: #b2b0bf;
-            font-family: 'Roboto', sans-serif;
-            font-size: 14px;
-        }
-
-        /* Убираем белые вспышки */
-        #app {
-            background-color: #1a1a27;
-            min-height: 100vh;
-        }
-    </style>
 </head>

 <body>
--- a/PlaylistShared.Pwa/wwwroot/js/AudioPlayer.js
+++ b/PlaylistShared.Pwa/wwwroot/js/AudioPlayer.js
@@ -10,9 +10,10 @@
        return isNaN(num) ? 0 : num;
    };

-    const loadAndPlay = (src, token) => {
+    const loadAndPlay = (src, token, sharedPlaylistId) => {
        const url = new URL(src, window.location.href);
        if (token) url.searchParams.set('access_token', token);
+        if (sharedPlaylistId) url.searchParams.set('shared_id', sharedPlaylistId);
        audio.src = url.toString();
        audio.load();
        durationReady = false;