Handle auto-confirm case of invitations

Tobias Fuhrimann · Tobias Fuhrimann · commit b7032b42e659 · 2017-11-17T16:15:23.000+01:00
diff --git a/invite_billing_account_user.go b/invite_billing_account_user.go
@@ -54,7 +54,7 @@ func (p *AppCloudPlugin) InviteBillingAccountUser(c plugin.CliConnection, invite
 		return errors.New("Couldn't read JSON response from server")
 	}
 
-	if res.Entity.Status != "SENT" {
+	if res.Entity.Status != "SENT" && res.Entity.Status != "CONFIRMED" {
 		return fmt.Errorf("Couldn't send invitation. Current status: %s", res.Entity.Status)
 	}
 
diff --git a/invite_org_user.go b/invite_org_user.go
@@ -35,6 +35,9 @@ func (p *AppCloudPlugin) InviteOrgUser(c plugin.CliConnection, invitee string, o
 		OrgID:   o.Guid,
 		Roles:   strings.Split(roles, ","),
 	}
+	if len(args.Roles) == 1 && args.Roles[0] == "" {
+		args.Roles = []string{}
+	}
 	argsData, err := json.Marshal(args)
 	if err != nil {
 		return fmt.Errorf("Couldn't parse JSON data")
@@ -54,7 +57,7 @@ func (p *AppCloudPlugin) InviteOrgUser(c plugin.CliConnection, invitee string, o
 		return errors.New("Couldn't read JSON response from server")
 	}
 
-	if res.Entity.Status != "SENT" {
+	if res.Entity.Status != "SENT" && res.Entity.Status != "CONFIRMED" {
 		return fmt.Errorf("Couldn't send invitation. Current status: %s", res.Entity.Status)
 	}
 
diff --git a/invite_space_user.go b/invite_space_user.go
@@ -35,6 +35,9 @@ func (p *AppCloudPlugin) InviteSpaceUser(c plugin.CliConnection, invitee string,
 		SpaceID: s.Guid,
 		Roles:   strings.Split(roles, ","),
 	}
+	if len(args.Roles) == 1 && args.Roles[0] == "" {
+		args.Roles = []string{}
+	}
 	argsData, err := json.Marshal(args)
 	if err != nil {
 		return errors.New("Couldn't parse JSON data")
@@ -54,7 +57,7 @@ func (p *AppCloudPlugin) InviteSpaceUser(c plugin.CliConnection, invitee string,
 		return errors.New("Couldn't read JSON response from server")
 	}
 
-	if res.Entity.Status != "SENT" {
+	if res.Entity.Status != "SENT" && res.Entity.Status != "CONFIRMED" {
 		return fmt.Errorf("Couldn't send invitation. Current status: %s", res.Entity.Status)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func (p *AppCloudPlugin) InviteBillingAccountUser(c plugin.CliConnection, invite`
`54`	`54`	`return errors.New("Couldn't read JSON response from server")`
`55`	`55`	`}`
`56`	`56`
`57`		`- if res.Entity.Status != "SENT" {`
	`57`	`+ if res.Entity.Status != "SENT" && res.Entity.Status != "CONFIRMED" {`
`58`	`58`	`return fmt.Errorf("Couldn't send invitation. Current status: %s", res.Entity.Status)`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,9 @@ func (p *AppCloudPlugin) InviteOrgUser(c plugin.CliConnection, invitee string, o`
`35`	`35`	`OrgID: o.Guid,`
`36`	`36`	`Roles: strings.Split(roles, ","),`
`37`	`37`	`}`
	`38`	`+ if len(args.Roles) == 1 && args.Roles[0] == "" {`
	`39`	`+ args.Roles = []string{}`
	`40`	`+ }`
`38`	`41`	`argsData, err := json.Marshal(args)`
`39`	`42`	`if err != nil {`
`40`	`43`	`return fmt.Errorf("Couldn't parse JSON data")`
`@@ -54,7 +57,7 @@ func (p *AppCloudPlugin) InviteOrgUser(c plugin.CliConnection, invitee string, o`
`54`	`57`	`return errors.New("Couldn't read JSON response from server")`
`55`	`58`	`}`
`56`	`59`
`57`		`- if res.Entity.Status != "SENT" {`
	`60`	`+ if res.Entity.Status != "SENT" && res.Entity.Status != "CONFIRMED" {`
`58`	`61`	`return fmt.Errorf("Couldn't send invitation. Current status: %s", res.Entity.Status)`
`59`	`62`	`}`
`60`	`63`