From b8899d59d10de0f2fd7afb90103245cda4a22c60 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Fri, 19 Jul 2024 16:24:55 -0500 Subject: [PATCH] chore: although unfortunate, it is possible for a user to be in no orgs --- coderd/database/dbmem/dbmem.go | 3 --- coderd/users.go | 5 ++++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go index 198b4b4f3b6a9..b8ca0c74a837c 100644 --- a/coderd/database/dbmem/dbmem.go +++ b/coderd/database/dbmem/dbmem.go @@ -3006,9 +3006,6 @@ func (q *FakeQuerier) GetOrganizationIDsByMemberIDs(_ context.Context, ids []uui OrganizationIDs: userOrganizationIDs, }) } - if len(getOrganizationIDsByMemberIDRows) == 0 { - return nil, sql.ErrNoRows - } return getOrganizationIDsByMemberIDRows, nil } diff --git a/coderd/users.go b/coderd/users.go index 0cfcc63f9a3ed..bf06bba69498f 100644 --- a/coderd/users.go +++ b/coderd/users.go @@ -1293,9 +1293,12 @@ func userOrganizationIDs(ctx context.Context, api *API, user database.User) ([]u if err != nil { return []uuid.UUID{}, err } + + // If you are in no orgs, then return an empty list. if len(organizationIDsByMemberIDsRows) == 0 { - return []uuid.UUID{}, xerrors.Errorf("user %q must be a member of at least one organization", user.Email) + return []uuid.UUID{}, nil } + member := organizationIDsByMemberIDsRows[0] return member.OrganizationIDs, nil }