Return 404 error

Emyrk · Emyrk · commit a261c45badea · 2023-10-09T18:53:00.000-05:00
diff --git a/coderd/httpmw/userparam.go b/coderd/httpmw/userparam.go
@@ -83,6 +83,10 @@ func ExtractUserParam(db database.Store, redirectToLoginOnMe bool) func(http.Han
 			} else if userID, err := uuid.Parse(userQuery); err == nil {
 				//nolint:gocritic // If the userQuery is a valid uuid
 				user, err = db.GetUserByID(ctx, userID)
+				if httpapi.Is404Error(err) {
+					httpapi.ResourceNotFound(rw)
+					return
+				}
 				if err != nil {
 					httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 						Message: userErrorMessage,
@@ -95,6 +99,10 @@ func ExtractUserParam(db database.Store, redirectToLoginOnMe bool) func(http.Han
 				user, err = db.GetUserByEmailOrUsername(ctx, database.GetUserByEmailOrUsernameParams{
 					Username: userQuery,
 				})
+				if httpapi.Is404Error(err) {
+					httpapi.ResourceNotFound(rw)
+					return
+				}
 				if err != nil {
 					httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
 						Message: userErrorMessage,
diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -1204,7 +1204,11 @@ func TestGetUser(t *testing.T) {
 		uClient, _ := coderdtest.CreateAnotherUser(t, client, firstUser.OrganizationID)
 
 		_, err := uClient.User(ctx, firstUser.UserID.String())
-		require.NoError(t, err)
+		require.Error(t, err)
+		var sdkError *codersdk.Error
+		require.ErrorAs(t, err, &sdkError, "is codersdk error")
+		require.Equal(t, sdkError.StatusCode(), 404, "expected 404")
+
 	})
 }
 
