feat: initial orgs & teams support

pkg/backend/access.go

@@ -0,0 +1,95 @@
+package backend
+
+import (
+	"context"
+
+	"github.com/charmbracelet/soft-serve/pkg/access"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+	"github.com/charmbracelet/soft-serve/pkg/sshutils"
+	"golang.org/x/crypto/ssh"
+)
+
+// AccessLevel returns the access level of a user for a repository.
+//
+// It implements backend.Backend.
+func (d *Backend) AccessLevel(ctx context.Context, repo string, username string) access.AccessLevel {
+	user, _ := d.User(ctx, username)
+	return d.AccessLevelForUser(ctx, repo, user)
+}
+
+// AccessLevelByPublicKey returns the access level of a user's public key for a repository.
+//
+// It implements backend.Backend.
+func (d *Backend) AccessLevelByPublicKey(ctx context.Context, repo string, pk ssh.PublicKey) access.AccessLevel {
+	for _, k := range d.cfg.AdminKeys() {
+		if sshutils.KeysEqual(pk, k) {
+			return access.AdminAccess
+		}
+	}
+
+	user, _ := d.UserByPublicKey(ctx, pk)
+	if user != nil {
+		return d.AccessLevel(ctx, repo, user.Username())
+	}
+
+	return d.AccessLevel(ctx, repo, "")
+}
+
+// AccessLevelForUser returns the access level of a user for a repository.
+// TODO: user repository ownership
+func (d *Backend) AccessLevelForUser(ctx context.Context, repo string, user proto.User) access.AccessLevel {
+	var username string
+	anon := d.AnonAccess(ctx)
+	if user != nil {
+		username = user.Username()
+	}
+
+	// If the user is an admin, they have admin access.
+	if user != nil && user.IsAdmin() {
+		return access.AdminAccess
+	}
+
+	// If the repository exists, check if the user is a collaborator.
+	r := proto.RepositoryFromContext(ctx)
+	if r == nil {
+		r, _ = d.Repository(ctx, repo)
+	}
+
+	if r != nil {
+		if user != nil {
+			// If the user is the owner, they have admin access.
+			if r.UserID() == user.ID() {
+				return access.AdminAccess
+			}
+		}
+
+		// If the user is a collaborator, they have return their access level.
+		collabAccess, isCollab, _ := d.IsCollaborator(ctx, repo, username)
+		if isCollab {
+			if anon > collabAccess {
+				return anon
+			}
+			return collabAccess
+		}
+
+		// If the repository is private, the user has no access.
+		if r.IsPrivate() {
+			return access.NoAccess
+		}
+
+		// Otherwise, the user has read-only access.
+		return access.ReadOnlyAccess
+	}
+
+	if user != nil {
+		// If the repository doesn't exist, the user has read/write access.
+		if anon > access.ReadWriteAccess {
+			return anon
+		}
+
+		return access.ReadWriteAccess
+	}
+
+	// If the user doesn't exist, give them the anonymous access level.
+	return anon
+}

pkg/backend/collab.go

