fix missing methods

Signed-off-by: nyagamunene <stevenyaga2014@gmail.com>

Author: nyagamunene

clients/middleware/pat.go

@@ -322,6 +322,36 @@ func (pm *patMiddleware) RetrieveRole(ctx context.Context, session authn.Session
 	return pm.svc.RetrieveRole(ctx, session, entityID, roleID)
 }
 
+func (pm *patMiddleware) ListEntityMembers(ctx context.Context, session authn.Session, entityID string, pq roles.MembersRolePageQuery) (roles.MembersRolePage, error) {
+	if err := pm.authorizePAT(ctx,
+		session,
+		smqauth.PlatformDomainsScope,
+		smqauth.DomainClientsScope,
+		session.DomainID,
+		smqauth.ListOp,
+		[]string{entityID},
+	); err != nil {
+		return roles.MembersRolePage{}, errors.Wrap(svcerr.ErrUnauthorizedPAT, err)
+	}
+
+	return pm.svc.ListEntityMembers(ctx, session, entityID, pq)
+}
+
+func (pm *patMiddleware) RemoveEntityMembers(ctx context.Context, session authn.Session, entityID string, members []string) error {
+	if err := pm.authorizePAT(ctx,
+		session,
+		smqauth.PlatformDomainsScope,
+		smqauth.DomainClientsScope,
+		session.DomainID,
+		smqauth.DeleteOp,
+		[]string{entityID},
+	); err != nil {
+		return errors.Wrap(svcerr.ErrUnauthorizedPAT, err)
+	}
+
+	return pm.svc.RemoveEntityMembers(ctx, session, entityID, members)
+}
+
 func (pm *patMiddleware) RoleAddActions(ctx context.Context, session authn.Session, entityID, roleID string, actions []string) ([]string, error) {
 	if err := pm.authorizePAT(ctx,
 		session,

groups/middleware/pat.go

@@ -352,6 +352,36 @@ func (pm *patMiddleware) RetrieveRole(ctx context.Context, session authn.Session
 	return pm.svc.RetrieveRole(ctx, session, entityID, roleID)
 }
 
+func (pm *patMiddleware) ListEntityMembers(ctx context.Context, session authn.Session, entityID string, pq roles.MembersRolePageQuery) (roles.MembersRolePage, error) {
+	if err := pm.authorizePAT(ctx,
+		session,
+		smqauth.PlatformDomainsScope,
+		smqauth.DomainGroupsScope,
+		session.DomainID,
+		smqauth.ListOp,
+		[]string{entityID},
+	); err != nil {
+		return roles.MembersRolePage{}, errors.Wrap(svcerr.ErrUnauthorizedPAT, err)
+	}
+
+	return pm.svc.ListEntityMembers(ctx, session, entityID, pq)
+}
+
+func (pm *patMiddleware) RemoveEntityMembers(ctx context.Context, session authn.Session, entityID string, members []string) error {
+	if err := pm.authorizePAT(ctx,
+		session,
+		smqauth.PlatformDomainsScope,
+		smqauth.DomainGroupsScope,
+		session.DomainID,
+		smqauth.DeleteOp,
+		[]string{entityID},
+	); err != nil {
+		return errors.Wrap(svcerr.ErrUnauthorizedPAT, err)
+	}
+
+	return pm.svc.RemoveEntityMembers(ctx, session, entityID, members)
+}
+
 func (pm *patMiddleware) RoleAddActions(ctx context.Context, session authn.Session, entityID, roleID string, actions []string) ([]string, error) {
 	if err := pm.authorizePAT(ctx,
 		session,

users/middleware/authorization.go

@@ -7,10 +7,8 @@ import (
 	"context"
 
 	grpcTokenV1 "github.com/absmach/supermq/api/grpc/token/v1"
-	smqauth "github.com/absmach/supermq/auth"
 	"github.com/absmach/supermq/pkg/authn"
 	smqauthz "github.com/absmach/supermq/pkg/authz"
-	svcerr "github.com/absmach/supermq/pkg/errors/service"
 	"github.com/absmach/supermq/pkg/policies"
 	"github.com/absmach/supermq/users"
 )

users/middleware/pat.go

@@ -12,7 +12,6 @@ import (
 	"github.com/absmach/supermq/pkg/errors"
 	svcerr "github.com/absmach/supermq/pkg/errors/service"
 	smqpat "github.com/absmach/supermq/pkg/pat"
-	"github.com/absmach/supermq/pkg/policies"
 	"github.com/absmach/supermq/users"
 )
 
@@ -80,27 +79,6 @@ func (pm *patMiddleware) ListUsers(ctx context.Context, session authn.Session, p
 	return pm.svc.ListUsers(ctx, session, page)
 }
 
-func (pm *patMiddleware) ListMembers(ctx context.Context, session authn.Session, objectKind, objectID string, page users.Page) (users.MembersPage, error) {
-	switch objectKind {
-	case policies.GroupsKind:
-		if err := pm.authorizePAT(ctx, session, smqauth.PlatformUsersScope, smqauth.DomainGroupsScope, session.DomainID, smqauth.ListOp, smqauth.AnyIDs{}.Values()); err != nil {
-			return users.MembersPage{}, err
-		}
-	case policies.DomainsKind:
-		if err := pm.authorizePAT(ctx, session, smqauth.PlatformUsersScope, smqauth.DomainManagementScope, session.DomainID, smqauth.ListOp, smqauth.AnyIDs{}.Values()); err != nil {
-			return users.MembersPage{}, err
-		}
-	case policies.ClientsKind:
-		if err := pm.authorizePAT(ctx, session, smqauth.PlatformUsersScope, smqauth.DomainClientsScope, session.DomainID, smqauth.ListOp, smqauth.AnyIDs{}.Values()); err != nil {
-			return users.MembersPage{}, err
-		}
-	default:
-		return users.MembersPage{}, svcerr.ErrAuthorization
-	}
-
-	return pm.svc.ListMembers(ctx, session, objectKind, objectID, page)
-}
-
 func (pm *patMiddleware) SearchUsers(ctx context.Context, page users.Page) (users.UsersPage, error) {
 	return pm.svc.SearchUsers(ctx, page)
 }