remove roles op in channels

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

Author: nyagamunene

channels/middleware/authorization.go

@@ -59,7 +59,8 @@ func AuthorizationMiddleware(
 	svc channels.Service,
 	repo channels.Repository,
 	authz smqauthz.Authorization,
-	channelsOpPerm, rolesOpPerm map[channels.Operation]channels.Permission,
+	channelsOpPerm map[channels.Operation]channels.Permission,
+	rolesOpPerm map[svcutil.Operation]svcutil.Permission,
 	extOpPerm map[channels.ExternalOperation]channels.Permission,
 	callout callout.Callout,
 ) (channels.Service, error) {

channels/roleoperations.go

@@ -3,6 +3,11 @@
 
 package channels
 
+import (
+	"github.com/absmach/supermq/pkg/roles"
+	"github.com/absmach/supermq/pkg/svcutil"
+)
+
 // Internal Operations.
 const (
 	OpViewChannel Operation = iota
@@ -116,41 +121,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
 }