Add #183 Event lists in webhook should be configured

src/config/config.go

@@ -69,7 +69,7 @@ type KafkaConfig struct {
 
 // WebhooksConfig webhooks configuration (kafka broker cluster, topic e.t.c)
 type WebhooksConfig struct {
-	KafkaConfig KafkaConfig
+	Events []string `json:"events"`
 }
 
 // Organization organization data type

src/main/main.go

@@ -20,6 +20,7 @@ import (
 	"github.com/bb-consent/api/src/v2/middleware"
 	"github.com/bb-consent/api/src/v2/sms"
 	v2token "github.com/bb-consent/api/src/v2/token"
+	v2wh "github.com/bb-consent/api/src/v2/webhook"
 	"github.com/bb-consent/api/src/webhooks"
 	"github.com/casbin/casbin/v2"
 	"github.com/gorilla/mux"
@@ -49,6 +50,7 @@ func startAPICmdHandlerfunc(cmd *cobra.Command, args []string) {
 
 	// Webhooks
 	webhooks.Init(loadedConfig)
+	v2wh.Init(loadedConfig)
 	log.Println("Webhooks configuration initialized")
 
 	// IAM

src/v1/handler/webhooks_handler.go

@@ -748,7 +748,7 @@ func ReDeliverWebhook(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Converting the webhook payload to bytes
-	webhookPayloadBytes, err := json.Marshal(webhookDelivery.RequestPayload)
+	_, err = json.Marshal(webhookDelivery.RequestPayload)
 	if err != nil {
 		m := fmt.Sprintf("Failed to convert webhook event data to bytes, error:%v; Failed to redeliver payload for webhook for event:<%s>, user:<%s>, org:<%s>", err.Error(), webhookDelivery.WebhookEventType, webhookDelivery.UserID, organizationID)
 		common.HandleError(w, http.StatusInternalServerError, m, err)
@@ -763,7 +763,7 @@ func ReDeliverWebhook(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	go wh.PushWebhookEventToKafkaTopic(webhookDelivery.WebhookEventType, webhookPayloadBytes, wh.WebhooksConfiguration.KafkaConfig.Topic)
+	// go wh.PushWebhookEventToKafkaTopic(webhookDelivery.WebhookEventType, webhookPayloadBytes, wh.WebhooksConfiguration.KafkaConfig.Topic)
 
 	// Log webhook calls in webhooks category
 	aLog := fmt.Sprintf("Organization webhook: %v triggered by user: %v by event: %v", webhook.PayloadURL, u.Email, webhookDelivery.WebhookEventType)

src/v2/handler/webhook/config_list_webhook_event_types.go

@@ -10,18 +10,17 @@ import (
 
 // WebhookEventTypesResp Define response structure for webhook event types
 type WebhookEventTypesResp struct {
-	EventTypes []string
+	EventTypes []string `json:"eventTypes"`
 }
 
 // ConfigListWebhookEventTypes List available webhook event types
 func ConfigListWebhookEventTypes(w http.ResponseWriter, r *http.Request) {
-	var webhookEventTypesResp WebhookEventTypesResp
 
-	for _, eventType := range wh.EventTypes {
-		webhookEventTypesResp.EventTypes = append(webhookEventTypesResp.EventTypes, eventType)
+	resp := WebhookEventTypesResp{
+		wh.WebhooksConfiguration.Events,
 	}
 
-	response, _ := json.Marshal(webhookEventTypesResp)
+	response, _ := json.Marshal(resp)
 	w.Header().Set(config.ContentTypeHeader, config.ContentTypeJSON)
 	w.WriteHeader(http.StatusOK)
 	w.Write(response)

src/v2/handler/webhook/config_redeliver_webhook_payload_by_deliveryid.go

@@ -10,6 +10,7 @@ import (
 	"github.com/bb-consent/api/src/user"
 	"github.com/bb-consent/api/src/v2/actionlog"
 	wh "github.com/bb-consent/api/src/v2/webhook"
+	"github.com/bb-consent/api/src/v2/webhook_dispatcher"
 	"github.com/gorilla/mux"
 )
 
@@ -61,7 +62,7 @@ func ConfigRedeliverWebhookPayloadByDeliveryID(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	go wh.PushWebhookEventToKafkaTopic(webhookDelivery.WebhookEventType, webhookPayloadBytes, wh.WebhooksConfiguration.KafkaConfig.Topic)
+	go webhook_dispatcher.ProcessWebhooks(webhookDelivery.WebhookEventType, webhookPayloadBytes)
 
 	// Log webhook calls in webhooks category
 	aLog := fmt.Sprintf("Organization webhook: %v triggered by user: %v by event: %v", webhook.PayloadURL, u.Email, webhookDelivery.WebhookEventType)

src/v2/webhook/webhook.go

@@ -10,11 +10,9 @@ import (
 	"time"
 
 	"github.com/bb-consent/api/src/config"
-	"github.com/bb-consent/api/src/kafkaUtils"
 	"github.com/bb-consent/api/src/user"
 	"github.com/bb-consent/api/src/v2/actionlog"
 	"github.com/bb-consent/api/src/v2/webhook_dispatcher"
-	"github.com/confluentinc/confluent-kafka-go/kafka"
 )
 
 // Event type const
@@ -175,36 +173,6 @@ func (e DataUpdateRequestWebhookEvent) GetUserID() string {
 	return e.UserID
 }
 
-func PushWebhookEventToKafkaTopic(webhookEventType string, webhookPayload []byte, kafkaTopicName string) error {
-
-	// Creating a delivery report channel
-	deliveryChan := make(chan kafka.Event)
-
-	// Kafka producer emits messages to producer channel queue and then librdkafka queue, so double queuing
-	// Pushing the webhook event payload to given topic
-	err := kafkaUtils.KafkaProducerClient.Producer.Produce(&kafka.Message{
-		TopicPartition: kafka.TopicPartition{Topic: &kafkaTopicName, Partition: kafka.PartitionAny},
-		Key:            []byte(webhookEventType), // webhook event type ID
-		Value:          webhookPayload,
-	}, deliveryChan)
-	if err != nil {
-		return err
-	}
-
-	e := <-deliveryChan
-	m := e.(*kafka.Message)
-
-	// If the message was not delivered successfully to the kafka topic
-	if m.TopicPartition.Error != nil {
-		return m.TopicPartition.Error
-	}
-
-	close(deliveryChan)
-
-	return nil
-
-}
-
 // PingWebhook Pings webhook payload URL to check the status
 func PingWebhook(webhook Webhook) (req *http.Request, resp *http.Response, executionStartTimeStamp string, executionEndTimeStamp string, err error) {
 	executionStartTimeStamp = strconv.FormatInt(time.Now().UTC().Unix(), 10)
@@ -272,13 +240,6 @@ func TriggerWebhooks(webhookEventData WebhookEventData, webhookEventType string)
 			return
 		}
 
-		// Push the webhook event payload to the kafka topic
-		err = PushWebhookEventToKafkaTopic(webhookEventType, b, WebhooksConfiguration.KafkaConfig.Topic)
-		if err != nil {
-			log.Printf("Failed to push the webhook event to kafka, error:%v, Failed to trigger webhook for event:<%s>, user:<%s>, org:<%s>", err.Error(), webhookEventType, u.ID.Hex(), webhookEventData.GetOrganisationID())
-			return
-		}
-
 		go webhook_dispatcher.ProcessWebhooks(webhookEventType, b)
 
 		// Log webhook calls in webhooks category