Актуализированы модели авторизации (#19)

* Actualize authorization models Return of authorization methods changed from (bool) to (YAuthBase and its childs) * Fix AuthorizeByCaptcha return * Reaction to #19
K1llMan · Jan 23, 2023 · e529e9f · e529e9f
1 parent 97e4e8a
commit e529e9f
Show file tree

Hide file tree

Showing 10 changed files with 101 additions and 28 deletions.
diff --git a/src/Yandex.Music.Api/API/YUserAPI.cs b/src/Yandex.Music.Api/API/YUserAPI.cs
@@ -254,24 +254,28 @@ public string GetAuthQRLink(AuthStorage storage)
         /// </summary>
         /// <param name="storage">Хранилище</param>
         /// <returns></returns>
-        public Task<bool> AuthorizeByQRAsync(AuthStorage storage)
+        public async Task<YAuthQRStatus> AuthorizeByQRAsync(AuthStorage storage)
         {
             if (storage.AuthToken == null)
                 throw new Exception("Не выполнен запрос на авторизацию по QR.");
 
             try
             {
-                return new YAuthLoginQRBuilder(api, storage)
+                return await new YAuthLoginQRBuilder(api, storage)
                     .Build(null)
                     .GetResponseAsync()
                     .ContinueWith(task => {
                         YAuthQRStatus qrStatus = task.Result;
                         if (qrStatus.Status != YAuthStatus.Ok)
+                            return qrStatus;
+
+                        bool ok = LoginByCookiesAsync(storage).GetAwaiter().GetResult();
+                        if (!ok)
+                        {
                             throw new Exception("Ошибка авторизации по QR.");
+                        }
 
-                        return LoginByCookiesAsync(storage)
-                            .GetAwaiter()
-                            .GetResult();
+                        return qrStatus;
                     });
             }
             catch (Exception ex)
@@ -285,7 +289,7 @@ public Task<bool> AuthorizeByQRAsync(AuthStorage storage)
         /// </summary>
         /// <param name="storage">Хранилище</param>
         /// <returns></returns>
-        public bool AuthorizeByQR(AuthStorage storage)
+        public YAuthQRStatus AuthorizeByQR(AuthStorage storage)
         {
             return AuthorizeByQRAsync(storage).GetAwaiter().GetResult();
         }
@@ -399,21 +403,25 @@ public bool AuthorizeByLetter(AuthStorage storage)
         /// <param name="storage">Хранилище</param>
         /// <param name="password">Пароль</param>
         /// <returns></returns>
-        public Task<bool> AuthorizeByAppPasswordAsync(AuthStorage storage, string password)
+        public async Task<YAuthBase> AuthorizeByAppPasswordAsync(AuthStorage storage, string password)
         {
             if (storage.AuthToken == null || string.IsNullOrWhiteSpace(storage.AuthToken.CsfrToken))
                 throw new AuthenticationException($"Не найдена сессия входа. Выполните {nameof(CreateAuthSessionAsync)} перед использованием.");
 
-            YAuthBase response = new YAuthAppPasswordBuilder(api, storage)
+            YAuthBase response = await new YAuthAppPasswordBuilder(api, storage)
                 .Build(password)
-                .GetResponseAsync()
-                .GetAwaiter()
-                .GetResult();
+                .GetResponseAsync();
 
-            if (response.Status != YAuthStatus.Ok || !string.IsNullOrWhiteSpace(response.RedirectUrl))
-                throw new AuthenticationException("Ошибка авторизации.");
+            if (response.Status == YAuthStatus.Ok)
+            {
+                bool ok = await LoginByCookiesAsync(storage);
+                if (!ok)
+                {
+                    throw new AuthenticationException("Ошибка авторизации.");
+                }
+            }
 
-            return LoginByCookiesAsync(storage);
+            return response;
         }
 
         /// <summary>
@@ -422,7 +430,7 @@ public Task<bool> AuthorizeByAppPasswordAsync(AuthStorage storage, string passwo
         /// <param name="storage">Хранилище</param>
         /// <param name="password">Пароль</param>
         /// <returns></returns>
-        public bool AuthorizeByAppPassword(AuthStorage storage, string password)
+        public YAuthBase AuthorizeByAppPassword(AuthStorage storage, string password)
         {
             return AuthorizeByAppPasswordAsync(storage, password).GetAwaiter().GetResult();
         }
@@ -454,4 +462,4 @@ public YAccessToken GetAccessToken(AuthStorage storage)
 
         #endregion Основные функции
     }
-}
+}
diff --git a/src/Yandex.Music.Api/Models/Account/YAuthBase.cs b/src/Yandex.Music.Api/Models/Account/YAuthBase.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Yandex.Music.Api.Models.Account
 {
@@ -8,5 +9,7 @@ public class YAuthBase
 
         [JsonProperty("redirect_url")]
         public string RedirectUrl { get; set; }
+
+        public List<YAuthError> Errors { get; set; }
     }
