Merge pull request #57 from github/check-org-membership-api

chrisgavin · web-flow · commit 197081f41dea · 2021-03-25T15:44:42.000Z
Use a better API to check organization membership.
diff --git a/internal/push/push.go b/internal/push/push.go
@@ -99,12 +99,12 @@ func (pushService *pushService) createRepository() (*github.Repository, error) {
 			}
 		}
 
-		_, response, err = pushService.githubEnterpriseClient.Organizations.GetOrgMembership(pushService.ctx, user.GetLogin(), pushService.destinationRepositoryOwner)
-		if err != nil && (response == nil || response.StatusCode != http.StatusNotFound) {
+		_, response, err = pushService.githubEnterpriseClient.Organizations.IsMember(pushService.ctx, pushService.destinationRepositoryOwner, user.GetLogin())
+		if err != nil {
 			return nil, errors.Wrap(err, "Failed to check membership of destination organization.")
 		}
-		if err != nil && githubapiutil.HasAnyScope(response, "site_admin") {
-			log.Debugf("No access to destination organization. Switching to impersonation token for %s...", pushService.actionsAdminUser)
+		if (response.StatusCode == http.StatusFound || response.StatusCode == http.StatusNotFound) && githubapiutil.HasAnyScope(response, "site_admin") {
+			log.Debugf("No access to destination organization (status code %d). Switching to impersonation token for %s...", response.StatusCode, pushService.actionsAdminUser)
 			impersonationToken, _, err := pushService.githubEnterpriseClient.Admin.CreateUserImpersonation(pushService.ctx, pushService.actionsAdminUser, &github.ImpersonateUserOptions{Scopes: []string{minimumRepositoryScope, "workflow"}})
 			if err != nil {
 				return nil, errors.Wrap(err, "Failed to impersonate Actions admin user.")

Original file line number	Diff line number	Diff line change
`@@ -99,12 +99,12 @@ func (pushService pushService) createRepository() (github.Repository, error) {`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`		`- _, response, err = pushService.githubEnterpriseClient.Organizations.GetOrgMembership(pushService.ctx, user.GetLogin(), pushService.destinationRepositoryOwner)`
`103`		`- if err != nil && (response == nil \|\| response.StatusCode != http.StatusNotFound) {`
	`102`	`+ _, response, err = pushService.githubEnterpriseClient.Organizations.IsMember(pushService.ctx, pushService.destinationRepositoryOwner, user.GetLogin())`
	`103`	`+ if err != nil {`
`104`	`104`	`return nil, errors.Wrap(err, "Failed to check membership of destination organization.")`
`105`	`105`	`}`
`106`		`- if err != nil && githubapiutil.HasAnyScope(response, "site_admin") {`
`107`		`- log.Debugf("No access to destination organization. Switching to impersonation token for %s...", pushService.actionsAdminUser)`
	`106`	`+ if (response.StatusCode == http.StatusFound \|\| response.StatusCode == http.StatusNotFound) && githubapiutil.HasAnyScope(response, "site_admin") {`
	`107`	`+ log.Debugf("No access to destination organization (status code %d). Switching to impersonation token for %s...", response.StatusCode, pushService.actionsAdminUser)`
`108`	`108`	`impersonationToken, _, err := pushService.githubEnterpriseClient.Admin.CreateUserImpersonation(pushService.ctx, pushService.actionsAdminUser, &github.ImpersonateUserOptions{Scopes: []string{minimumRepositoryScope, "workflow"}})`
`109`	`109`	`if err != nil {`
`110`	`110`	`return nil, errors.Wrap(err, "Failed to impersonate Actions admin user.")`