Adds conf flag to allow default properties in customer update

Author: adam1929

README.md

@@ -14,7 +14,7 @@ exponea: x.y.z
 * `$ cd ios`
 * `$ pod install`
 
-Minimal supported iOS version for Exponea SDK is 10.3, you may need to change iOS version on the first line of your `ios/Podfile` to `platform :ios, '10.3'`, or higher.
+Minimal supported iOS version for Exponea SDK is 11.0, you may need to change iOS version on the first line of your `ios/Podfile` to `platform :ios, '11.0'`, or higher.
 
 ### Android setup
 You'll most likely need to enable multidex. Edit `android/app/build.gradle` and add `multiDexEnabled true` to android defaultConfig.

android/src/main/kotlin/com/exponea/data/ExponeaConfigurationParser.kt

@@ -32,6 +32,9 @@ class ExponeaConfigurationParser {
             map.getOptional<Boolean>("automaticSessionTracking")?.let {
                 automaticSessionTracking = it
             }
+            map.getOptional<Boolean>("allowDefaultCustomerProperties")?.let {
+                allowDefaultCustomerProperties = it
+            }
             map.getOptional<String>("pushTokenTrackingFrequency")?.let {
                 try {
                     tokenTrackFrequency = ExponeaConfiguration.TokenFrequency.valueOf(it)

example/android/app/src/test/kotlin/com/exponea/example/ConfigurationTest.kt

@@ -72,5 +72,6 @@ class ConfigurationTest {
         assertEquals(config.sessionTimeout.toInt(), 20);
         assertEquals(config.automaticSessionTracking, true);
         assertEquals(config.tokenTrackFrequency, TokenFrequency.DAILY);
+        assertEquals(config.allowDefaultCustomerProperties, true);
     }
 }

example/ios/ExponeaTests/ExponeaConfigurationSpec.swift

@@ -54,6 +54,8 @@ class ExponeaConfigurationParserSpec: QuickSpec {
                 expect(notifTracking.appGroup).to(equal(""))
                 expect(notifTracking.requirePushAuthorization).to(equal(true))
                 expect(notifTracking.isEnabled).to(equal(true))
+                
+                expect(config.allowDefaultCustomerProperties).to(beNil())
             }
 
             it("full") {
@@ -96,6 +98,8 @@ class ExponeaConfigurationParserSpec: QuickSpec {
                 expect(notifTracking.appGroup).to(equal("mock-app-group"))
                 expect(notifTracking.requirePushAuthorization).to(equal(false))
                 expect(notifTracking.delegate).to(beNil())
+                
+                expect(config.allowDefaultCustomerProperties).to(equal(true))
             }
         }
     }

example/ios/Podfile.lock

@@ -2,11 +2,11 @@ PODS:
   - AnyCodable-FlightSchool (0.6.3)
   - exponea (0.0.1):
     - AnyCodable-FlightSchool (= 0.6.3)
-    - ExponeaSDK (= 2.12.1)
+    - ExponeaSDK (= 2.13.1)
     - Flutter
-  - ExponeaSDK (2.12.1):
+  - ExponeaSDK (2.13.1):
     - SwiftSoup (= 2.4.3)
-  - ExponeaSDK-Notifications (2.12.1)
+  - ExponeaSDK-Notifications (2.13.1)
   - Flutter (1.0.0)
   - Nimble (9.2.1)
   - Quick (4.0.0)
@@ -46,9 +46,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   AnyCodable-FlightSchool: 1c9890be5884140c60da5fde1b66380dec4c244a
-  exponea: 51eabd1894473ae5b26c48fd45e1d8deeb927346
-  ExponeaSDK: a5cfdb245311656eb9d77251e665a32058dd2bf1
-  ExponeaSDK-Notifications: 51afe956fe5697dfa7625cbb0cbc5128fda581da
+  exponea: 4eb412fccf4a68cf8509566b158d6e72be578f26
+  ExponeaSDK: 4e2567f56fda8a1cb20560ceb33cd03836fbb9f3
+  ExponeaSDK-Notifications: 8c776f24b10de56ba09dc50d2542d49888b6e894
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
   Nimble: e7e615c0335ee4bf5b0d786685451e62746117d5
   Quick: 6473349e43b9271a8d43839d9ba1c442ed1b7ac4

example/ios/Runner.xcodeproj/project.pbxproj

@@ -761,7 +761,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -788,7 +788,7 @@
 				ENABLE_BITCODE = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1129,7 +1129,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1178,7 +1178,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -1207,7 +1207,7 @@
 				ENABLE_BITCODE = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1241,7 +1241,7 @@
 				ENABLE_BITCODE = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = Runner/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

example/lib/page/config.dart

@@ -134,6 +134,7 @@ class _ConfigPageState extends State<ConfigPage> {
         'int': 10,
         'bool': true,
       },
+      allowDefaultCustomerProperties: false,
       // projectMapping: {
       //   EventType.banner: [
       //     ExponeaProject(projectToken: '1', authorizationToken: '11'),
@@ -165,6 +166,7 @@ class _ConfigPageState extends State<ConfigPage> {
         );
         ScaffoldMessenger.of(context).showSnackBar(snackBar);
       }
