Skip to content

Commit f510742

Browse files
authored
Merge pull request #68 from boolean-uk/67-hotfix---fix-register-no-need-to-validate-username
Refactor request DTO
2 parents e1f51a1 + 1da42b5 commit f510742

4 files changed

Lines changed: 0 additions & 26 deletions

File tree

exercise.tests/Helpers/UserTestCases.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ public static IEnumerable<TestCaseData> ValidRegisterCases()
1414

1515
public static IEnumerable<TestCaseData> InvalidRegisterCases()
1616
{
17-
yield return new TestCaseData("ThisIsWayTooLong123ThisIsWayTooLong123ThisIsWayTooLong123", "valid@email.com", "ValidPass1!").SetName("Invalid: Username too long (register)");
18-
yield return new TestCaseData("", "valid@email.com", "ValidPass1!").SetName("Invalid: Username too short (register)");
1917
yield return new TestCaseData("validuser", "plainaddress", "ValidPass1!").SetName("Invalid: Invalid email format (register)");
2018
yield return new TestCaseData("validuser", "user@domain.c", "ValidPass1!").SetName("Invalid: Invalid email domain (register)");
2119
yield return new TestCaseData("validuser", "valid@email.com", "short1!").SetName("Invalid: Password too short (register)");

exercise.tests/IntegrationTests/UserTests.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ public async Task Register_success(string username, string email, string passwor
4343

4444
RegisterRequestDTO body = new RegisterRequestDTO {
4545
email = $"{uniqueId}{email}",
46-
firstName = "Ole",
47-
lastName = "Petterson",
48-
bio = "Min bio er vakker",
49-
githubUsername = uniqueUsername,
50-
username = uniqueUsername,
5146
password = password
5247
};
5348
var json = JsonSerializer.Serialize(body);
@@ -80,11 +75,6 @@ public async Task Register_Failure(string username, string email, string passwor
8075
RegisterRequestDTO body = new RegisterRequestDTO
8176
{
8277
email = $"{uniqueId}{email}",
83-
firstName = firstName,
84-
lastName = lastName,
85-
bio = "Min bio er vakker",
86-
githubUsername = uniqueUsername,
87-
username =uniqueUsername,
8878
password = password
8979
};
9080

exercise.wwwapi/DTOs/Register/RegisterRequestDTO.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,5 @@ public class RegisterRequestDTO
77
{
88
public required string email { get; set; }
99
public required string password { get; set; }
10-
public string? firstName { get; set; }
11-
public string? lastName { get; set; }
12-
public string? bio { get; set; }
13-
public string? githubUsername { get; set; }
14-
public string? username { get; set; }
1510
}
1611
}

exercise.wwwapi/Endpoints/UserEndpoints.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ private static IResult Register(RegisterRequestDTO request, IRepository<User> se
6161
// check valid email
6262
string emailValidation = Validator.Email(request.email);
6363
if (emailValidation != "Accepted") return TypedResults.BadRequest(new ResponseDTO<Object>() { Message = emailValidation });
64-
// check valid username
65-
string usernameValidation = Validator.Username(request.username);
66-
if (usernameValidation != "Accepted") return TypedResults.BadRequest(new ResponseDTO<Object>() { Message = usernameValidation });
6764

68-
// ecxist checks
6965
// check if email is in database
7066
var emailExists = service.GetAllFiltered(q => q.Email == request.email);
7167
if (emailExists.Count() != 0) return Results.Conflict(new ResponseDTO<Object>() { Message = "Fail" });
@@ -75,13 +71,8 @@ private static IResult Register(RegisterRequestDTO request, IRepository<User> se
7571

7672
var user = new User();
7773

78-
user.Username = !string.IsNullOrEmpty(request.username) ? request.username : request.email;
7974
user.PasswordHash = passwordHash;
8075
user.Email = request.email;
81-
user.FirstName = !string.IsNullOrEmpty(request.firstName) ? request.firstName : string.Empty;
82-
user.LastName = !string.IsNullOrEmpty(request.lastName) ? request.lastName : string.Empty;
83-
user.Bio = !string.IsNullOrEmpty(request.bio) ? request.bio : string.Empty;
84-
user.GithubUsername = !string.IsNullOrEmpty(request.githubUsername) ? request.githubUsername : string.Empty;
8576

8677
service.Insert(user);
8778
service.Save();

0 commit comments

Comments
 (0)