remove roles op in clients

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

Author: nyagamunene

clients/middleware/authorization.go

@@ -54,7 +54,8 @@ func AuthorizationMiddleware(
 	svc clients.Service,
 	authz smqauthz.Authorization,
 	repo clients.Repository,
-	thingsOpPerm, rolesOpPerm map[clients.Operation]clients.Permission,
+	thingsOpPerm map[clients.Operation]clients.Permission,
+	rolesOpPerm map[svcutil.Operation]svcutil.Permission,
 	extOpPerm map[clients.ExternalOperation]clients.Permission,
 	callout callout.Callout,
 ) (clients.Service, error) {
@@ -66,12 +67,7 @@ func AuthorizationMiddleware(
 		return nil, err
 	}
 
-	res := make(map[svcutil.Operation]svcutil.Permission, len(rolesOpPerm))
-	for op, perm := range rolesOpPerm {
-		res[svcutil.Operation(op)] = svcutil.Permission(perm)
-	}
-
-	ram, err := rmMW.NewRoleManagerAuthorizationMiddleware(policies.ClientType, svc, authz, res, callout)
+	ram, err := rmMW.NewRoleManagerAuthorizationMiddleware(policies.ClientType, svc, authz, rolesOpPerm, callout)
 	if err != nil {
 		return nil, err
 	}

clients/operationperm.go

@@ -135,7 +135,6 @@ func (op ExternalOperation) String() string {
 type ExternalOperationPerm struct {
 	opPerm      map[ExternalOperation]Permission
 	expectedOps []ExternalOperation
-	// opNames     []string
 }
 
 func newExternalOperationPerm(expectedOps []ExternalOperation) ExternalOperationPerm {

clients/roleoperations.go

@@ -3,6 +3,11 @@
 
 package clients
 
+import (
+	"github.com/absmach/supermq/pkg/roles"
+	"github.com/absmach/supermq/pkg/svcutil"
+)
+
 // Internal Operations.
 const (
 	OpViewClient Operation = iota
@@ -120,41 +125,23 @@ func NewOperationPermissionMap() map[Operation]Permission {
 	return opPerm
 }
 
-const (
-	OpAddRole Operation = iota
-	OpRemoveRole
-	OpUpdateRoleName
-	OpRetrieveRole
-	OpRetrieveAllRoles
-	OpRoleAddActions
-	OpRoleListActions
-	OpRoleCheckActionsExists
-	OpRoleRemoveActions
-	OpRoleRemoveAllActions
-	OpRoleAddMembers
-	OpRoleListMembers
-	OpRoleCheckMembersExists
-	OpRoleRemoveMembers
-	OpRoleRemoveAllMembers
-)
-
-func NewRolesOperationPermissionMap() map[Operation]Permission {
-	opPerm := map[Operation]Permission{
-		OpAddRole:                manageRolePermission,
-		OpRemoveRole:             manageRolePermission,
-		OpUpdateRoleName:         manageRolePermission,
-		OpRetrieveRole:           manageRolePermission,
-		OpRetrieveAllRoles:       manageRolePermission,
-		OpRoleAddActions:         manageRolePermission,
-		OpRoleListActions:        manageRolePermission,
-		OpRoleCheckActionsExists: manageRolePermission,
-		OpRoleRemoveActions:      manageRolePermission,
-		OpRoleRemoveAllActions:   manageRolePermission,
-		OpRoleAddMembers:         addRoleUsersPermission,
-		OpRoleListMembers:        viewRoleUsersPermission,
-		OpRoleCheckMembersExists: viewRoleUsersPermission,
-		OpRoleRemoveMembers:      removeRoleUsersPermission,
-		OpRoleRemoveAllMembers:   manageRolePermission,
+func NewRolesOperationPermissionMap() map[svcutil.Operation]svcutil.Permission {
+	opPerm := map[svcutil.Operation]svcutil.Permission{
+		roles.OpAddRole:                manageRolePermission,
+		roles.OpRemoveRole:             manageRolePermission,
+		roles.OpUpdateRoleName:         manageRolePermission,
+		roles.OpRetrieveRole:           manageRolePermission,
+		roles.OpRetrieveAllRoles:       manageRolePermission,
+		roles.OpRoleAddActions:         manageRolePermission,
+		roles.OpRoleListActions:        manageRolePermission,
+		roles.OpRoleCheckActionsExists: manageRolePermission,
+		roles.OpRoleRemoveActions:      manageRolePermission,
+		roles.OpRoleRemoveAllActions:   manageRolePermission,
+		roles.OpRoleAddMembers:         addRoleUsersPermission,
+		roles.OpRoleListMembers:        viewRoleUsersPermission,
+		roles.OpRoleCheckMembersExists: viewRoleUsersPermission,
+		roles.OpRoleRemoveMembers:      removeRoleUsersPermission,
+		roles.OpRoleRemoveAllMembers:   manageRolePermission,
 	}
 	return opPerm
 }