merge develop into main (#67)

Author: stefanvit

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+[2.4.2] - 2024-04-01
+### Fixed
+- Fix add to webtools blacklist [#65](https://github.com/rokwire/gateway-building-block/issues/65)
+
 [2.4.1] - 2024-04-01
 ### Fixed
 - Fix webtools blacklist APIs [#62](https://github.com/rokwire/gateway-building-block/issues/62)

SECURITY.md

@@ -4,8 +4,8 @@
 Patches for **Gateway Building Block** in this repository will only be applied to the following versions:
 | Version | Supported          |
 | ------- | ------------------ |
-| 2.4.1   | :white_check_mark: |
-| < 2.4.1 | :x:                |
+| 2.4.2   | :white_check_mark: |
+| < 2.4.2 | :x:                |
 
 ## Reporting a Bug or Vulnerability
 

driven/storage/adapter.go

@@ -371,28 +371,32 @@ func (a *Adapter) FindAllLegacyEvents() ([]model.LegacyEvent, error) {
 
 // AddWebtoolsBlacklistData update data from the database
 func (a *Adapter) AddWebtoolsBlacklistData(dataSourceIDs []string, dataCalendarIDs []string) error {
-	filterSource := bson.M{"name": "webtools_events_ids"}
-	updateSource := bson.M{
-		"$addToSet": bson.M{
-			"data": bson.M{"$each": dataSourceIDs},
-		},
-	}
+	if dataSourceIDs != nil {
+		filterSource := bson.M{"name": "webtools_events_ids"}
+		updateSource := bson.M{
+			"$addToSet": bson.M{
+				"data": bson.M{"$each": dataSourceIDs},
+			},
+		}
 
-	_, err := a.db.webtoolsBlacklistItems.UpdateOne(a.context, filterSource, updateSource, nil)
-	if err != nil {
-		return errors.WrapErrorAction(logutils.ActionUpdate, model.TypeExample, filterArgs(filterSource), err)
+		_, err := a.db.webtoolsBlacklistItems.UpdateOne(a.context, filterSource, updateSource, nil)
+		if err != nil {
+			return errors.WrapErrorAction(logutils.ActionUpdate, "", filterArgs(filterSource), err)
+		}
 	}
+	if dataCalendarIDs != nil {
+		filterCalendar := bson.M{"name": "webtools_calendar_ids"}
+		updateCalendar := bson.M{
+			"$addToSet": bson.M{
+				"data": bson.M{"$each": dataCalendarIDs},
+			},
+		}
 
-	filterCalendar := bson.M{"name": "webtools_calendar_ids"}
-	updateCalendar := bson.M{
-		"$addToSet": bson.M{
-			"data": bson.M{"$each": dataCalendarIDs},
-		},
-	}
+		_, err := a.db.webtoolsBlacklistItems.UpdateOne(a.context, filterCalendar, updateCalendar, nil)
+		if err != nil {
+			return errors.WrapErrorAction(logutils.ActionUpdate, "", filterArgs(filterCalendar), err)
+		}
 
-	_, err = a.db.webtoolsBlacklistItems.UpdateOne(a.context, filterCalendar, updateCalendar, nil)
-	if err != nil {
-		return errors.WrapErrorAction(logutils.ActionUpdate, model.TypeExample, filterArgs(filterCalendar), err)
 	}
 
 	return nil

driver/web/docs/gen/def.yaml

@@ -2,7 +2,7 @@ openapi: 3.0.3
 info:
   title: Rokwire Gateway Building Block API
   description: Gateway Building Block API Documentation
-  version: 2.4.1
+  version: 2.4.2
 servers:
   - url: 'https://api.rokwire.illinois.edu/gateway'
     description: Production server

driver/web/docs/index.yaml

@@ -2,7 +2,7 @@ openapi: 3.0.3
 info:
   title: Rokwire Gateway Building Block API
   description: Gateway Building Block API Documentation
-  version: 2.4.1
+  version: 2.4.2
 servers:
   - url: 'https://api.rokwire.illinois.edu/gateway'
     description: Production server