Skip to content

fix: pass configured orgs to CreateUserParams in CreateAccount #134

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

Open
c1-dev-bot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: pass configured orgs to CreateUserParams in CreateAccount #134

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
13 changes: 9 additions & 4 deletions pkg/connector/invitation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func (i *invitationResourceType) CreateAccount(
annotations.Annotations,
error,
) {
params, err := getCreateUserParams(accountInfo)
params, err := getCreateUserParams(accountInfo, i.orgs)
if err != nil {
return nil, nil, nil, fmt.Errorf("github-connectorv2: failed to get CreateUserParams: %w", err)
}
Expand Down Expand Up @@ -206,10 +206,15 @@ type createUserParams struct {
email *string
}

func getCreateUserParams(accountInfo *v2.AccountInfo) (*createUserParams, error) {
func getCreateUserParams(accountInfo *v2.AccountInfo, configuredOrgs []string) (*createUserParams, error) {
pMap := accountInfo.Profile.AsMap()
org, ok := pMap["org"].(string)
if !ok || org == "" {

// Use org from account info profile if provided, otherwise fall back to the connector's configured org.
org, _ := pMap["org"].(string)
if org == "" && len(configuredOrgs) > 0 {
org = configuredOrgs[0]
}
if org == "" {
return nil, fmt.Errorf("org is required")
}

Expand Down
Loading