SMQ-3233 - Move callout to seperate middleware (#3244)

Signed-off-by: nyagamunene <[email protected]>

Author: nyagamunene

channels/middleware/authorization.go

@@ -6,13 +6,11 @@ package middleware
 import (
 	"context"
 	"fmt"
-	"time"
 
 	"github.com/absmach/supermq/auth"
 	"github.com/absmach/supermq/channels"
 	"github.com/absmach/supermq/pkg/authn"
 	smqauthz "github.com/absmach/supermq/pkg/authz"
-	"github.com/absmach/supermq/pkg/callout"
 	"github.com/absmach/supermq/pkg/connections"
 	"github.com/absmach/supermq/pkg/errors"
 	svcerr "github.com/absmach/supermq/pkg/errors/service"
@@ -44,12 +42,11 @@ var (
 var _ channels.Service = (*authorizationMiddleware)(nil)
 
 type authorizationMiddleware struct {
-	svc     channels.Service
-	repo    channels.Repository
-	authz   smqauthz.Authorization
-	opp     svcutil.OperationPerm
-	extOpp  svcutil.ExternalOperationPerm
-	callout callout.Callout
+	svc    channels.Service
+	repo   channels.Repository
+	authz  smqauthz.Authorization
+	opp    svcutil.OperationPerm
+	extOpp svcutil.ExternalOperationPerm
 	rolemw.RoleManagerAuthorizationMiddleware
 }
 
@@ -60,7 +57,6 @@ func NewAuthorization(
 	authz smqauthz.Authorization,
 	channelsOpPerm, rolesOpPerm map[svcutil.Operation]svcutil.Permission,
 	extOpPerm map[svcutil.ExternalOperation]svcutil.Permission,
-	callout callout.Callout,
 ) (channels.Service, error) {
 	opp := channels.NewOperationPerm()
 	if err := opp.AddOperationPermissionMap(channelsOpPerm); err != nil {
@@ -77,7 +73,8 @@ func NewAuthorization(
 	if err := extOpp.Validate(); err != nil {
 		return nil, err
 	}
-	ram, err := rolemw.NewAuthorization(policies.ChannelType, svc, authz, rolesOpPerm, callout)
+
+	ram, err := rolemw.NewAuthorization(policies.ChannelType, svc, authz, rolesOpPerm)
 	if err != nil {
 		return nil, err
 	}
@@ -89,7 +86,6 @@ func NewAuthorization(
 		RoleManagerAuthorizationMiddleware: ram,
 		opp:                                opp,
 		extOpp:                             extOpp,
-		callout:                            callout,
 	}, nil
 }
 
@@ -130,15 +126,6 @@ func (am *authorizationMiddleware) CreateChannels(ctx context.Context, session a
 		}
 	}
 
-	params := map[string]any{
-		"entities": chs,
-		"count":    len(chs),
-	}
-
-	if err := am.callOut(ctx, session, channels.OpCreateChannel.String(channels.OperationNames), "", params); err != nil {
-		return []channels.Channel{}, []roles.RoleProvision{}, err
-	}
-
 	return am.svc.CreateChannels(ctx, session, chs...)
 }
 
@@ -166,10 +153,6 @@ func (am *authorizationMiddleware) ViewChannel(ctx context.Context, session auth
 		return channels.Channel{}, errors.Wrap(err, errView)
 	}
 
-	if err := am.callOut(ctx, session, channels.OpViewChannel.String(channels.OperationNames), id, nil); err != nil {
-		return channels.Channel{}, err
-	}
-
 	return am.svc.ViewChannel(ctx, session, id, withRoles)
 }
 
@@ -191,14 +174,6 @@ func (am *authorizationMiddleware) ListChannels(ctx context.Context, session aut
 		session.SuperAdmin = true
 	}
 
-	params := map[string]any{
-		"pagemeta": pm,
-	}
-
-	if err := am.callOut(ctx, session, channels.OpListChannels.String(channels.OperationNames), "", params); err != nil {
-		return channels.ChannelsPage{}, err
-	}
-
 	return am.svc.ListChannels(ctx, session, pm)
 }
 
@@ -219,15 +194,6 @@ func (am *authorizationMiddleware) ListUserChannels(ctx context.Context, session
 		return channels.ChannelsPage{}, errors.Wrap(err, errList)
 	}
 
-	params := map[string]any{
-		"user_id":  userID,
-		"pagemeta": pm,
-	}
-
-	if err := am.callOut(ctx, session, channels.OpListUserChannels.String(channels.OperationNames), "", params); err != nil {
-		return channels.ChannelsPage{}, err
-	}
-
 	return am.svc.ListUserChannels(ctx, session, userID, pm)
 }
 
@@ -255,10 +221,6 @@ func (am *authorizationMiddleware) UpdateChannel(ctx context.Context, session au
 		return channels.Channel{}, errors.Wrap(err, errUpdate)
 	}
 
