Change response for unknown user case

leaderboardsgg · Aug 16, 2023 · 526eb18 · 526eb18
1 parent 839e80f
commit 526eb18
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/LeaderboardBackend.Test/Features/Users/AccountConfirmationTests.cs b/LeaderboardBackend.Test/Features/Users/AccountConfirmationTests.cs
@@ -43,7 +43,7 @@ public async Task ResendConfirmation_Unauthorised()
     }
 
     [Test]
-    public async Task ResendConfirmation_NotFound_ShouldGet500()
+    public async Task ResendConfirmation_NotFound_ShouldGet401()
     {
         string token = _authService.GenerateJSONWebToken(new()
         {
@@ -55,7 +55,7 @@ public async Task ResendConfirmation_NotFound_ShouldGet500()
         Client.DefaultRequestHeaders.Authorization = AuthenticationHeaderValue.Parse($"Bearer {token}");
         HttpResponseMessage res = await Client.PostAsync(RESEND_CONFIRMATION_URI, null);
 
-        res.Should().HaveStatusCode(HttpStatusCode.InternalServerError);
+        res.Should().HaveStatusCode(HttpStatusCode.Unauthorized);
     }
 
     [Test]

diff --git a/LeaderboardBackend/Controllers/AccountController.cs b/LeaderboardBackend/Controllers/AccountController.cs
@@ -132,23 +132,14 @@ public async Task<ActionResult<LoginResponse>> Login([FromBody] LoginRequest req
     ///     The request doesn't contain a valid session token.
     /// </response>
     /// <response code="409">
-    ///     A `User` with the specified username or email already exists.<br/><br/>
-    ///     Validation error codes by property:
-    ///     - **Username**:
-    ///       - **UsernameTaken**: the username is already in use
-    ///     - **Email**:
-    ///       - **EmailAlreadyUsed**: the email is already in use
-    /// </response>
-    /// <response code="500">
-    ///     Internal server error.
+    ///     The `User`'s account has already been confirmed.
     /// </response>
     [HttpPost("confirm")]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status400BadRequest)]
     [ProducesResponseType(StatusCodes.Status401Unauthorized)]
     [ProducesResponseType(StatusCodes.Status409Conflict)]
     [ProducesResponseType(StatusCodes.Status429TooManyRequests)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
     public async Task<ActionResult> ResendConfirmation(
         [FromServices] IAuthService authService,
         [FromServices] IAccountConfirmationService confirmationService,
@@ -165,10 +156,10 @@ [FromServices] IEmailSender emailSender
             return Ok();
         }
 
-        return errors.Match(
+        return errors.Match<ActionResult>(
             badCredentials => Unauthorized(),
-            // Shouldn't be possible; throw 500
-            notFound => StatusCode(StatusCodes.Status500InternalServerError),
+            // Shouldn't be possible; throw 401
+            notFound => Unauthorized(),
             badRole => Conflict()
         );
     }

diff --git a/LeaderboardBackend/openapi.json b/LeaderboardBackend/openapi.json
@@ -208,7 +208,7 @@
             }
           },
           "409": {
-            "description": "A `User` with the specified username or email already exists.<br /><br />\r\nValidation error codes by property:\r\n- **Username**:\r\n  - **UsernameTaken**: the username is already in use\r\n- **Email**:\r\n  - **EmailAlreadyUsed**: the email is already in use",
+            "description": "The `User`'s account has already been confirmed.",
             "content": {
               "application/json": {
                 "schema": {
@@ -236,9 +236,6 @@
                 }
               }
             }
-          },
-          "500": {
-            "description": "Internal server error."
           }
         }
       }