Fixed issue where incorrect segment settings could be built (#993)

* Fixed issue where incorrect segment settings could be built

* Modified to use the segment destination name constant

Co-authored-by: Brandon Sneed <[email protected]>

Author: bsneed

Segment/Classes/SEGSegmentIntegration.h

@@ -5,6 +5,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+extern NSString *const kSEGSegmentDestinationName;
+
 extern NSString *const SEGSegmentDidSendRequestNotification;
 extern NSString *const SEGSegmentRequestDidSucceedNotification;
 extern NSString *const SEGSegmentRequestDidFailNotification;

Segment/Classes/SEGSegmentIntegration.m

@@ -13,6 +13,8 @@
 @import UIKit;
 #endif
 
+NSString *const kSEGSegmentDestinationName = @"Segment.io";
+
 NSString *const SEGSegmentDidSendRequestNotification = @"SegmentDidSendRequest";
 NSString *const SEGSegmentRequestDidSucceedNotification = @"SegmentRequestDidSucceed";
 NSString *const SEGSegmentRequestDidFailNotification = @"SegmentRequestDidFail";
@@ -258,7 +260,7 @@ - (NSDictionary *)integrationsDictionary:(NSDictionary *)integrations
     NSMutableDictionary *dict = [integrations ?: @{} mutableCopy];
     for (NSString *integration in self.analytics.bundledIntegrations) {
         // Don't record Segment.io in the dictionary. It is always enabled.
-        if ([integration isEqualToString:@"Segment.io"]) {
+        if ([integration isEqualToString:kSEGSegmentDestinationName]) {
             continue;
         }
         dict[integration] = @NO;

Segment/Classes/SEGSegmentIntegrationFactory.m

@@ -21,7 +21,7 @@ - (id)initWithHTTPClient:(SEGHTTPClient *)client fileStorage:(id<SEGStorage>)fil
 
 - (NSString *)key
 {
-    return @"Segment.io";
+    return kSEGSegmentDestinationName;
 }
 
 @end

Segment/Internal/SEGIntegrationsManager.m

@@ -21,6 +21,7 @@
 #import "SEGUserDefaultsStorage.h"
 #import "SEGIntegrationsManager.h"
 #import "SEGSegmentIntegrationFactory.h"
+#import "SEGSegmentIntegration.h"
 #import "SEGPayload.h"
 #import "SEGIdentifyPayload.h"
 #import "SEGTrackPayload.h"
@@ -396,7 +397,7 @@ - (void)setCachedSettings:(NSDictionary *)settings
 - (void)updateIntegrationsWithSettings:(NSDictionary *)projectSettings
 {
     // see if we have a new segment API host and set it.
-    NSString *apiHost = projectSettings[@"Segment.io"][@"apiHost"];
+    NSString *apiHost = projectSettings[kSEGSegmentDestinationName][@"apiHost"];
     if (apiHost) {
         [SEGUtils saveAPIHost:apiHost];
     }
@@ -443,15 +444,25 @@ - (void)configureEdgeFunctions:(NSDictionary *)settings
 
 - (NSDictionary *)defaultSettings
 {
-    return @{
+    NSDictionary *segment = [self segmentSettings];
+    NSDictionary *result = @{
         @"integrations" : @{
-            @"Segment.io" : @{
-                    @"apiKey" : self.configuration.writeKey,
-                    @"apiHost" : [SEGUtils getAPIHost]
-            },
+            kSEGSegmentDestinationName : segment
         },
-        @"plan" : @{@"track" : @{}}
+        @"plan" : @{
+            @"track" : @{}
+        }
+    };
+    return result;
+}
+
+- (NSDictionary *)segmentSettings
+{
+    NSDictionary *result = @{
+        @"apiKey" : self.configuration.writeKey,
+        @"apiHost" : [SEGUtils getAPIHost]
     };
+    return result;
 }
 
 - (void)refreshSettings
@@ -485,9 +496,9 @@ - (void)refreshSettings
                         NSMutableDictionary *newSettings = [self.configuration.defaultSettings serializableMutableDeepCopy];
                         NSMutableDictionary *integrations = newSettings[@"integrations"];
                         if (integrations != nil) {
-                            integrations[@"Segment.io"] = @{@"apiKey": self.configuration.writeKey, @"apiHost": [SEGUtils getAPIHost]};
+                            integrations[kSEGSegmentDestinationName] = [self segmentSettings];
                         } else {
-                            newSettings[@"integrations"] = @{@"integrations": @{@"apiKey": self.configuration.writeKey, @"apiHost": [SEGUtils getAPIHost]}};
+                            newSettings[@"integrations"] = @{kSEGSegmentDestinationName: [self segmentSettings]};
                         }
 
                         [self setCachedSettings:newSettings];
@@ -510,7 +521,7 @@ - (void)refreshSettings
 + (BOOL)isIntegration:(NSString *)key enabledInOptions:(NSDictionary *)options
 {
     // If the event is in the tracking plan, it should always be sent to api.segment.io.
-    if ([@"Segment.io" isEqualToString:key]) {
+    if ([kSEGSegmentDestinationName isEqualToString:key]) {
         return YES;
     }
     if (options[key]) {
@@ -540,7 +551,7 @@ + (BOOL)isIntegration:(NSString *)key enabledInOptions:(NSDictionary *)options
 + (BOOL)isTrackEvent:(NSString *)event enabledForIntegration:(NSString *)key inPlan:(NSDictionary *)plan
 {
     // Whether the event is enabled or disabled, it should always be sent to api.segment.io.
-    if ([key isEqualToString:@"Segment.io"]) {
+    if ([key isEqualToString:kSEGSegmentDestinationName]) {
         return YES;
     }