Minor fixes for model validation
This commit is contained in:
@@ -19,7 +19,7 @@ public class AuthenticatedUser
|
||||
FirstName = user.FirstName;
|
||||
LastName = user.LastName;
|
||||
Email = user.Email;
|
||||
Role = new UserRole();
|
||||
Role = new UserRole(user.Role!);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace BasicDotnetTemplate.MainProject.Models.Api.Data.Auth;
|
||||
|
||||
public class AuthenticateRequestData
|
||||
{
|
||||
#nullable enable
|
||||
public string? Email { get; set; }
|
||||
public string? Password { get; set; }
|
||||
#nullable disable
|
||||
[Required(ErrorMessage = "Email is required")]
|
||||
public required string Email { get; set; }
|
||||
[Required(ErrorMessage = "Password is required")]
|
||||
public required string Password { get; set; }
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using BasicDotnetTemplate.MainProject.Models.Api.Data.Auth;
|
||||
|
||||
namespace BasicDotnetTemplate.MainProject.Models.Api.Request.Auth;
|
||||
|
||||
public class AuthenticateRequest
|
||||
{
|
||||
#nullable enable
|
||||
public AuthenticateRequestData? Data { get; set; }
|
||||
#nullable disable
|
||||
[Required(ErrorMessage = "Data is required")]
|
||||
public required AuthenticateRequestData Data { get; set; }
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using BasicDotnetTemplate.MainProject.Models.Api.Data.Role;
|
||||
|
||||
namespace BasicDotnetTemplate.MainProject.Models.Api.Request.Role;
|
||||
|
||||
public class CreateRoleRequest
|
||||
{
|
||||
#nullable enable
|
||||
public CreateRoleRequestData? Data { get; set; }
|
||||
#nullable disable
|
||||
[Required(ErrorMessage = "Data is required")]
|
||||
public required CreateRoleRequestData? Data { get; set; }
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using BasicDotnetTemplate.MainProject.Models.Api.Data.User;
|
||||
|
||||
namespace BasicDotnetTemplate.MainProject.Models.Api.Request.User;
|
||||
|
||||
public class CreateUserRequest
|
||||
{
|
||||
#nullable enable
|
||||
public CreateUserRequestData? Data { get; set; }
|
||||
#nullable disable
|
||||
[Required(ErrorMessage = "Data is required")]
|
||||
public required CreateUserRequestData Data { get; set; }
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using BasicDotnetTemplate.MainProject.Models.Api.Data.User;
|
||||
|
||||
namespace BasicDotnetTemplate.MainProject.Models.Api.Request.User;
|
||||
|
||||
public class UpdateUserRequest
|
||||
{
|
||||
#nullable enable
|
||||
public UpdateUserRequestData? Data { get; set; }
|
||||
#nullable disable
|
||||
[Required(ErrorMessage = "Data is required")]
|
||||
public required UpdateUserRequestData Data { get; set; }
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user