Skip to content

Commit 19dbf19

Browse files
authored
fix(coder): properly check for missing organization membership
Fixes a possible panic introduced in #9781.
1 parent 71ad590 commit 19dbf19

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

coderd/users.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1167,12 +1167,12 @@ func convertUsers(users []database.User, organizationIDsByUserID map[uuid.UUID][
11671167

11681168
func userOrganizationIDs(ctx context.Context, api *API, user database.User) ([]uuid.UUID, error) {
11691169
organizationIDsByMemberIDsRows, err := api.Database.GetOrganizationIDsByMemberIDs(ctx, []uuid.UUID{user.ID})
1170-
if errors.Is(err, sql.ErrNoRows) {
1171-
return []uuid.UUID{}, xerrors.Errorf("user %q must be a member of at least one organization", user.Email)
1172-
}
11731170
if err != nil {
11741171
return []uuid.UUID{}, err
11751172
}
1173+
if len(organizationIDsByMemberIDsRows) == 0 {
1174+
return []uuid.UUID{}, xerrors.Errorf("user %q must be a member of at least one organization", user.Email)
1175+
}
11761176
member := organizationIDsByMemberIDsRows[0]
11771177
return member.OrganizationIDs, nil
11781178
}

0 commit comments

Comments
 (0)