[CHANGE] Get all account info

Manager.App/Components/Application/Dev/AuthenticationHasher.razor

@@ -0,0 +1,14 @@
+
+
+<MudText>SAPISID Hash generator</MudText>
+<MudStack Row Spacing="2">
+    <MudTextField HelperText="Datasync id" @bind-Value="@DatasyncId"/>
+    <MudTextField HelperText="Time" Mask="@(new PatternMask("0000000000"))" @bind-Value="@Time"/>
+    <MudTextField HelperText="SAPISID" @bind-Value="@SecureCookie"/>
+    <MudTextField HelperText="Origin" @bind-Value="@Origin"/>
+</MudStack>
+<MudTextField HelperText="Hash" ReadOnly @bind-Value="@OutputHash"/>
+<MudStack Row Spacing="2">
+    <MudButton OnClick="Hash">Generate</MudButton>
+    <MudButton OnClick="Clear">Clear</MudButton>
+</MudStack>

Manager.App/Components/Application/Dev/AuthenticationHasher.razor.cs

@@ -0,0 +1,30 @@
+using Manager.YouTube.Util;
+using Microsoft.AspNetCore.Components;
+
+namespace Manager.App.Components.Application.Dev;
+
+public partial class AuthenticationHasher : ComponentBase
+{
+    private const string DefaultOrigin = "https://www.youtube.com";
+    public string DatasyncId { get; set; } = "";
+    public string Time { get; set; } = "";
+    public string SecureCookie { get; set; } = "";
+    public string Origin { get; set; } = DefaultOrigin;
+
+    public string OutputHash { get; set; } = "";
+
+    private void Clear()
+    {
+        DatasyncId = "";
+        Time = "";
+        SecureCookie = "";
+        Origin = DefaultOrigin;
+        OutputHash = "";
+    }
+
+    private void Hash()
+    {
+        var hashedValue= AuthenticationUtilities.GetSapisidHash(DatasyncId, SecureCookie, Origin, Time);
+        OutputHash = hashedValue ?? "Hash failed!";
+    }
+}

Manager.App/Components/Dialogs/AccountDialog.razor

@@ -1,3 +1,5 @@
+@inject ISnackbar SnackbarService
+
 <ForcedLoadingOverlay Visible="_isLoading"/>
 
 <MudDialog>
@@ -14,11 +16,11 @@
                 <MudButton Variant="Variant.Outlined" Disabled="@(string.IsNullOrWhiteSpace(_cookieDomain) || string.IsNullOrWhiteSpace(_cookieText))" OnClick="ApplyTextCookies">Apply</MudButton>
             }
 
-            <MudStack Row Spacing="2" AlignItems="AlignItems.Stretch" Justify="Justify.SpaceEvenly" StretchItems="StretchItems.All">
-                <MudStack Spacing="2" Style="width: 100%">
+            <MudStack Row Spacing="2" AlignItems="AlignItems.Start" Justify="Justify.SpaceEvenly" StretchItems="StretchItems.All">
+                <MudStack Spacing="2">
                     <MudTextField Label="UserAgent" Required @bind-Value="@Client.UserAgent"/>
                 </MudStack>
-                <MudSimpleTable Style="width: 100%" Bordered Dense Elevation="0" Outlined Square Hover>
+                <MudSimpleTable Bordered Dense Elevation="0" Outlined Square Hover>
                     <tbody>
                     <tr>
                         <td>Account id:</td>
@@ -28,6 +30,10 @@
                         <td>Account name:</td>
                         <td>@Client.AccountName</td>
                     </tr>
+                    <tr>
+                        <td>Account handle:</td>
+                        <td>@Client.AccountHandle</td>
+                    </tr>
                     <tr>
                         <td>User agent:</td>
                         <td>@Client.UserAgent</td>
@@ -51,6 +57,10 @@
                     </tr>
                     </tbody>
                 </MudSimpleTable>
