fix: user should always belong to an organization (#9781)

mtojek · web-flow · commit ceb52ac24a48 · 2023-09-19T16:22:37.000+02:00
diff --git a/coderd/users.go b/coderd/users.go
@@ -1165,8 +1165,8 @@ func convertUsers(users []database.User, organizationIDsByUserID map[uuid.UUID][
 
 func userOrganizationIDs(ctx context.Context, api *API, user database.User) ([]uuid.UUID, error) {
 	organizationIDsByMemberIDsRows, err := api.Database.GetOrganizationIDsByMemberIDs(ctx, []uuid.UUID{user.ID})
-	if errors.Is(err, sql.ErrNoRows) || len(organizationIDsByMemberIDsRows) == 0 {
-		return []uuid.UUID{}, nil
+	if errors.Is(err, sql.ErrNoRows) {
+		return []uuid.UUID{}, xerrors.Errorf("user %q must be a member of at least one organization", user.Email)
 	}
 	if err != nil {
 		return []uuid.UUID{}, err
