feat(api,cli): namespace store

Author: heiytor

api/routes/nsadm.go

@@ -5,6 +5,7 @@ import (
 	"strconv"
 
 	"github.com/shellhub-io/shellhub/api/pkg/gateway"
+	"github.com/shellhub-io/shellhub/pkg/api/query"
 	"github.com/shellhub-io/shellhub/pkg/api/requests"
 )
 
@@ -35,6 +36,14 @@ func (h *Handler) GetNamespaceList(c gateway.Context) error {
 	}
 
 	req.Paginator.Normalize()
+
+	if req.Sorter.By == "" {
+		req.Sorter.By = "created_at"
+	}
+	if req.Sorter.Order == "" {
+		req.Sorter.Order = query.OrderAsc
+	}
+
 	if err := req.Filters.Unmarshal(); err != nil {
 		return err
 	}

api/services/api-key.go

@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"errors"
 
+	"github.com/shellhub-io/shellhub/api/store"
 	"github.com/shellhub-io/shellhub/pkg/api/requests"
 	"github.com/shellhub-io/shellhub/pkg/api/responses"
 	"github.com/shellhub-io/shellhub/pkg/clock"
@@ -31,7 +32,7 @@ type APIKeyService interface {
 }
 
 func (s *service) CreateAPIKey(ctx context.Context, req *requests.CreateAPIKey) (*responses.CreateAPIKey, error) {
-	if _, err := s.store.NamespaceGet(ctx, req.TenantID); err != nil {
+	if _, err := s.store.NamespaceGet(ctx, store.NamespaceIdentTenantID, req.TenantID); err != nil {
 		return nil, NewErrNamespaceNotFound(req.TenantID, err)
 	}
 
@@ -97,7 +98,7 @@ func (s *service) ListAPIKeys(ctx context.Context, req *requests.ListAPIKey) ([]
 }
 
 func (s *service) UpdateAPIKey(ctx context.Context, req *requests.UpdateAPIKey) error {
-	ns, err := s.store.NamespaceGet(ctx, req.TenantID)
+	ns, err := s.store.NamespaceGet(ctx, store.NamespaceIdentTenantID, req.TenantID)
 	if err != nil {
 		return NewErrNamespaceNotFound(req.TenantID, err)
 	}

api/services/auth.go

@@ -150,7 +150,7 @@ func (s *service) AuthDevice(ctx context.Context, req requests.DeviceAuth, remot
 	}
 
 	// The order here is critical as we don't want to register devices if the tenant id is invalid
-	namespace, err := s.store.NamespaceGet(ctx, device.TenantID)
+	namespace, err := s.store.NamespaceGet(ctx, store.NamespaceIdentTenantID, device.TenantID)
 	if err != nil {
 		return nil, NewErrNamespaceNotFound(device.TenantID, err)
 	}
@@ -264,7 +264,7 @@ func (s *service) AuthLocalUser(ctx context.Context, req *requests.AuthLocalUser
 	role := ""
 	// Populate the tenant and role when the user is associated with a namespace. If the member status is pending, we
 	// ignore the namespace.
-	if ns, _ := s.store.NamespaceGetPreferred(ctx, user.ID); ns != nil && ns.TenantID != "" {
+	if ns, _ := s.store.UserPreferredNamespace(ctx, store.UserIdentID, user.ID); ns != nil && ns.TenantID != "" {
 		if m, _ := ns.FindMember(user.ID); m.Status != models.MemberStatusPending {
 			tenantID = ns.TenantID
 			role = m.Role.String()
@@ -333,7 +333,8 @@ func (s *service) CreateUserToken(ctx context.Context, req *requests.CreateUserT
 	switch req.TenantID {
 	case "":
 		// A user may not have a preferred namespace. In such cases, we create a token without it.
-		namespace, err := s.store.NamespaceGetPreferred(ctx, user.ID)
+
+		namespace, err := s.store.UserPreferredNamespace(ctx, store.UserIdentID, user.ID)
 		if err != nil {
 			break
 		}
@@ -348,7 +349,7 @@ func (s *service) CreateUserToken(ctx context.Context, req *requests.CreateUserT
 			role = member.Role.String()
 		}
 	default:
-		namespace, err := s.store.NamespaceGet(ctx, req.TenantID)
+		namespace, err := s.store.NamespaceGet(ctx, store.NamespaceIdentTenantID, req.TenantID)
 		if err != nil {
 			return nil, NewErrNamespaceNotFound(req.TenantID, err)
 		}
@@ -459,7 +460,7 @@ func (s *service) AuthPublicKey(ctx context.Context, req requests.PublicKeyAuth)
 }
 
 func (s *service) GetUserRole(ctx context.Context, tenantID, userID string) (string, error) {
-	ns, err := s.store.NamespaceGet(ctx, tenantID)
+	ns, err := s.store.NamespaceGet(ctx, store.NamespaceIdentTenantID, tenantID)
 	if err != nil {
 		return "", err
 	}

api/services/device.go

@@ -44,7 +44,7 @@ func (s *service) ListDevices(ctx context.Context, req *requests.DeviceList) ([]
 	}
 
 	if req.TenantID != "" {
-		ns, err := s.store.NamespaceGet(ctx, req.TenantID)
+		ns, err := s.store.NamespaceGet(ctx, store.NamespaceIdentTenantID, req.TenantID)
 		if err != nil {
 			return nil, 0, NewErrNamespaceNotFound(req.TenantID, err)
 		}
@@ -96,7 +96,7 @@ func (s *service) DeleteDevice(ctx context.Context, uid models.UID, tenant strin
 		return NewErrDeviceNotFound(uid, err)
 	}
 
-	ns, err := s.store.NamespaceGet(ctx, tenant)
+	ns, err := s.store.NamespaceGet(ctx, store.NamespaceIdentTenantID, tenant)
 	if err != nil {
 		return NewErrNamespaceNotFound(tenant, err)
 	}
@@ -184,7 +184,7 @@ func (s *service) OfflineDevice(ctx context.Context, uid models.UID) error {
 
 // UpdateDeviceStatus updates the device status.
 func (s *service) UpdateDeviceStatus(ctx context.Context, tenant string, uid models.UID, status models.DeviceStatus) error {
-	namespace, err := s.store.NamespaceGet(ctx, tenant)
+	namespace, err := s.store.NamespaceGet(ctx, store.NamespaceIdentTenantID, tenant)
 	if err != nil {
 		return NewErrNamespaceNotFound(tenant, err)
 	}

api/services/member.go

@@ -2,7 +2,6 @@ package services
 
 import (
 	"context"
-	"errors"
 	"strings"
 	"time"
 
@@ -48,7 +47,7 @@ type MemberService interface {
 }
 
 func (s *service) AddNamespaceMember(ctx context.Context, req *requests.NamespaceAddMember) (*models.Namespace, error) {
-	namespace, err := s.store.NamespaceGet(ctx, req.TenantID)
+	namespace, err := s.store.NamespaceGet(ctx, store.NamespaceIdentTenantID, req.TenantID)
 	if err != nil || namespace == nil {
 		return nil, NewErrNamespaceNotFound(req.TenantID, err)
 	}
@@ -101,12 +100,12 @@ func (s *service) AddNamespaceMember(ctx context.Context, req *requests.Namespac
 			return nil, err
 		}
 	} else {
-		if err := s.store.WithTransaction(ctx, s.addMember(passiveUser.ID, req)); err != nil {
+		if err := s.addMember(passiveUser.ID, req)(ctx); err != nil {
 			return nil, err
 		}
 	}
 
-	return s.store.NamespaceGet(ctx, req.TenantID)
+	return s.store.NamespaceGet(ctx, store.NamespaceIdentTenantID, req.TenantID)
 }
 
 // addMember returns a transaction callback that adds a member and sends an invite if the instance is cloud.
@@ -127,7 +126,7 @@ func (s *service) addMember(memberID string, req *requests.NamespaceAddMember) s
 			member.ExpiresAt = time.Time{}
 		}
 
-		if err := s.store.NamespaceAddMember(ctx, req.TenantID, member); err != nil {
+		if err := s.store.NamespaceCreateMemberships(ctx, req.TenantID, *member); err != nil {
 			return err
 		}
 
@@ -145,19 +144,19 @@ func (s *service) addMember(memberID string, req *requests.NamespaceAddMember) s
 // specified ID.
 func (s *service) resendMemberInvite(memberID string, req *requests.NamespaceAddMember) store.TransactionCb {
 	return func(ctx context.Context) error {
-		expiresAt := clock.Now().Add(7 * (24 * time.Hour))
-		changes := &models.MemberChanges{ExpiresAt: &expiresAt, Role: req.MemberRole}
+		// expiresAt := clock.Now().Add(7 * (24 * time.Hour))
+		// changes := &models.MemberChanges{ExpiresAt: &expiresAt, Role: req.MemberRole}
 
-		if err := s.store.NamespaceUpdateMember(ctx, req.TenantID, memberID, changes); err != nil {
-			return err
-		}
+		// if err := s.store.NamespaceUpdateMember(ctx, req.TenantID, memberID, changes); err != nil {
+		// 	return err
+		// }
 
 		return s.client.InviteMember(ctx, req.TenantID, memberID, req.FowardedHost)
 	}
 }
 
 func (s *service) UpdateNamespaceMember(ctx context.Context, req *requests.NamespaceUpdateMember) error {
-	namespace, err := s.store.NamespaceGet(ctx, req.TenantID)
+	namespace, err := s.store.NamespaceGet(ctx, store.NamespaceIdentTenantID, req.TenantID)
 	if err != nil {
 		return NewErrNamespaceNotFound(req.TenantID, err)
 	}
@@ -172,19 +171,20 @@ func (s *service) UpdateNamespaceMember(ctx context.Context, req *requests.Names
 		return NewErrNamespaceMemberNotFound(user.ID, err)
 	}
 
-	if _, ok := namespace.FindMember(req.MemberID); !ok {
+	member, ok := namespace.FindMember(req.MemberID)
+	if !ok {
 		return NewErrNamespaceMemberNotFound(req.MemberID, err)
 	}
 
-	changes := &models.MemberChanges{Role: req.MemberRole}
-
-	if changes.Role != authorizer.RoleInvalid {
+	if req.MemberRole != authorizer.RoleInvalid {
 		if !active.Role.HasAuthority(req.MemberRole) {
 			return NewErrRoleInvalid()
 		}
+
+		member.Role = req.MemberRole
 	}
 
-	if err := s.store.NamespaceUpdateMember(ctx, req.TenantID, req.MemberID, changes); err != nil {
+	if err := s.store.NamespaceSaveMembership(ctx, req.TenantID, member); err != nil {
 		return err
 	}
 
@@ -194,7 +194,7 @@ func (s *service) UpdateNamespaceMember(ctx context.Context, req *requests.Names
 }
 
 func (s *service) RemoveNamespaceMember(ctx context.Context, req *requests.NamespaceRemoveMember) (*models.Namespace, error) {
-	namespace, err := s.store.NamespaceGet(ctx, req.TenantID)
+	namespace, err := s.store.NamespaceGet(ctx, store.NamespaceIdentTenantID, req.TenantID)
 	if err != nil {
 		return nil, NewErrNamespaceNotFound(req.TenantID, err)
 	}
@@ -218,7 +218,7 @@ func (s *service) RemoveNamespaceMember(ctx context.Context, req *requests.Names
 		return nil, NewErrRoleInvalid()
 	}
 
-	if err := s.removeMember(ctx, namespace, req.MemberID); err != nil { //nolint:revive
+	if err := s.store.NamespaceDeleteMembership(ctx, req.TenantID, passive); err != nil {
 		return nil, err
 	}
 
@@ -229,11 +229,11 @@ func (s *service) RemoveNamespaceMember(ctx context.Context, req *requests.Names
 			Error("failed to uncache the token")
 	}
 
-	return s.store.NamespaceGet(ctx, req.TenantID)
+	return s.store.NamespaceGet(ctx, store.NamespaceIdentTenantID, req.TenantID)
 }
 
 func (s *service) LeaveNamespace(ctx context.Context, req *requests.LeaveNamespace) (*models.UserAuthResponse, error) {
-	ns, err := s.store.NamespaceGet(ctx, req.TenantID)
+	ns, err := s.store.NamespaceGet(ctx, store.NamespaceIdentTenantID, req.TenantID)
 	if err != nil {
 		return nil, NewErrNamespaceNotFound(req.TenantID, err)
 	}
@@ -248,7 +248,7 @@ func (s *service) LeaveNamespace(ctx context.Context, req *requests.LeaveNamespa
 		return nil, NewErrAuthForbidden()
 	}
 
-	if err := s.removeMember(ctx, ns, user.ID); err != nil { //nolint:revive
+	if err := s.store.NamespaceDeleteMembership(ctx, req.TenantID, member); err != nil {
 		return nil, err
 	}
 
@@ -259,7 +259,7 @@ func (s *service) LeaveNamespace(ctx context.Context, req *requests.LeaveNamespa
 	}
 
 	user.Preferences.PreferredNamespace = ""
-	if err := s.store.Save(ctx, user); err != nil {
+	if err := s.store.UserSave(ctx, user); err != nil {
 		log.WithError(err).
 			WithField("tenant_id", req.TenantID).
 			WithField("user_id", req.UserID).
@@ -276,18 +276,3 @@ func (s *service) LeaveNamespace(ctx context.Context, req *requests.LeaveNamespa
 	// TODO: make this method a util function
 	return s.CreateUserToken(ctx, &requests.CreateUserToken{UserID: req.UserID})
 }
-
-func (s *service) removeMember(ctx context.Context, ns *models.Namespace, userID string) error {
-	if err := s.store.NamespaceRemoveMember(ctx, ns.TenantID, userID); err != nil {
-		switch {
-		case errors.Is(err, store.ErrNoDocuments):
-			return NewErrNamespaceNotFound(ns.TenantID, err)
-		// case errors.Is(err, mongo.ErrUserNotFound): // TODO: generic error
-		// 	return NewErrNamespaceMemberNotFound(userID, err)
-		default:
-			return err
-		}
-	}
-
-	return nil
-}