+                @if (!string.IsNullOrWhiteSpace(Client.AccountImage))
+                {
+                    <MudImage Src="@Client.AccountImage" Elevation="0" ObjectFit="ObjectFit.Contain"/>
+                }
             </MudStack>
 
             <MudDataGrid Items="Client.CookieContainer.GetAllCookies()"  Dense Elevation="0" Outlined>
@@ -84,14 +94,6 @@
                         </CellTemplate>
                     </TemplateColumn>
                     <PropertyColumn Title="Expires" Property="x => x.Expires"/>
-
-                    <TemplateColumn>
-                        <CellTemplate>
-                            <MudTooltip Text="Remove">
-                                <MudIconButton Size="Size.Small" Icon="@Icons.Material.Filled.Remove" Color="Color.Error" OnClick="@(() => RemoveCookie(context.Item))"/>
-                            </MudTooltip>
-                        </CellTemplate>
-                    </TemplateColumn>
                 </Columns>
             </MudDataGrid>
         </MudStack>

Manager.App/Components/Dialogs/AccountDialog.razor.cs

@@ -29,17 +29,6 @@ namespace Manager.App.Components.Dialogs
             Client.CookieContainer.Add(new Cookie { Name = "SET_NAME", Domain = ".youtube.com" });
         }
         
-        private async Task RemoveCookie(Cookie? cookie)
-        {
-            if (cookie == null)
-            {
-                return;
-            }
-
-            cookie.Expired = true;
-            await InvokeAsync(StateHasChanged);
-        }
-        
         private void ToggleCookieTextImport()
         {
             _showCookieTextImport =! _showCookieTextImport;
@@ -71,14 +60,12 @@ namespace Manager.App.Components.Dialogs
                     var name = parts[0].Trim();
                     var value = parts[1].Trim();
 
-                    // Escape invalid characters
-                    var safeName = Uri.EscapeDataString(name);
-                    var safeValue = Uri.EscapeDataString(value);
-
-                    var cookie = new Cookie(safeName, safeValue);
+                    var cookie = new Cookie(name, value);
 
                     if (!string.IsNullOrEmpty(domain))
                         cookie.Domain = domain;
+                    cookie.Expires = DateTime.Now.AddDays(1);
+                    cookie.Path = "/";
 
                     collection.Add(cookie);
                 }
@@ -99,13 +86,27 @@ namespace Manager.App.Components.Dialogs
 
         private bool CanSave()
         {
-            return Client.ClientState is { LoggedIn: true };
+            if (Client.ClientState == null)
+            {
+                return false;
+            }
+
+            if (string.IsNullOrWhiteSpace(Client.Id))
+            {
+                return false;
+            }
+
+            return Client.SapisidCookie != null && Client.ClientState.LoggedIn;
         }
 
         private async Task ValidateAccount()
         {
             _isLoading = true;
-            await Client.GetStateAsync();
+            var result = await Client.BuildClientAsync();
+            if (!result.IsSuccess)
+            {
+                SnackbarService.Add(result.Error?.Description ?? "Error validating account.", Severity.Error);
+            }
             _isLoading = false;
         }
         

Manager.App/Components/Layout/NavMenu.razor

@@ -4,4 +4,5 @@
     <MudNavLink Href="/Channels" Icon="@Icons.Material.Filled.SupervisorAccount" Match="NavLinkMatch.All">Channels</MudNavLink>
     <MudNavLink Href="/Library" Icon="@Icons.Material.Filled.LocalLibrary" Match="NavLinkMatch.All">Library</MudNavLink>
     <MudNavLink Href="/Playlists" Icon="@Icons.Material.Filled.ViewList" Match="NavLinkMatch.All">Playlists</MudNavLink>
+    <MudNavLink Href="/Development" Icon="@Icons.Material.Filled.DeveloperMode" Match="NavLinkMatch.All">Development</MudNavLink>
 </MudNavMenu>

Manager.App/Components/Pages/Development.razor

