Propagate the SDK version to ios-eventsource as User-Agent

Darkly.xcodeproj/project.pbxproj

@@ -730,7 +730,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		3C6B373432EFD282378462BE /* [CP] Copy Pods Resources */ = {
@@ -760,7 +760,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		5C4803774368D95181AF24C4 /* [CP] Check Pods Manifest.lock */ = {
@@ -775,7 +775,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		5D2C539BFFB0DE3649453E89 /* [CP] Copy Pods Resources */ = {
@@ -835,7 +835,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		BF156E0BAB52CCB17B6F9FDC /* [CP] Check Pods Manifest.lock */ = {
@@ -850,7 +850,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

Darkly/DarklyConstants.m

@@ -4,7 +4,7 @@
 
 #import "DarklyConstants.h"
 
-NSString * const kClientVersion = @"2.4.1";
+NSString * const kClientVersion = @"2.4.2";
 NSString * const kBaseUrl = @"https://app.launchdarkly.com";
 NSString * const kEventsUrl = @"https://mobile.launchdarkly.com";
 NSString * const kStreamUrl = @"https://clientstream.launchdarkly.com/mping";

Darkly/LDClientManager.m

@@ -50,7 +50,8 @@ - (void)startPolling {
     [pollingMgr startEventPolling];
 
     if ([config streaming]) {
-        eventSource = [EventSource eventSourceWithURL:[NSURL URLWithString:kStreamUrl] mobileKey:config.mobileKey timeoutInterval:[config.connectionTimeout doubleValue]];
+
+        eventSource = [EventSource eventSourceWithURL:[NSURL URLWithString:kStreamUrl] httpHeaders:[self httpHeadersForEventSource] timeoutInterval:[config.connectionTimeout doubleValue]];
 
         [eventSource onMessage:^(Event *e) {
             [self syncWithServerForConfig];
@@ -106,7 +107,7 @@ - (void)willEnterForeground {
     LDClient *client = [LDClient sharedInstance];
 
     if ([[client ldConfig] streaming]) {
-        eventSource = [EventSource eventSourceWithURL:[NSURL URLWithString:kStreamUrl] mobileKey:client.ldConfig.mobileKey];
+        eventSource = [EventSource eventSourceWithURL:[NSURL URLWithString:kStreamUrl] httpHeaders:[self httpHeadersForEventSource]];
 
         [eventSource onMessage:^(Event *e) {
             [self syncWithServerForConfig];
@@ -200,5 +201,15 @@ - (void)processedConfig:(BOOL)success jsonConfigDictionary:(NSDictionary *)jsonC
         DEBUG_LOGX(@"ClientManager processedConfig method called after receiving failure response from server");
     }
 }
+
+- (NSDictionary *)httpHeadersForEventSource {
+    NSMutableDictionary *headers = [[NSMutableDictionary alloc] init];
+
+    NSString *authKey = [kHeaderMobileKey stringByAppendingString:[[[LDClient sharedInstance] ldConfig] mobileKey]];
+
+    [headers setObject:authKey forKey:@"Authorization"];
+    [headers setObject:[@"iOS/" stringByAppendingString:kClientVersion] forKey:@"User-Agent"];
+    return headers;
+}
 
 @end

Darkly/LDRequestManager.h

@@ -16,6 +16,7 @@
 
 }
 
+extern NSString * const kHeaderMobileKey;
 @property (nonatomic) NSString* mobileKey;
 @property (nonatomic) NSString* baseUrl;
 @property (nonatomic) NSString* eventsUrl;

Darkly/LDRequestManager.m

@@ -9,7 +9,7 @@
 
 static NSString * const kFeatureFlagUrl = @"/msdk/eval/users/";
 static NSString * const kEventUrl = @"/mobile/events/bulk";
-static NSString * const kHeaderMobileKey = @"api_key ";
+NSString * const kHeaderMobileKey = @"api_key ";
 static NSString * const kConfigRequestCompletedNotification = @"config_request_completed_notification";
 static NSString * const kEventRequestCompletedNotification = @"event_request_completed_notification";
 

LaunchDarkly.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "LaunchDarkly"
-  s.version      = "2.4.1"
+  s.version      = "2.4.2"
   s.summary      = "iOS SDK for LaunchDarkly"
 
   s.description  = <<-DESC
@@ -23,13 +23,13 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target    = "9.0"
   s.osx.deployment_target     = '10.10'
 
-  s.source       = { :git => "https://github.com/launchdarkly/ios-client.git", :tag => "2.4.1" }
+  s.source       = { :git => "https://github.com/launchdarkly/ios-client.git", :tag => "2.4.2" }
 
   s.source_files  = "Darkly/*.{h,m}"
 
   s.requires_arc = true
 
   s.subspec 'Core' do |ss|
-    ss.dependency 'DarklyEventSource', '~> 1.3.2'
+    ss.dependency 'DarklyEventSource', '~> 2.0.0'
   end
 end

Podfile

@@ -1,21 +1,21 @@
 target 'Darkly_iOS' do
     platform :ios, '8.0'
-    pod 'DarklyEventSource', '~> 1.3.2'
+    pod 'DarklyEventSource', '~> 2.0.0'
 end
 
 target 'Darkly_tvOS' do
     platform :tvos, '9.0'
-    pod 'DarklyEventSource', '~> 1.3.2'
+    pod 'DarklyEventSource', '~> 2.0.0'
 end
 
 target 'Darkly_watchOS' do
     platform :watchos, '2.0'
-    pod 'DarklyEventSource', '~> 1.3.2'
+    pod 'DarklyEventSource', '~> 2.0.0'
 end
 
 target 'Darkly_osx' do
     platform :osx, '10.10'
-    pod 'DarklyEventSource', '~> 1.3.2'
+    pod 'DarklyEventSource', '~> 2.0.0'
 end
 
 target 'DarklyTests' do

Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - DarklyEventSource (1.3.2)
+  - DarklyEventSource (2.0.0)
   - OCMock (3.4)
   - OHHTTPStubs (4.8.0):
     - OHHTTPStubs/Default (= 4.8.0)
@@ -16,15 +16,15 @@ PODS:
   - OHHTTPStubs/OHPathHelpers (4.8.0)
 
 DEPENDENCIES:
-  - DarklyEventSource (~> 1.3.2)
+  - DarklyEventSource (~> 2.0.0)
   - OCMock (~> 3.1)
   - OHHTTPStubs (~> 4.2)
 
 SPEC CHECKSUMS:
-  DarklyEventSource: 3e7d841a21c024be53ce4ea6b2c38883ff5abacd
+  DarklyEventSource: 710930f8f17e75abaf4d6c38a31a71718cc151e5
   OCMock: 35ae71d6a8fcc1b59434d561d1520b9dd4f15765
   OHHTTPStubs: b393565822317305b87a1440d4c7aff131679f66
 
-PODFILE CHECKSUM: 78938681ef11778def1ee4bdd045f33cae8cae9e
+PODFILE CHECKSUM: d836ea6c9bef753ac2087843fcd31ef94b56e250
 
 COCOAPODS: 1.2.1