Use a better API to check organization membership.

github · Mar 2, 2021 · 346185e · 346185e
1 parent 3346397
commit 346185e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/internal/push/push.go b/internal/push/push.go
@@ -99,11 +99,11 @@ 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, user.GetLogin(), pushService.destinationRepositoryOwner)
+		if err != nil {
 			return nil, errors.Wrap(err, "Failed to check membership of destination organization.")
 		}
-		if err != nil && githubapiutil.HasAnyScope(response, "site_admin") {
+		if (response.StatusCode == http.StatusFound || response.StatusCode == http.StatusNotFound) && githubapiutil.HasAnyScope(response, "site_admin") {
 			log.Debugf("No access to destination organization. Switching to impersonation token for %s...", pushService.actionsAdminUser)
 			impersonationToken, _, err := pushService.githubEnterpriseClient.Admin.CreateUserImpersonation(pushService.ctx, pushService.actionsAdminUser, &github.ImpersonateUserOptions{Scopes: []string{minimumRepositoryScope, "workflow"}})
 			if err != nil {