From e52b6cf122acf7bf89bb58fadfa0fe438b8257ba Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Thu, 13 Jul 2023 12:45:41 +0500 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D1=80=D0=B5=D0=B2=D1=8C=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AsbCloudApp/Data/User/UserDto.cs | 3 +++ AsbCloudWebApi/DependencyInjection.cs | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/AsbCloudApp/Data/User/UserDto.cs b/AsbCloudApp/Data/User/UserDto.cs index 4adf7356..184c7ec6 100644 --- a/AsbCloudApp/Data/User/UserDto.cs +++ b/AsbCloudApp/Data/User/UserDto.cs @@ -62,6 +62,9 @@ namespace AsbCloudApp.Data.User /// /// Id состояния пользователя + /// 0 - не активен, + /// 1 - активен, + /// 2 - заблокирован /// public short IdState { get; set; } diff --git a/AsbCloudWebApi/DependencyInjection.cs b/AsbCloudWebApi/DependencyInjection.cs index 53202467..eb358bef 100644 --- a/AsbCloudWebApi/DependencyInjection.cs +++ b/AsbCloudWebApi/DependencyInjection.cs @@ -117,9 +117,13 @@ namespace AsbCloudWebApi var userService = services.BuildServiceProvider().GetRequiredService(); var user = userService.GetOrDefault(idUser.Value); - if (user is null || user.IdState != User.ActiveStateId) + if (user is null) { - context.Fail("invaild user data"); + context.Fail("user is null"); + } + else if (user.IdState != User.ActiveStateId) + { + context.Fail("user is not active"); } return Task.CompletedTask;