-	if err := am.callOut(ctx, session, channels.OpUpdateChannel.String(channels.OperationNames), channel.ID, nil); err != nil {
-		return channels.Channel{}, err
-	}
-
 	return am.svc.UpdateChannel(ctx, session, channel)
 }
 
@@ -286,10 +248,6 @@ func (am *authorizationMiddleware) UpdateChannelTags(ctx context.Context, sessio
 		return channels.Channel{}, errors.Wrap(err, errUpdateTags)
 	}
 
-	if err := am.callOut(ctx, session, channels.OpUpdateChannelTags.String(channels.OperationNames), channel.ID, nil); err != nil {
-		return channels.Channel{}, err
-	}
-
 	return am.svc.UpdateChannelTags(ctx, session, channel)
 }
 
@@ -317,10 +275,6 @@ func (am *authorizationMiddleware) EnableChannel(ctx context.Context, session au
 		return channels.Channel{}, errors.Wrap(err, errEnable)
 	}
 
-	if err := am.callOut(ctx, session, channels.OpEnableChannel.String(channels.OperationNames), id, nil); err != nil {
-		return channels.Channel{}, err
-	}
-
 	return am.svc.EnableChannel(ctx, session, id)
 }
 
@@ -348,10 +302,6 @@ func (am *authorizationMiddleware) DisableChannel(ctx context.Context, session a
 		return channels.Channel{}, errors.Wrap(err, errDisable)
 	}
 
-	if err := am.callOut(ctx, session, channels.OpDisableChannel.String(channels.OperationNames), id, nil); err != nil {
-		return channels.Channel{}, err
-	}
-
 	return am.svc.DisableChannel(ctx, session, id)
 }
 
@@ -378,10 +328,6 @@ func (am *authorizationMiddleware) RemoveChannel(ctx context.Context, session au
 		return errors.Wrap(err, errDelete)
 	}
 
-	if err := am.callOut(ctx, session, channels.OpDeleteChannel.String(channels.OperationNames), id, nil); err != nil {
-		return err
-	}
-
 	return am.svc.RemoveChannel(ctx, session, id)
 }
 
@@ -436,16 +382,6 @@ func (am *authorizationMiddleware) Connect(ctx context.Context, session authn.Se
 		}
 	}
 
-	params := map[string]any{
-		"channel_ids":      chIDs,
-		"client_ids":       thIDs,
-		"connection_types": connTypes,
-	}
-
-	if err := am.callOut(ctx, session, channels.OpConnectClient.String(channels.OperationNames), "", params); err != nil {
-		return err
-	}
-
 	return am.svc.Connect(ctx, session, chIDs, thIDs, connTypes)
 }
 
@@ -501,16 +437,6 @@ func (am *authorizationMiddleware) Disconnect(ctx context.Context, session authn
 		}
 	}
 
-	params := map[string]any{
-		"channel_ids":      chIDs,
-		"client_ids":       thIDs,
-		"connection_types": connTypes,
-	}
-
-	if err := am.callOut(ctx, session, channels.OpDisconnectClient.String(channels.OperationNames), "", params); err != nil {
-		return err
-	}
-
 	return am.svc.Disconnect(ctx, session, chIDs, thIDs, connTypes)
 }
 
@@ -548,14 +474,6 @@ func (am *authorizationMiddleware) SetParentGroup(ctx context.Context, session a
 		return errors.Wrap(err, errGroupSetChildChannels)
 	}
 
-	params := map[string]any{
-		"parent_group_id": parentGroupID,
-	}
-
-	if err := am.callOut(ctx, session, channels.OpSetParentGroup.String(channels.OperationNames), id, params); err != nil {
-		return err
-	}
-
 	return am.svc.SetParentGroup(ctx, session, parentGroupID, id)
 }
 
@@ -598,14 +516,6 @@ func (am *authorizationMiddleware) RemoveParentGroup(ctx context.Context, sessio
 			return errors.Wrap(err, errGroupRemoveChildChannels)
 		}
 
-		params := map[string]any{
-			"parent_group_id": ch.ParentGroup,
-		}
-
-		if err := am.callOut(ctx, session, channels.OpRemoveParentGroup.String(channels.OperationNames), id, params); err != nil {
-			return err
-		}
-
 		return am.svc.RemoveParentGroup(ctx, session, id)
 	}
 	return nil
@@ -656,24 +566,3 @@ func (am *authorizationMiddleware) checkSuperAdmin(ctx context.Context, session
 	}
 	return nil
 }
-
-func (am *authorizationMiddleware) callOut(ctx context.Context, session authn.Session, op, entityID string, pld map[string]any) error {
-	req := callout.Request{
-		BaseRequest: callout.BaseRequest{
-			Operation:  op,
-			EntityType: policies.ChannelType,
-			EntityID:   entityID,
-			CallerID:   session.UserID,
-			CallerType: policies.UserType,
-			DomainID:   session.DomainID,
-			Time:       time.Now().UTC(),
-		},
-		Payload: pld,
-	}
-
-	if err := am.callout.Callout(ctx, req); err != nil {
-		return err
-	}
-
-	return nil
-}