Merge pull request #619 from snowplow/release/2.1.1

Release/2.1.1
snowplow · Jun 24, 2021 · 2b0d6b7 · 2b0d6b7
2 parents 1afcf4c + 323dc88
commit 2b0d6b7
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 9 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,8 @@
 
+Version 2.1.1 (2021-06-24)
+--------------------------
+Fix Gdpr context being tracked without enabling it (#618)
+
 Version 2.1.0 (2021-06-18)
 --------------------------
 Fix sessionIndex starting from 0 rather than 1 (#616)

diff --git a/Snowplow iOSTests/Configurations/TestTrackerConfiguration.m b/Snowplow iOSTests/Configurations/TestTrackerConfiguration.m
@@ -215,4 +215,52 @@ - (void)testGDPRConfiguration {
     XCTAssertTrue(gdprController.isEnabled);
 }
 
+- (void)testWithoutGDPRConfiguration {
+    SPMockEventStore *eventStore = [SPMockEventStore new];
+    SPNetworkConfiguration *networkConfiguration = [[SPNetworkConfiguration alloc] initWithEndpoint:@"fake-url" method:SPHttpMethodPost];
+    SPTrackerConfiguration *trackerConfiguration = [[[SPTrackerConfiguration alloc] init] appId:@"appid"];
+    trackerConfiguration.base64Encoding = NO;
+    SPEmitterConfiguration *emitterConfiguration = [[SPEmitterConfiguration alloc] init];
+    emitterConfiguration.eventStore = eventStore;
+    emitterConfiguration.threadPoolSize = 10;
+    id<SPTrackerController> trackerController = [SPSnowplow createTrackerWithNamespace:@"namespace" network:networkConfiguration configurations:@[trackerConfiguration, emitterConfiguration]];
+    id<SPGDPRController> gdprController = trackerController.gdpr;
+
+    // Check gdpr settings
+    XCTAssertFalse(gdprController.isEnabled);
+
+    // Check gdpr context not added
+    SPStructured *event = [[SPStructured alloc] initWithCategory:@"category" action:@"action"];
+    [trackerController track:event];
+    for (int i=0; eventStore.count < 1 && i < 10; i++) {
+        [NSThread sleepForTimeInterval:1];
+    }
+    NSArray<SPEmitterEvent *> *events = [eventStore emittableEventsWithQueryLimit:10];
+    [eventStore removeAllEvents];
+    XCTAssertEqual(1, events.count);
+    SPPayload *payload = [[events firstObject] payload];
+    NSString *contexts = (NSString *)[[payload getAsDictionary] objectForKey:@"co"];
+    XCTAssertFalse([contexts containsString:@"\"basisForProcessing\""]);
+
+    // Check gdpr can be enabled again
+    [gdprController resetWithBasis:SPGdprProcessingBasisContract documentId:@"id1" documentVersion:@"ver1" documentDescription:@"desc1"];
+    XCTAssertEqual(SPGdprProcessingBasisContract, gdprController.basisForProcessing);
+    XCTAssertEqualObjects(@"id1", gdprController.documentId);
+    XCTAssertTrue(gdprController.isEnabled);
+
+    // Check gdpr context added
+    event = [[SPStructured alloc] initWithCategory:@"category" action:@"action"];
+    [trackerController track:event];
+    for (int i=0; eventStore.count < 1 && i < 10; i++) {
+        [NSThread sleepForTimeInterval:1];
+    }
+    events = [eventStore emittableEventsWithQueryLimit:10];
+    [eventStore removeAllEvents];
+    XCTAssertEqual(1, events.count);
+    payload = [[events firstObject] payload];
+    contexts = (NSString *)[[payload getAsDictionary] objectForKey:@"co"];
+    XCTAssertTrue([contexts containsString:@"\"basisForProcessing\":\"contract\""]);
+    XCTAssertTrue([contexts containsString:@"\"documentId\":\"id1\""]);
+}
+
 @end
diff --git a/Snowplow/Internal/SPTrackerConstants.m b/Snowplow/Internal/SPTrackerConstants.m
@@ -27,13 +27,13 @@ @implementation SPTrackerConstants
 // --- Version
 
 #if SNOWPLOW_TARGET_IOS
-NSString * const kSPVersion               = @"ios-2.1.0";
+NSString * const kSPVersion               = @"ios-2.1.1";
 #elif SNOWPLOW_TARGET_TV
-NSString * const kSPVersion               = @"tvos-2.1.0";
+NSString * const kSPVersion               = @"tvos-2.1.1";
 #elif SNOWPLOW_TARGET_WATCHOS
-NSString * const kSPVersion               = @"watchos-2.1.0";
+NSString * const kSPVersion               = @"watchos-2.1.1";
 #else
-NSString * const kSPVersion               = @"osx-2.1.0";
+NSString * const kSPVersion               = @"osx-2.1.1";
 #endif
 
 // --- Emitter

diff --git a/Snowplow/Internal/Tracker/SPServiceProvider.m b/Snowplow/Internal/Tracker/SPServiceProvider.m
@@ -297,7 +297,6 @@ - (SPTracker *)makeTracker {
     SPTrackerConfiguration *trackerConfig = self.trackerConfigurationUpdate;
     SPSessionConfiguration *sessionConfig = self.sessionConfigurationUpdate;
     SPGlobalContextsConfiguration *gcConfig = self.globalContextConfiguration;
-    SPGDPRConfiguration *gdprConfig = self.gdprConfigurationUpdate;
     SPTracker *tracker = [SPTracker build:^(id<SPTrackerBuilder> builder) {
         [builder setTrackerNamespace:self.namespace];
         [builder setEmitter:emitter];
@@ -322,7 +321,8 @@ - (SPTracker *)makeTracker {
         if (gcConfig) {
             [builder setGlobalContextGenerators:gcConfig.contextGenerators];
         }
-        if (gdprConfig) {
+        SPGDPRConfigurationUpdate *gdprConfig = self.gdprConfigurationUpdate;
+        if (gdprConfig.sourceConfig) {
             [builder setGdprContextWithBasis:gdprConfig.basisForProcessing documentId:gdprConfig.documentId documentVersion:gdprConfig.documentVersion documentDescription:gdprConfig.documentDescription];
         }
     }];
@@ -353,7 +353,9 @@ - (SPEmitterControllerImpl *)makeEmitterController {
 - (SPGDPRControllerImpl *)makeGDPRController {
     SPGDPRControllerImpl *controller = [[SPGDPRControllerImpl alloc] initWithServiceProvider:self];
     SPGdprContext *gdpr = self.tracker.gdprContext;
-    [controller resetWithBasis:gdpr.basis documentId:gdpr.documentId documentVersion:gdpr.documentVersion documentDescription:gdpr.documentDescription];
+    if (gdpr) {
+        [controller resetWithBasis:gdpr.basis documentId:gdpr.documentId documentVersion:gdpr.documentVersion documentDescription:gdpr.documentDescription];
+    }
     return controller;
 }
 

diff --git a/SnowplowTracker.podspec b/SnowplowTracker.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "SnowplowTracker"
-  s.version          = "2.1.0"
+  s.version          = "2.1.1"
   s.summary          = "Snowplow event tracker for iOS, macOS, tvOS, watchOS for apps and games."
   s.description      = <<-DESC
   Snowplow is a mobile and event analytics platform with a difference: rather than tell our users how they should analyze their data, we deliver their event-level data in their own data warehouse, on their own Amazon Redshift or Postgres database, so they can analyze it any way they choose. Snowplow mobile is used by data-savvy games companies and app developers to better understand their users and how they engage with their games and applications. Snowplow is open source using the business-friendly Apache License, Version 2.0 and scales horizontally to many billions of events.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.0
+2.1.1