Полностью переписанное api

YandexMusic.API/Requests/Account/YGetMusicTokenBuilder.cs

@@ -1,35 +1,25 @@
 using System.Net;
 using System.Net.Http.Headers;
-
-using YandexMusic.API.Common;
 using YandexMusic.API.Models.Account;
 using YandexMusic.API.Requests.Common;
-using YandexMusic.API.Requests.Common.Attributes;
 
 namespace YandexMusic.API.Requests.Account;
 
-[YOAuthMobile(WebRequestMethods.Http.Post, "/1/token")]
-internal class YGetMusicTokenBuilder : YRequestBuilder<YAccessToken, string>
+public class YGetMusicTokenBuilder : YAuthRequestBuilder<YAccessToken?, object>
 {
-    public YGetMusicTokenBuilder(YandexMusicApi yandex, AuthStorage auth) : base(yandex, auth)
-    {
-    }
-
-    protected override HttpContent GetContent(string tuple)
-    {
-        return new FormUrlEncodedContent(new Dictionary<string, string>
+    public YGetMusicTokenBuilder(YandexMusicApi api) : base(api) { }
+    protected override string Method => WebRequestMethods.Http.Post;
+    protected override string PathTemplate => "/1/token";
+    protected override HttpContent? GetContent(object _)
+        => new FormUrlEncodedContent(new Dictionary<string, string>
         {
             { "client_id", YConstants.ClientId },
             { "client_secret", YConstants.ClientSecret },
             { "grant_type", "x-token" },
-            { "access_token", storage.AccessToken.AccessToken }
+            { "access_token", Api.Storage.AccessToken.AccessToken }
         });
-    }
-
     protected override void SetCustomHeaders(HttpRequestHeaders headers)
     {
         headers.Remove("Authorization");
-
-        base.SetCustomHeaders(headers);
     }
 }