-}
+}
diff --git a/src/Yandex.Music.Api/Models/Account/YAuthCaptcha.cs b/src/Yandex.Music.Api/Models/Account/YAuthCaptcha.cs
@@ -1,16 +1,31 @@
-using Newtonsoft.Json;
+using System.Collections.Generic;
+using Newtonsoft.Json;
 
 namespace Yandex.Music.Api.Models.Account
 {
     public class YAuthCaptcha : YAuthBase
     {
         public string Id { get; set; }
 
+        public string Name { get; set; }
+
+        public string Label { get; set; }
+
+        public string Mode { get; set; }
+
+        public List<YAuthCaptchaError> Error { get; set; }
+
+        public bool CountryFromAudioWhiteList { get; set; }
+
+        public YAuthCaptchaOptions Options { get; set; }
+
+        public YAuthCaptchaVoice Voice { get; set; }
+
         [JsonProperty("image_url")]
         public string ImageUrl { get; set; }
 
         public string Key { get; set; }
 
-        public YAuthCaptchaVoice Voice { get; set; }
+        public string Static { get; set; }
     }
-}
+}
diff --git a/src/Yandex.Music.Api/Models/Account/YAuthCaptchaError.cs b/src/Yandex.Music.Api/Models/Account/YAuthCaptchaError.cs
@@ -0,0 +1,8 @@
+namespace Yandex.Music.Api.Models.Account
+{
+    public class YAuthCaptchaError
+    {
+        public string Message { get; set; }
+        public YAuthCaptchaErrorCode Code { get; set; }
+    }
+}
diff --git a/src/Yandex.Music.Api/Models/Account/YAuthCaptchaErrorCode.cs b/src/Yandex.Music.Api/Models/Account/YAuthCaptchaErrorCode.cs
@@ -0,0 +1,9 @@
+namespace Yandex.Music.Api.Models.Account
+{
+    public enum YAuthCaptchaErrorCode
+    {
+        MissingValue,
+        CaptchaLocate,
+        Incorrect
+    }
+}
diff --git a/src/Yandex.Music.Api/Models/Account/YAuthCaptchaOptions.cs b/src/Yandex.Music.Api/Models/Account/YAuthCaptchaOptions.cs
@@ -0,0 +1,7 @@
+namespace Yandex.Music.Api.Models.Account
+{
+    public class YAuthCaptchaOptions
+    {
+        public bool AsyncCheck { get; set; }
+    }
+}
diff --git a/src/Yandex.Music.Api/Models/Account/YAuthError.cs b/src/Yandex.Music.Api/Models/Account/YAuthError.cs
@@ -0,0 +1,20 @@
+using System.Runtime.Serialization;
+
+namespace Yandex.Music.Api.Models.Account
+{
+    public enum YAuthError
+    {
+        [EnumMember(Value = "authorization.invalid")]
+        AuthorizationInvalid,
+        [EnumMember(Value = "sessionid.invalid")]
+        SessionIdInvalid,
+        [EnumMember(Value = "password.not_matched")]
+        PasswordNotMatched,
+        [EnumMember(Value = "password.empty")]
+        PasswordEmpty,
+        [EnumMember(Value = "captcha.required")]
+        CaptchaRequired,
+        [EnumMember(Value = "captcha.not_matched")]
+        CaptchaNotMatched
+    }
+}
diff --git a/src/Yandex.Music.Api/Models/Account/YAuthQrStatus.cs b/src/Yandex.Music.Api/Models/Account/YAuthQrStatus.cs
@@ -15,5 +15,7 @@ public class YAuthQRStatus : YAuthBase
         public string Id { get; set; }
 
         public string State { get; set; }
+
+        public YAuthCaptcha Captcha { get; set; }
     }
-}
+}
diff --git a/src/Yandex.Music.Api/Models/Account/YAuthStatus.cs b/src/Yandex.Music.Api/Models/Account/YAuthStatus.cs
@@ -2,6 +2,7 @@
 {
     public enum YAuthStatus
     {
-        Ok
+        Ok,
+        Error
     }
-}
+}
diff --git a/src/Yandex.Music.Client/YandexMusicClient.cs b/src/Yandex.Music.Client/YandexMusicClient.cs
@@ -75,7 +75,7 @@ public string GetAuthQRLink()
             return api.User.GetAuthQRLink(storage);
         }
 
-        public bool AuthorizeByQR()
+        public YAuthQRStatus AuthorizeByQR()
         {
             return api.User.AuthorizeByQR(storage);
         }
@@ -85,9 +85,9 @@ public YAuthCaptcha GetCaptcha()
             return api.User.GetCaptcha(storage);
         }
 
-        public void AuthorizeByCaptcha(string captcha)
+        public YAuthBase AuthorizeByCaptcha(string captcha)
         {
-            api.User.AuthorizeByCaptcha(storage, captcha);
+            return api.User.AuthorizeByCaptcha(storage, captcha);
         }
 
         public YAuthLetter GetAuthLetter()
@@ -100,7 +100,7 @@ public bool AuthorizeByLetter()
             return api.User.AuthorizeByLetter(storage);
         }
 
-        public bool AuthorizeByAppPassword(string password)
+        public YAuthBase AuthorizeByAppPassword(string password)
         {
             return api.User.AuthorizeByAppPassword(storage, password);
         }