From 625537732b02b9c4f8a9e16521d7e849f17d62ea Mon Sep 17 00:00:00 2001 From: Marcin Tojek Date: Tue, 19 Sep 2023 15:58:38 +0200 Subject: [PATCH] fix: user should always belong to an organization --- coderd/users.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coderd/users.go b/coderd/users.go index 8707ef367c888..bce7136726a84 100644 --- 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