Skip to content

Commit 3ab1242

Browse files
authored
User email lower-case and unique emails (#53)
1 parent e5b30af commit 3ab1242

File tree

2 files changed

+20
-19
lines changed

2 files changed

+20
-19
lines changed

backend/RecAPI/Users/UserInput.cs

-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ public class RegisterUserInput
2424
public string FirstName { get; set; }
2525
[GraphQLNonNullType]
2626
public string LastName { get; set; }
27-
[GraphQLNonNullType]
28-
public DateTime BirtDate { get; set; }
2927
}
3028

3129
public class UpdateUserInput
@@ -34,7 +32,6 @@ public class UpdateUserInput
3432
public string PhoneNumber { get; set; }
3533
public string FirstName { get; set; }
3634
public string LastName { get; set; }
37-
public DateTime? BirtDate { get; set; }
3835

3936
[Authorize(Policy = "internal")]
4037
public List<DateTime>? BusyTime { get; set; }

backend/RecAPI/Users/UserMutation.cs

+20-16
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,21 @@ public bool RegisterUser(
4242
[Service] IUserRepository userRepository
4343
)
4444
{
45+
registerUser.Email = registerUser.Email.ToLower();
46+
var existingUser = userRepository.GetUserByEmail(registerUser.Email);
47+
if (existingUser != null)
48+
{
49+
UserError.UserNotAvailableError(registerUser.Email);
50+
return false;
51+
}
4552
var authUserId = authService.RegisterUser(registerUser.Email, registerUser.Password, authRepository);
46-
registerUser.Password = null;
4753
var user = new User()
4854
{
4955
AuthId = authUserId,
5056
Email = registerUser.Email,
5157
PhoneNumber = registerUser.PhoneNumber,
5258
FirstName = registerUser.FirstName,
5359
LastName = registerUser.LastName,
54-
BirtDate = registerUser.BirtDate,
5560
Approved = registerUser.Email.Contains("@isfit.no")
5661
};
5762
var storedUser = userRepository.CreateUser(user);
@@ -77,20 +82,19 @@ [Service] IAuthRepository authRepository
7782
{
7883
UserError.UserExistError(userEmail);
7984
}
80-
User updatedUser = new User()
81-
{
82-
Id = prevUser.Id,
83-
AuthId = prevUser.AuthId,
84-
Email = prevUser.Email,
85-
PhoneNumber = input.PhoneNumber ?? prevUser.PhoneNumber,
86-
FirstName = input.FirstName ?? prevUser.FirstName,
87-
LastName = input.LastName ?? prevUser.LastName,
88-
BirtDate = input.BirtDate ?? prevUser.BirtDate,
89-
BusyTime = input.BusyTime ?? prevUser.BusyTime,
90-
InterviewTime = prevUser.InterviewTime,
91-
Sections = prevUser.Sections,
92-
Teams = prevUser.Teams,
93-
Approved = prevUser.Approved
85+
User updatedUser = new User()
86+
{
87+
Id = prevUser.Id,
88+
AuthId = prevUser.AuthId,
89+
Email = prevUser.Email,
90+
PhoneNumber = input.PhoneNumber ?? prevUser.PhoneNumber,
91+
FirstName = input.FirstName ?? prevUser.FirstName,
92+
LastName = input.LastName ?? prevUser.LastName,
93+
BusyTime = input.BusyTime ?? prevUser.BusyTime,
94+
InterviewTime = prevUser.InterviewTime,
95+
Sections = prevUser.Sections,
96+
Teams = prevUser.Teams,
97+
Approved = prevUser.Approved
9498
};
9599
return userRepository.UpdateUser(prevUser.Id, updatedUser);
96100
}

0 commit comments

Comments
 (0)