Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 30

Fix saving of teams in invitations (#632)

Browse source
This commit is contained in:
Zach Wasserman 2021-04-12 09:51:05 -07:00 committed by GitHub
parent cdf43a79bd
commit db11f7b6aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/datastore/mysql/invites.go
View file

@ -31,6 +31,7 @@ func (d *Datastore) NewInvite(i *kolide.Invite) (*kolide.Invite, error) {
i.ID = uint(id) i.ID = uint(id)
if len(i.Teams) == 0 { if len(i.Teams) == 0 {
i.Teams = []kolide.UserTeam{}
return i, nil return i, nil
} }

2
server/kolide/invites.go
View file

@ -52,7 +52,7 @@ type InvitePayload struct {
Position *string Position *string
SSOEnabled *bool `json:"sso_enabled"` SSOEnabled *bool `json:"sso_enabled"`
GlobalRole null.String `json:"global_role"` GlobalRole null.String `json:"global_role"`
Teams []UserTeam `json:"teams,omitempty"` Teams []UserTeam `json:"teams"`
} }
// Invite represents an invitation for a user to join Fleet. // Invite represents an invitation for a user to join Fleet.

1
server/service/service_invites.go
View file

@ -39,6 +39,7 @@ func (svc service) InviteNewUser(ctx context.Context, payload kolide.InvitePaylo
InvitedBy: inviter.ID, InvitedBy: inviter.ID,
Token: token, Token: token,
GlobalRole: payload.GlobalRole, GlobalRole: payload.GlobalRole,
Teams: payload.Teams,
} }
if payload.Position != nil { if payload.Position != nil {
invite.Position = *payload.Position invite.Position = *payload.Position