@@ -0,0 +1,9 @@
+@page "/Development"
+@using Manager.App.Components.Application.Dev
+<title>Development page</title>
+
+<MudTabs Outlined Position="Position.Left" PanelClass="pa-4" ApplyEffectsToContainer Style="height: 100%">
+    <MudTabPanel Text="Authentication">
+        <AuthenticationHasher />
+    </MudTabPanel>
+</MudTabs>

Manager.App/Components/Pages/Development.razor.cs

@@ -0,0 +1,8 @@
+using Microsoft.AspNetCore.Components;
+
+namespace Manager.App.Components.Pages;
+
+public partial class Development : ComponentBase
+{
+    
+}

Manager.App/Program.cs

@@ -8,6 +8,7 @@ var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddRazorComponents()
     .AddInteractiveServerComponents();
 
+AppContext.SetSwitch("System.Net.Http.EnableActivityPropagation", false);
 
 /* Manager */
 builder.SetupLogging();

Manager.App/Services/System/ClientManager.cs

@@ -44,7 +44,7 @@ public class ClientManager : BackgroundService
         var ytClient = new YouTubeClient();
         //ytClient.CookieContainer = container;
         ytClient.UserAgent = accountEntity.UserAgent;
-        await ytClient.GetStateAsync();
+        await ytClient.BuildClientAsync();
 
         return ytClient;
     }

Manager.YouTube/Models/AccountMenuInfo.cs

@@ -0,0 +1,10 @@
+namespace Manager.YouTube.Models;
+
+public class AccountMenuInfo
+{
+    public string? AccountId { get; set; }
+    public string? AccountHandle { get; set; }
+    public string? ImageUrl { get; set; }
+    public int ImageWidth { get; set; }
+    public int ImageHeight { get; set; }
+}

Manager.YouTube/NetworkService.cs

@@ -1,8 +1,10 @@
+using System.Net;
 using System.Net.Mime;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using DotBased.Monads;
+using Manager.YouTube.Models;
 using Manager.YouTube.Models.Innertube;
 using Manager.YouTube.Parsers;
 using Manager.YouTube.Util;
@@ -20,12 +22,8 @@ public static class NetworkService
             Method = HttpMethod.Get,
             RequestUri = new Uri(Origin)
         };
-        httpRequest.Headers.IfModifiedSince = new DateTimeOffset(DateTime.UtcNow);
+        httpRequest.Headers.Clear();
         httpRequest.Headers.UserAgent.ParseAdd(client.UserAgent);
-        httpRequest.Headers.Accept.ParseAdd("text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
-        httpRequest.Headers.Connection.Add("keep-alive");
-        httpRequest.Headers.Add("DNT", "1");
-        httpRequest.Headers.Add("Upgrade-Insecure-Requests", "1");
         
         var http = client.GetHttpClient();
         if (http == null)
@@ -59,7 +57,48 @@ public static class NetworkService
         return clientState == null ? ResultError.Fail("Unable to parse client state!") : clientState;
     }
 
