Merge pull request #95 from Gml-Launcher/1.0.2

Update to v1.0.2
Gml-Launcher · Dec 5, 2024 · dfff83a · dfff83a
2 parents a7696aa + 9f9694a
commit dfff83a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/src/Gml.Core b/src/Gml.Core
diff --git a/src/Gml.Web.Api.Domains/Integrations/UnicoreAuthResult.cs b/src/Gml.Web.Api.Domains/Integrations/UnicoreAuthResult.cs
@@ -41,9 +41,6 @@ public class User
     [JsonProperty("password")]
     public string Password { get; set; }
 
-    [JsonProperty("superuser")]
-    public bool Superuser { get; set; }
-
     [JsonProperty("activated")]
     public bool Activated { get; set; }
 

diff --git a/src/Gml.Web.Api/Core/Handlers/AuthIntegrationHandler.cs b/src/Gml.Web.Api/Core/Handlers/AuthIntegrationHandler.cs
@@ -103,10 +103,10 @@ public static async Task<IResult> AuthWithToken(
                     "Не удалось определить устройство, с которого произошла авторизация",
                     HttpStatusCode.BadRequest));
 
-            if (authType is not AuthType.Any && string.IsNullOrEmpty(authDto.Password))
+            if (authType is not AuthType.Any && string.IsNullOrEmpty(authDto.AccessToken))
             {
                 return Results.BadRequest(ResponseMessage.Create(
-                    "Не указан пароль при авторизации!",
+                    "Не был передан AccessToken",
                     HttpStatusCode.BadRequest));
             }
 

diff --git a/src/Gml.Web.Api/Core/Integrations/Auth/AzuriomAuthService.cs b/src/Gml.Web.Api/Core/Integrations/Auth/AzuriomAuthService.cs
@@ -34,6 +34,15 @@ public async Task<AuthResult> Auth(string login, string password)
 
         var model = JsonConvert.DeserializeObject<AzuriomAuthResult>(resultContent);
 
+        if (!result.IsSuccessStatusCode && resultContent.Contains("invalid_credentials", StringComparison.OrdinalIgnoreCase))
+        {
+            return new AuthResult
+            {
+                IsSuccess = false,
+                Message = $"Неверный логин или пароль."
+            };
+        }
+
         if (model is null || model.Banned || !result.IsSuccessStatusCode || (!result.IsSuccessStatusCode && resultContent.Contains("banned", StringComparison.OrdinalIgnoreCase)))
         {
             return new AuthResult