Refactor remote OrgMembership method

server/cache/membership.go

@@ -54,11 +54,10 @@ func (c *membershipCache) Get(ctx context.Context, u *model.User, name string) (
 		return item.Value(), nil
 	}
 
-	member, admin, err := c.Remote.OrgMembership(ctx, u, name)
+	perm, err := c.Remote.OrgMembership(ctx, u, name)
 	if err != nil {
 		return nil, err
 	}
-	perm := &model.OrgPerm{Member: member, Admin: admin}
 	c.Cache.Set(key, perm, c.TTL)
 	return perm, nil
 }

server/remote/bitbucket/bitbucket.go

@@ -303,12 +303,12 @@ func (c *config) Hook(ctx context.Context, req *http.Request) (*model.Repo, *mod
 
 // OrgMembership returns if user is member of organization and if user
 // is admin/owner in this organization.
-func (c *config) OrgMembership(ctx context.Context, u *model.User, owner string) (bool, bool, error) {
+func (c *config) OrgMembership(ctx context.Context, u *model.User, owner string) (*model.OrgPerm, error) {
 	perm, err := c.newClient(ctx, u).GetUserWorkspaceMembership(owner, u.Login)
 	if err != nil {
-		return false, false, err
+		return nil, err
 	}
-	return perm != "", perm == "owner", nil
+	return &model.OrgPerm{Member: perm != "", Admin: perm == "owner"}, nil
 }
 
 // helper function to return the bitbucket oauth2 client

server/remote/bitbucketserver/bitbucketserver.go

@@ -247,9 +247,9 @@ func (c *Config) Hook(ctx context.Context, r *http.Request) (*model.Repo, *model
 
 // OrgMembership returns if user is member of organization and if user
 // is admin/owner in this organization.
-func (c *Config) OrgMembership(ctx context.Context, u *model.User, owner string) (bool, bool, error) {
+func (c *Config) OrgMembership(ctx context.Context, u *model.User, owner string) (*model.OrgPerm, error) {
 	// TODO: Not implemented currently
-	return false, false, nil
+	return nil, nil
 }
 
 func CreateConsumer(URL, ConsumerKey string, PrivateKey *rsa.PrivateKey) *oauth.Consumer {

server/remote/coding/coding.go

@@ -303,9 +303,9 @@ func (c *Coding) Hook(ctx context.Context, r *http.Request) (*model.Repo, *model
 
 // OrgMembership returns if user is member of organization and if user
 // is admin/owner in this organization.
-func (c *Coding) OrgMembership(ctx context.Context, u *model.User, owner string) (bool, bool, error) {
+func (c *Coding) OrgMembership(ctx context.Context, u *model.User, owner string) (*model.OrgPerm, error) {
 	// TODO: Not supported in Coding OAuth API
-	return false, false, nil
+	return nil, nil
 }
 
 // helper function to return the Coding oauth2 context using an HTTPClient that

server/remote/gitea/gitea.go

@@ -460,27 +460,27 @@ func (c *Gitea) Hook(ctx context.Context, r *http.Request) (*model.Repo, *model.
 
 // OrgMembership returns if user is member of organization and if user
 // is admin/owner in this organization.
-func (c *Gitea) OrgMembership(ctx context.Context, u *model.User, owner string) (bool, bool, error) {
+func (c *Gitea) OrgMembership(ctx context.Context, u *model.User, owner string) (*model.OrgPerm, error) {
 	client, err := c.newClientToken(ctx, u.Token)
 	if err != nil {
-		return false, false, err
+		return nil, err
 	}
 
 	member, _, err := client.CheckOrgMembership(owner, u.Login)
 	if err != nil {
-		return false, false, err
+		return nil, err
 	}
 
 	if !member {
-		return false, false, nil
+		return &model.OrgPerm{}, nil
 	}
 
 	perm, _, err := client.GetOrgPermissions(owner, u.Login)
 	if err != nil {
-		return member, false, err
+		return &model.OrgPerm{Member: member}, err
 	}
 
-	return member, perm.IsAdmin || perm.IsOwner, nil
+	return &model.OrgPerm{Member: member, Admin: perm.IsAdmin || perm.IsOwner}, nil
 }
 
 // helper function to return the Gitea client with Token

server/remote/github/github.go

@@ -307,14 +307,14 @@ func (c *client) Deactivate(ctx context.Context, u *model.User, r *model.Repo, l
 
 // OrgMembership returns if user is member of organization and if user
 // is admin/owner in this organization.
-func (c *client) OrgMembership(ctx context.Context, u *model.User, owner string) (bool, bool, error) {
+func (c *client) OrgMembership(ctx context.Context, u *model.User, owner string) (*model.OrgPerm, error) {
 	client := c.newClientToken(ctx, u.Token)
 	org, _, err := client.Organizations.GetOrgMembership(ctx, u.Login, owner)
 	if err != nil {
-		return false, false, err
+		return nil, err
 	}
 
-	return org.GetState() == "active", org.GetRole() == "admin", nil
+	return &model.OrgPerm{Member: org.GetState() == "active", Admin: org.GetRole() == "admin"}, nil
 }
 
 // helper function to return the GitHub oauth2 context using an HTTPClient that

server/remote/gitlab/gitlab.go

@@ -556,10 +556,10 @@ func (g *Gitlab) Hook(ctx context.Context, req *http.Request) (*model.Repo, *mod
 
 // OrgMembership returns if user is member of organization and if user
 // is admin/owner in this organization.
-func (g *Gitlab) OrgMembership(ctx context.Context, u *model.User, owner string) (bool, bool, error) {
+func (g *Gitlab) OrgMembership(ctx context.Context, u *model.User, owner string) (*model.OrgPerm, error) {
 	client, err := newClient(g.URL, u.Token, g.SkipVerify)
 	if err != nil {
-		return false, false, err
+		return nil, err
 	}
 
 	groups, _, err := client.Groups.ListGroups(&gitlab.ListGroupsOptions{
@@ -570,7 +570,7 @@ func (g *Gitlab) OrgMembership(ctx context.Context, u *model.User, owner string)
 		Search: gitlab.String(owner),
 	}, gitlab.WithContext(ctx))
 	if err != nil {
-		return false, false, err
+		return nil, err
 	}
 	var gid int
 	for _, group := range groups {
@@ -580,7 +580,7 @@ func (g *Gitlab) OrgMembership(ctx context.Context, u *model.User, owner string)
 		}
 	}
 	if gid == 0 {
-		return false, false, nil
+		return &model.OrgPerm{}, nil
 	}
 
 	opts := &gitlab.ListGroupMembersOptions{
@@ -594,11 +594,11 @@ func (g *Gitlab) OrgMembership(ctx context.Context, u *model.User, owner string)
 		opts.Page = i
 		members, _, err := client.Groups.ListAllGroupMembers(gid, opts, gitlab.WithContext(ctx))
 		if err != nil {
-			return false, false, err
+			return nil, err
 		}
 		for _, member := range members {
 			if member.Username == u.Login {
-				return true, member.AccessLevel >= gitlab.OwnerPermissions, nil
+				return &model.OrgPerm{Member: true, Admin: member.AccessLevel >= gitlab.OwnerPermissions}, nil
 			}
 		}
 
@@ -607,7 +607,7 @@ func (g *Gitlab) OrgMembership(ctx context.Context, u *model.User, owner string)
 		}
 	}
 
-	return false, false, nil
+	return &model.OrgPerm{}, nil
 }
 
 func (g *Gitlab) loadChangedFilesFromMergeRequest(ctx context.Context, tmpRepo *model.Repo, build *model.Build, mergeIID int) (*model.Build, error) {

server/remote/gogs/gogs.go

@@ -292,21 +292,21 @@ func (c *client) Hook(ctx context.Context, r *http.Request) (*model.Repo, *model
 
 // OrgMembership returns if user is member of organization and if user
 // is admin/owner in this organization.
-func (c *client) OrgMembership(ctx context.Context, u *model.User, owner string) (bool, bool, error) {
+func (c *client) OrgMembership(ctx context.Context, u *model.User, owner string) (*model.OrgPerm, error) {
 	client := c.newClientToken(u.Token)
 
 	orgs, err := client.ListMyOrgs()
 	if err != nil {
-		return false, false, err
+		return nil, err
 	}
 
 	for _, org := range orgs {
 		if org.UserName == owner {
 			// TODO: API does not support checking if user is admin/owner of org
-			return true, false, nil
+			return &model.OrgPerm{Member: true}, nil
 		}
 	}
-	return false, false, nil
+	return &model.OrgPerm{}, nil
 }
 
 // helper function to return the Gogs client

server/remote/remote.go

@@ -82,7 +82,7 @@ type Remote interface {
 
 	// OrgMembership returns if user is member of organization and if user
 	// is admin/owner in that organization.
-	OrgMembership(ctx context.Context, u *model.User, owner string) (member, admin bool, err error)
+	OrgMembership(ctx context.Context, u *model.User, owner string) (*model.OrgPerm, error)
 }
 
 // FileMeta represents a file in version control