-    public static async Task<Result> GetCurrentAccountInfoAsync(YouTubeClient client)
+    public static async Task<Result<string[]>> GetDatasyncIds(YouTubeClient client)
+    {
+        if (client.ClientState is not { LoggedIn: true } || client.CookieContainer.Count == 0)
+        {
+            return ResultError.Fail("Client is not logged in, requires logged in client for this endpoint (/getDatasyncIdsEndpoint).");
+        }
+
+        var httpClient = client.GetHttpClient();
+        if (httpClient == null)
+        {
+            return ResultError.Fail("Unable to get http client!");
+        }
+
+        var httpRequest = new HttpRequestMessage
+        {
+            Method = HttpMethod.Get,
+            RequestUri = new Uri($"{Origin}/getDatasyncIdsEndpoint")
+        };
+        httpRequest.Headers.UserAgent.ParseAdd(client.UserAgent);
+        httpRequest.Headers.Add("Origin", Origin);
+        
+        var response = await httpClient.SendAsync(httpRequest);
+        if (!response.IsSuccessStatusCode)
+        {
+            var responseResult = await response.Content.ReadAsStringAsync();
+            return ResultError.Fail(responseResult);
+        }
+        
+        var responseContent = await response.Content.ReadAsStringAsync();
+        var datasyncIdsJson = JsonNode.Parse(responseContent.Replace(")]}'", ""));
+
+        var isLoggedOut = datasyncIdsJson?["responseContext"]?["mainAppWebResponseContext"]?["loggedOut"]
+            .Deserialize<bool>() ?? true;
+        if (!isLoggedOut)
+        {
+            return datasyncIdsJson?["datasyncIds"].Deserialize<string[]>() ?? [];
+        }
+
+        return ResultError.Fail("Failed to get datasyncIds!");
+    }
+
+    public static async Task<Result<AccountMenuInfo>> GetCurrentAccountInfoAsync(YouTubeClient client)
     {
         if (client.ClientState is not { LoggedIn: true })
         {
@@ -89,16 +128,52 @@ public static class NetworkService
             return ResultError.Fail("Unable to get http client!");
         }
         
-        var response = await http.SendAsync(httpRequest);
-        if (!response.IsSuccessStatusCode)
+        try
         {
-            var responseResult = await response.Content.ReadAsStringAsync();
-            return ResultError.Fail(responseResult);
+            var response = await http.SendAsync(httpRequest);
+            if (!response.IsSuccessStatusCode)
+            {
+                var responseResult = await response.Content.ReadAsStringAsync();
+                return ResultError.Fail(responseResult);
+            }
+
+            var json = await response.Content.ReadAsStringAsync();
+            var jsonDocument = JsonDocument.Parse(json);
+            var activeAccountHeader = jsonDocument.RootElement
+                .GetProperty("actions")[0]
+                .GetProperty("openPopupAction")
+                .GetProperty("popup")
+                .GetProperty("multiPageMenuRenderer")
+                .GetProperty("header")
+                .GetProperty("activeAccountHeaderRenderer");
+
+            var matRuns = activeAccountHeader
+                .GetProperty("manageAccountTitle")
+                .GetProperty("runs");
+
+            var accountPhotos = activeAccountHeader
+                .GetProperty("accountPhoto")
+                .GetProperty("thumbnails");
+
+            var accInfo = new AccountMenuInfo();
+
+            var highestImage = accountPhotos.EnumerateArray().OrderBy(x => x.GetProperty("width").Deserialize<int>())
+                .FirstOrDefault();
+            accInfo.ImageUrl = highestImage.GetProperty("url").Deserialize<string>();
+            accInfo.ImageWidth = highestImage.GetProperty("width").Deserialize<int>();
+            accInfo.ImageHeight = highestImage.GetProperty("height").Deserialize<int>();
+
+            foreach (var run in matRuns.EnumerateArray())
+            {
+                var browseEndpoint = run.GetProperty("navigationEndpoint").GetProperty("browseEndpoint");
+                accInfo.AccountId = browseEndpoint.GetProperty("browseId").GetString();
+                accInfo.AccountHandle = browseEndpoint.GetProperty("canonicalBaseUrl").GetString()?.Replace("/", "");
+            }
+            return accInfo;
+        }
+        catch (Exception e)
+        {
+            return ResultError.Error(e);
         }
-        
-        var json = await response.Content.ReadAsStringAsync();
-        var jsonObject = JsonNode.Parse(json);
-        
-        return ResultError.Fail("Not implemented");
     }
 }

Manager.YouTube/Util/AuthenticationUtilities.cs

