diff --git a/AsbCloudApp/Data/UserBaseDto.cs b/AsbCloudApp/Data/UserBaseDto.cs index 1c4c8d00..b79cc5d4 100644 --- a/AsbCloudApp/Data/UserBaseDto.cs +++ b/AsbCloudApp/Data/UserBaseDto.cs @@ -11,5 +11,11 @@ public string Surname { get; set; } public string Patronymic { get; set; } + + public string Email { get; set; } + + public string Phone { get; set; } + + public string Position { get; set; } } } diff --git a/AsbCloudInfrastructure/Services/AuthService.cs b/AsbCloudInfrastructure/Services/AuthService.cs index 7215b15d..085f2771 100644 --- a/AsbCloudInfrastructure/Services/AuthService.cs +++ b/AsbCloudInfrastructure/Services/AuthService.cs @@ -74,6 +74,15 @@ namespace AsbCloudInfrastructure.Services if (userDto.Password.Length < 3) return -2; + + if (userDto.Email.Length is > 255) + return -3; + + if (userDto.Phone.Length > 50) + return -4; + + if (userDto.Position.Length > 255) + return -5; var salt = GenerateSalt(); @@ -84,6 +93,9 @@ namespace AsbCloudInfrastructure.Services Name = userDto.Name, Surname = userDto.Surname, Patronymic = userDto.Patronymic, + Email = userDto.Email, + Phone = userDto.Phone, + Position = userDto.Position, Level = userDto.Level, Login = userDto.Login, PasswordHash = salt + ComputeHash(salt, userDto.Password) diff --git a/AsbCloudWebApi/Controllers/AuthController.cs b/AsbCloudWebApi/Controllers/AuthController.cs index d3b7a912..f2ce323f 100644 --- a/AsbCloudWebApi/Controllers/AuthController.cs +++ b/AsbCloudWebApi/Controllers/AuthController.cs @@ -71,6 +71,9 @@ namespace AsbCloudWebApi.Controllers 0 => Ok(), -1 => BadRequest("Логин должен быть длиннее 3х знаков."), -2 => BadRequest("Пароль должен быть длиннее 3х знаков."), + -3 => BadRequest("Email не должен быть длиннее 255 знаков."), + -4 => BadRequest("Телефон не должен быть длиннее 50 знаков."), + -5 => BadRequest("Название должности не должно быть длиннее 255 символов."), _ => BadRequest(), }; }