new user fixes

Journaly-io · Oct 30, 2023 · 945291f · 945291f
1 parent 643d360
commit 945291f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/JournalyApiV2/Controllers/AuthController.cs b/JournalyApiV2/Controllers/AuthController.cs
@@ -27,6 +27,10 @@ public async Task<IActionResult> CreateUser([FromBody] NewUserRequest request)
         {
             await _authService.CreateUser(request.Email, request.Password, request.FirstName, request.LastName);
         }
+        catch (ArgumentException ex)
+        {
+            return StatusCode(409, ex.Message);
+        }
         catch (Exception ex)
         {
             return StatusCode(500, ex.Message);

diff --git a/JournalyApiV2/Services/BLL/AuthService.cs b/JournalyApiV2/Services/BLL/AuthService.cs
@@ -83,6 +83,7 @@ public async Task<AuthenticationResponse> SignIn(string email, string password)
 
     public async Task CreateUser(string email, string password, string firstName, string lastName)
     {
+        if (await _userManager.FindByEmailAsync(email) != null) throw new ArgumentException("Email already in use");
         var result = await _userManager.CreateAsync(new JournalyUser
         {
             FirstName = firstName,
@@ -145,6 +146,7 @@ public async Task<AuthenticationResponse> ChangeEmail(string email, Guid userId,
         var user = await _userManager.FindByIdAsync(userId.ToString());
         if (user == null) throw new ArgumentException("User not found");
         user.Email = email;
+        user.UserName = email;
         await _userManager.UpdateAsync(user);
 
         // Generate new JWT and associated refresh token with the name updated