@@ -9,20 +9,23 @@ public static class AuthenticationUtilities
 {
     private const string HeaderScheme = "SAPISIDHASH";
     
-    // Dave Thomas @ https://stackoverflow.com/a/32065323/9948300
+    // Dave Thomas & windy for updated answer @ https://stackoverflow.com/a/32065323/9948300
     public static AuthenticationHeaderValue? GetSapisidHashHeader(string datasyncId, string sapisid, string origin)
     {
         var strHash = GetSapisidHash(datasyncId, sapisid, origin);
-        return new AuthenticationHeaderValue(HeaderScheme, strHash);
+        return strHash == null ? null : new AuthenticationHeaderValue(HeaderScheme, strHash);
     }
 
-    public static string? GetSapisidHash(string datasyncId, string sapisid, string origin)
+    public static string? GetSapisidHash(string datasyncId, string sapisid, string origin, string? time = null)
     {
         if (string.IsNullOrWhiteSpace(datasyncId) || string.IsNullOrWhiteSpace(sapisid) || string.IsNullOrWhiteSpace(origin))
             return null;
         datasyncId = datasyncId.Replace("||", "");
         sapisid = Uri.UnescapeDataString(sapisid);
-        var time = GetTime();
+        if (string.IsNullOrWhiteSpace(time))
+        {
+            time = GetTime();
+        }
         var sha1 = HashString($"{datasyncId} {time} {sapisid} {origin}");
         var completeHash = $"{time}_{sha1}_u";
         return completeHash;

Manager.YouTube/YouTubeClient.cs

@@ -1,4 +1,5 @@
 using System.Net;
+using DotBased.Monads;
 using Manager.YouTube.Models.Innertube;
 
 namespace Manager.YouTube;
@@ -7,10 +8,13 @@ public sealed class YouTubeClient : IDisposable
 {
     public string Id { get; private set; } = "";
     public string AccountName => ClientState?.UserAccountName ?? "";
+    public string? AccountHandle { get; set; }
+    public string? AccountImage { get; set; }
     public string? UserAgent { get; set; }
-    public CookieContainer CookieContainer { get; } = new();
+    public CookieContainer CookieContainer { get; } = new() { PerDomainCapacity = 50 };
     public ClientState? ClientState { get; private set; }
-    public Cookie? SapisidCookie => CookieContainer.GetAllCookies()["SAPISID"] ?? CookieContainer.GetAllCookies()["__Secure-3PAPISID"];
+    public List<string> DatasyncIds { get; set; } = [];
+    public Cookie? SapisidCookie => CookieContainer.GetAllCookies()["SAPISID"];
     public HttpClient? GetHttpClient() => _httpClient;
 
     private HttpClient? _httpClient;
@@ -31,21 +35,48 @@ public sealed class YouTubeClient : IDisposable
             CookieContainer = CookieContainer
         };
         _httpClient = new HttpClient(clientHandler);
+        _httpClient.DefaultRequestHeaders.Clear();
     }
 
-    public async Task GetStateAsync()
+    public async Task<Result> BuildClientAsync()
     {
         if (ClientState == null || !ClientState.LoggedIn)
         {
             var state = await NetworkService.GetClientStateAsync(this);
             if (!state.IsSuccess)
             {
-                return;
+                return state;
             }
             ClientState = state.Value;
         }
+
+        if (string.IsNullOrWhiteSpace(ClientState.WebPlayerContextConfig?.WebPlayerContext?.DatasyncId))
+        {
+            var datasyncResult = await NetworkService.GetDatasyncIds(this);
+            if (!datasyncResult.IsSuccess)
+            {
+                return datasyncResult;
+            }
+
+            foreach (var id in datasyncResult.Value)
+            {
+                if (DatasyncIds.Contains(id))
+                    continue;
+                DatasyncIds.Add(id);
+            }
+        }
+
+        var accountInfoResult = await NetworkService.GetCurrentAccountInfoAsync(this);
+        if (!accountInfoResult.IsSuccess)
+        {
+            return accountInfoResult;
+        }
+
+        Id = accountInfoResult.Value.AccountId ?? "";
+        AccountHandle = accountInfoResult.Value.AccountHandle;
+        AccountImage = accountInfoResult.Value.ImageUrl;
         
-        var accountInfo = await NetworkService.GetCurrentAccountInfoAsync(this);
+        return Result.Success();
     }
 
     public void Dispose()