+      _plugin.setLogLevel(LogLevel.verbose);
       widget.doneCallback.call(config);
     } on PlatformException catch (err) {
       final snackBar = SnackBar(

ios/Classes/Data/ExponeaConfiguration.swift

@@ -14,12 +14,18 @@ class ExponeaConfiguration {
     let automaticSessionTracking: ExponeaSDK.Exponea.AutomaticSessionTracking
     let flushingSetup: ExponeaSDK.Exponea.FlushingSetup
     let defaultProperties: [String: JSONConvertible]?
+    let allowDefaultCustomerProperties: Bool?
 
     init(_ data: [String:Any?], parser: ConfigurationParser) throws {
         self.projectSettings = try parser.parseProjectSettings(data)
         self.pushNotificationTracking = try parser.parsePushNotificationTracking(data)
         self.automaticSessionTracking = try parser.parseSessionTracking(data)
         self.flushingSetup = try parser.parseFlushingSetup(data)
         self.defaultProperties = try parser.parseDefaultProperties(data)
+        if let allowDefaultCustomerProperties = data["allowDefaultCustomerProperties"] as? Bool {
+            self.allowDefaultCustomerProperties = allowDefaultCustomerProperties
+        } else {
+            self.allowDefaultCustomerProperties = nil
+        }
     }
 }

ios/Classes/SwiftExponeaPlugin.swift

@@ -130,7 +130,8 @@ public class SwiftExponeaPlugin: NSObject, FlutterPlugin {
                 pushNotificationTracking: config.pushNotificationTracking,
                 automaticSessionTracking: config.automaticSessionTracking,
                 defaultProperties: config.defaultProperties,
-                flushingSetup: config.flushingSetup
+                flushingSetup: config.flushingSetup,
+                allowDefaultCustomerProperties: config.allowDefaultCustomerProperties
             )
             exponeaInstance.pushNotificationsDelegate = self
             result(true)

ios/exponea.podspec

@@ -17,7 +17,7 @@ A new flutter plugin project.
   s.dependency 'Flutter'
   s.dependency 'ExponeaSDK', '2.13.1'
   s.dependency 'AnyCodable-FlightSchool', '0.6.3'
-  s.platform = :ios, '10.3'
+  s.platform = :ios, '11.0'
 
   # Flutter.framework does not contain a i386 slice.
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }

lib/src/data/encoder/configuration.dart

@@ -23,6 +23,7 @@ abstract class ExponeaConfigurationEncoder {
       pushTokenTrackingFrequency: data
           .getOptional<String>('pushTokenTrackingFrequency')
           ?.let(TokenFrequencyEncoder.decode),
+      allowDefaultCustomerProperties: data.getOptional('allowDefaultCustomerProperties'),
       android: data
           .getOptional<Map<String, dynamic>>('android')
           ?.let(AndroidExponeaConfigurationEncoder.decode),
@@ -43,6 +44,7 @@ abstract class ExponeaConfigurationEncoder {
       'flushMaxRetries': config.flushMaxRetries?.toDouble(),
       'sessionTimeout': config.sessionTimeout,
       'automaticSessionTracking': config.automaticSessionTracking,
+      'allowDefaultCustomerProperties': config.allowDefaultCustomerProperties,
       'pushTokenTrackingFrequency':
           config.pushTokenTrackingFrequency?.let(TokenFrequencyEncoder.encode),
       'android': config.android?.let(AndroidExponeaConfigurationEncoder.encode),

lib/src/data/model/configuration.dart

@@ -1,3 +1,5 @@
+import 'dart:ffi';
+
 import 'package:meta/meta.dart';
 
 import 'event_type.dart';
@@ -35,6 +37,9 @@ class ExponeaConfiguration {
   /// Defines how often should the SDK track push notification token to Exponea
   final TokenFrequency? pushTokenTrackingFrequency;
 
+  /// If true, default properties are applied also for 'identifyCustomer' event.
+  final bool? allowDefaultCustomerProperties;
+
   /// Platform specific settings for Android
   final AndroidExponeaConfiguration? android;
 
@@ -51,6 +56,7 @@ class ExponeaConfiguration {
     this.sessionTimeout,
     this.automaticSessionTracking,
     this.pushTokenTrackingFrequency,
+    this.allowDefaultCustomerProperties,
     this.android,
     this.ios,
   });

test/unit/data/configuration_test.dart

@@ -46,6 +46,7 @@ void main() {
             "array": ["value1", "value2"],
             "object": {"key": "value"},
           },
+          allowDefaultCustomerProperties: true,
           flushMaxRetries: 10,
           sessionTimeout: 20,
           automaticSessionTracking: true,
@@ -115,6 +116,7 @@ void main() {
         expect(decoded.flushMaxRetries, 10);
         expect(decoded.sessionTimeout, 20.0);
         expect(decoded.automaticSessionTracking, true);
+        expect(decoded.allowDefaultCustomerProperties, true);
         expect(decoded.pushTokenTrackingFrequency, TokenFrequency.daily);
         expect(decoded.android != null, true);
         final android = decoded.android!;

test/values/configuration.json

@@ -1,5 +1,5 @@
 [
   {},
   {"projectToken":"mock-project-token","authorizationToken":"mock-auth-token"},
-  {"projectToken":"mock-project-token","authorizationToken":"mock-auth-token","baseUrl":"http://mock.base.url.com","projectMapping":{"BANNER":[{"projectToken":"other-project-token","authorizationToken":"other-auth-token"}]},"defaultProperties":{"string":"value","boolean":false,"number":3.14159,"array":["value1","value2"],"object":{"key":"value"}},"flushMaxRetries":10,"sessionTimeout":20.0,"automaticSessionTracking":true,"pushTokenTrackingFrequency":"DAILY","android":{"automaticPushNotifications":true,"pushIcon":12345,"pushAccentColor":123,"pushChannelName":"mock-push-channel-name","pushChannelDescription":"mock-push-channel-description","pushChannelId":"mock-push-channel-id","pushNotificationImportance":"HIGH","httpLoggingLevel":"BODY"},"ios":{"requirePushAuthorization":false,"appGroup":"mock-app-group"}}
+  {"projectToken":"mock-project-token","authorizationToken":"mock-auth-token","baseUrl":"http://mock.base.url.com","projectMapping":{"BANNER":[{"projectToken":"other-project-token","authorizationToken":"other-auth-token"}]},"defaultProperties":{"string":"value","boolean":false,"number":3.14159,"array":["value1","value2"],"object":{"key":"value"}},"flushMaxRetries":10,"sessionTimeout":20.0,"automaticSessionTracking":true,"pushTokenTrackingFrequency":"DAILY","allowDefaultCustomerProperties":true,"android":{"automaticPushNotifications":true,"pushIcon":12345,"pushAccentColor":123,"pushChannelName":"mock-push-channel-name","pushChannelDescription":"mock-push-channel-description","pushChannelId":"mock-push-channel-id","pushNotificationImportance":"HIGH","httpLoggingLevel":"BODY"},"ios":{"requirePushAuthorization":false,"appGroup":"mock-app-group"}}
 ]