Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add checks if a user is already in the org due to auto_assign_org_id #1752

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add checks if a user is already in the org due to auto_assign_org_id #1752

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion internal/resources/grafana/resource_organization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,11 +399,26 @@ func applyChanges(meta interface{}, orgID int64, changes []UserChange) error {
if err != nil {
return err
}

// Get current users in the organization
currentUsers, err := getCurrentOrgUsers(client, orgID)
if err != nil {
return err
}

for _, change := range changes {
u := change.User
switch change.Type {
case Add:
_, err = client.Orgs.AddOrgUser(orgID, &models.AddOrgUserCommand{LoginOrEmail: u.Email, Role: u.Role})
if existingUser, exists := currentUsers[u.Email]; exists {
// User already exists, update role instead
if existingUser.Role != u.Role {
params := orgs.NewUpdateOrgUserParams().WithOrgID(orgID).WithUserID(existingUser.ID).WithBody(&models.UpdateOrgUserCommand{Role: u.Role})
_, err = client.Orgs.UpdateOrgUser(params)
}
} else {
_, err = client.Orgs.AddOrgUser(orgID, &models.AddOrgUserCommand{LoginOrEmail: u.Email, Role: u.Role})
}
case Update:
params := orgs.NewUpdateOrgUserParams().WithOrgID(orgID).WithUserID(u.ID).WithBody(&models.UpdateOrgUserCommand{Role: u.Role})
_, err = client.Orgs.UpdateOrgUser(params)
Expand Down Expand Up @@ -434,3 +449,15 @@ func getRoleListName(roleName string) string {

return fmt.Sprintf("%ss", strings.ToLower(roleName))
}

func getCurrentOrgUsers(client *goapi.GrafanaHTTPAPI, orgID int64) (map[string]OrgUser, error) {
resp, err := client.Orgs.GetOrgUsers(orgID)
if err != nil {
return nil, err
}
currentUsers := make(map[string]OrgUser)
for _, orgUser := range resp.Payload {
currentUsers[orgUser.Email] = OrgUser{ID: orgUser.UserID, Email: orgUser.Email, Role: orgUser.Role}
}
return currentUsers, nil
}
Loading