@@ -18,7 +18,7 @@
 // It implements backend.Backend.
 func (d *Backend) AddCollaborator(ctx context.Context, repo string, username string, level access.AccessLevel) error {
 	username = strings.ToLower(username)
-	if err := utils.ValidateUsername(username); err != nil {
+	if err := utils.ValidateHandle(username); err != nil {
 		return err
 	}
 
@@ -50,19 +50,33 @@
 func (d *Backend) Collaborators(ctx context.Context, repo string) ([]string, error) {
 	repo = utils.SanitizeRepo(repo)
 	var users []models.User
+	var usernames []string
 	if err := d.db.TransactionContext(ctx, func(tx *db.Tx) error {
 		var err error
 		users, err = d.store.ListCollabsByRepoAsUsers(ctx, tx, repo)
-		return err
+		if err != nil {
+			return err
+		}
+
+		ids := make([]int64, len(users))
+		for i, u := range users {
+			ids[i] = u.ID
+		}
+
+		handles, err := d.store.ListHandlesForIDs(ctx, tx, ids)
+		if err != nil {
+			return err
+		}
+
+		for _, h := range handles {
+			usernames = append(usernames, h.Handle)
+		}
+
+		return nil
 	}); err != nil {
 		return nil, db.WrapError(err)
 	}
 
-	var usernames []string
-	for _, u := range users {
-		usernames = append(usernames, u.Username)
-	}
-
 	return usernames, nil
 }
 

pkg/backend/org.go

@@ -0,0 +1,66 @@
+package backend
+
+import (
+	"context"
+
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+)
+
+// CreateOrg creates a new organization.
+func (d *Backend) CreateOrg(ctx context.Context, owner proto.User, name, email string) (proto.Org, error) {
+	o, err := d.store.CreateOrg(ctx, d.db, owner.ID(), name, email)
+	if err != nil {
+		return org{}, err
+	}
+	return org{o}, err
+}
+
+// ListOrgs lists all organizations for a user.
+func (d *Backend) ListOrgs(ctx context.Context, user proto.User) ([]proto.Org, error) {
+	orgs, err := d.store.ListOrgs(ctx, d.db, user.ID())
+	var r []proto.Org
+	for _, o := range orgs {
+		r = append(r, org{o})
+	}
+	return r, err
+}
+
+// FindOrganization finds an organization belonging to a user by name.
+func (d *Backend) FindOrganization(ctx context.Context, user proto.User, name string) (proto.Org, error) {
+	o, err := d.store.FindOrgByHandle(ctx, d.db, user.ID(), name)
+	return org{o}, err
+}
+
+// DeleteOrganization deletes an organization for a user.
+func (d *Backend) DeleteOrganization(ctx context.Context, user proto.User, name string) error {
+	o, err := d.store.FindOrgByHandle(ctx, d.db, user.ID(), name)
+	if err != nil {
+		return err
+	}
+	return d.store.DeleteOrgByID(ctx, d.db, user.ID(), o.ID)
+}
+
+type org struct {
+	o models.Organization
+}
+
+var _ proto.Org = org{}
+
+// DisplayName implements proto.Org.
+func (o org) DisplayName() string {
+	if o.o.Name.Valid {
+		return o.o.Name.String
+	}
+	return ""
+}
+
+// ID implements proto.Org.
+func (o org) ID() int64 {
+	return o.o.ID
+}
+
+// Name implements proto.Org.
+func (o org) Name() string {
+	return o.o.Handle.Handle
+}

pkg/backend/team.go

@@ -0,0 +1,72 @@
+package backend
+
+import (
+	"context"
+
+	"github.com/charmbracelet/soft-serve/pkg/db/models"
+	"github.com/charmbracelet/soft-serve/pkg/proto"
+)
+
+// CreateTeam creates a new team for an organization.
+func (d *Backend) CreateTeam(ctx context.Context, org proto.Org, owner proto.User, name string) (proto.Team, error) {
+	m, err := d.store.CreateTeam(ctx, d.db, owner.ID(), org.ID(), name)
+	if err != nil {
+		return team{}, err
+	}
+	return team{m}, err
+}
+
+// ListTeams lists all teams for a user.
+func (d *Backend) ListTeams(ctx context.Context, user proto.User) ([]proto.Team, error) {
+	teams, err := d.store.ListTeams(ctx, d.db, user.ID())
+	var r []proto.Team
+	for _, m := range teams {
+		r = append(r, team{m})
+	}
+	return r, err
+}
+
+// GetTeam gets a team by organization id and team name.
+func (d *Backend) GetTeam(ctx context.Context, user proto.User, org proto.Org, name string) (proto.Team, error) {
+	m, err := d.store.FindTeamByOrgName(ctx, d.db, user.ID(), org.ID(), name)
+	if err != nil {
+		return team{}, err
+	}
+	return team{m}, err
+}
+
+// FindTeam finds a team by name.
+func (d *Backend) FindTeam(ctx context.Context, user proto.User, name string) ([]proto.Team, error) {
+	m, err := d.store.FindTeamByName(ctx, d.db, user.ID(), name)
+	var r []proto.Team
+	for _, m := range m {
+		r = append(r, team{m})
+	}
+	return r, err
+}
+
+// DeleteTeam deletes a team.
+func (d *Backend) DeleteTeam(ctx context.Context, _ proto.User, team proto.Team) error {
+	return d.store.DeleteTeamByID(ctx, d.db, team.ID())
+}
+
+type team struct {
+	t models.Team
+}
+
+var _ proto.Team = team{}
+
+// ID implements proto.Team.
+func (t team) ID() int64 {
+	return t.t.ID
+}
+
+// Name implements proto.Team.
+func (t team) Name() string {
+	return t.t.Name
+}
+
+// Org implements proto.Team.
+func (t team) Org() int64 {
+	return t.t.OrganizationID
+}