DEVEX-837 Updated the SDK to use secure coding. (#876)

* Updated the SDK to use secure coding.
* Updated decoding for `decodeObjectOfClass:`.

Author: E-B-Smith

Branch-SDK/Branch-SDK/BNCCommerceEvent.h

@@ -263,7 +263,7 @@ NSArray<BNCCurrency>*_Nonnull BNCCurrencyAllCurrencies(void);
 @end
 
 
-@interface BranchCommerceEventRequest : BNCServerRequest <NSCoding>
+@interface BranchCommerceEventRequest : BNCServerRequest <NSSecureCoding>
 
 - (instancetype _Nonnull) initWithCommerceEvent:(BNCCommerceEvent*_Nonnull)commerceEvent
 							           metadata:(NSDictionary*_Nullable)dictionary

Branch-SDK/Branch-SDK/BNCCommerceEvent.m

@@ -599,14 +599,13 @@ - (void)processResponse:(BNCServerResponse*)response
 		self.completion(dictionary, error);
 }
 
-#pragma mark BranchCommerceEventRequest NSCoding
+#pragma mark BranchCommerceEventRequest NSSecureCoding
 
 - (instancetype)initWithCoder:(NSCoder *)decoder {
     self = [super initWithCoder:decoder];
 	if (!self) return self;
-
-	self.commerceDictionary = [decoder decodeObjectForKey:@"commerceDictionary"];
-	self.metadata = [decoder decodeObjectForKey:@"metaData"];
+	self.commerceDictionary = [decoder decodeObjectOfClass:NSDictionary.class forKey:@"commerceDictionary"];
+	self.metadata = [decoder decodeObjectOfClass:NSDictionary.class forKey:@"metaData"];
     return self;
 }
 
@@ -616,4 +615,8 @@ - (void)encodeWithCoder:(NSCoder *)coder {
     [coder encodeObject:self.metadata forKey:@"metadata"];
 }
 
++ (BOOL) supportsSecureCoding {
+    return YES;
+}
+
 @end

Branch-SDK/Branch-SDK/BNCLinkData.h

@@ -17,7 +17,7 @@ typedef NS_ENUM(NSUInteger, BranchLinkType) {
     BranchLinkTypeOneTimeUse = 1
 };
 
-@interface BNCLinkData : NSObject
+@interface BNCLinkData : NSObject <NSSecureCoding>
 
 @property (strong, nonatomic) NSMutableDictionary *data;
 

Branch-SDK/Branch-SDK/BNCLinkData.m

@@ -170,20 +170,24 @@ - (void)encodeWithCoder:(NSCoder *)coder {
 
 - (id)initWithCoder:(NSCoder *)coder {
     if ((self = [super init])) {
-        self.tags = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_TAGS];
-        self.alias = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_ALIAS];
-        self.type = [[coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_LINK_TYPE] integerValue];
-        self.channel = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_CHANNEL];
-        self.feature = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_FEATURE];
-        self.stage = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_STAGE];
-        self.campaign = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_CAMPAIGN];
-        self.duration = [[coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_DURATION] integerValue];
+        self.tags = [coder decodeObjectOfClass:NSArray.class forKey:BRANCH_REQUEST_KEY_URL_TAGS];
+        self.alias = [coder decodeObjectOfClass:NSString.class forKey:BRANCH_REQUEST_KEY_URL_ALIAS];
+        self.type = [[coder decodeObjectOfClass:NSNumber.class forKey:BRANCH_REQUEST_KEY_URL_LINK_TYPE] integerValue];
+        self.channel = [coder decodeObjectOfClass:NSString.class forKey:BRANCH_REQUEST_KEY_URL_CHANNEL];
+        self.feature = [coder decodeObjectOfClass:NSString.class forKey:BRANCH_REQUEST_KEY_URL_FEATURE];
+        self.stage = [coder decodeObjectOfClass:NSString.class forKey:BRANCH_REQUEST_KEY_URL_STAGE];
+        self.campaign = [coder decodeObjectOfClass:NSString.class forKey:BRANCH_REQUEST_KEY_URL_CAMPAIGN];
+        self.duration = [[coder decodeObjectOfClass:NSNumber.class forKey:BRANCH_REQUEST_KEY_URL_DURATION] integerValue];
 
-        NSString *encodedParams = [coder decodeObjectForKey:BRANCH_REQUEST_KEY_URL_DATA];
+        NSString *encodedParams = [coder decodeObjectOfClass:NSString.class forKey:BRANCH_REQUEST_KEY_URL_DATA];
         self.params = [BNCEncodingUtils decodeJsonStringToDictionary:encodedParams];
     }
 
     return self;
 }
 
++ (BOOL) supportsSecureCoding {
+    return YES;
+}
+
 @end

Branch-SDK/Branch-SDK/BranchEvent.h

@@ -75,7 +75,7 @@ FOUNDATION_EXPORT BranchStandardEvent _Nonnull BranchStandardEventUnlockAchievem
 
 #pragma mark - BranchEventRequest
 
-@interface BranchEventRequest : BNCServerRequest <NSCoding>
+@interface BranchEventRequest : BNCServerRequest <NSSecureCoding>
 
 - (instancetype _Nonnull) initWithServerURL:(NSURL*_Nonnull)serverURL
                    eventDictionary:(NSDictionary*_Nullable)eventDictionary

Branch-SDK/Branch-SDK/BranchEvent.m

@@ -71,14 +71,14 @@ - (void)processResponse:(BNCServerResponse*)response
 		self.completion(dictionary, error);
 }
 
-#pragma mark BranchEventRequest NSCoding
+#pragma mark BranchEventRequest NSSecureCoding
 
 - (instancetype)initWithCoder:(NSCoder *)decoder {
     self = [super initWithCoder:decoder];
 	if (!self) return self;
 
-	self.serverURL = [decoder decodeObjectForKey:@"serverURL"];
-	self.eventDictionary = [decoder decodeObjectForKey:@"eventDictionary"];
+	self.serverURL = [decoder decodeObjectOfClass:NSString.class forKey:@"serverURL"];
+	self.eventDictionary = [decoder decodeObjectOfClass:NSDictionary.class forKey:@"eventDictionary"];
     return self;
 }
 
@@ -88,6 +88,10 @@ - (void)encodeWithCoder:(NSCoder *)coder {
     [coder encodeObject:self.eventDictionary forKey:@"eventDictionary"];
 }
 
++ (BOOL) supportsSecureCoding {
+    return YES;
+}
+
 @end
 
 #pragma mark - BranchEvent

Branch-SDK/Branch-SDK/Networking/BNCServerRequest.h

@@ -8,7 +8,7 @@
 
 #import "BNCServerInterface.h"
 
-@interface BNCServerRequest : NSObject <NSCoding>
+@interface BNCServerRequest : NSObject <NSSecureCoding>
 
 - (void)makeRequest:(BNCServerInterface *)serverInterface key:(NSString *)key callback:(BNCServerCallback)callback;
 - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error;

Branch-SDK/Branch-SDK/Networking/BNCServerRequest.m

@@ -33,4 +33,8 @@ - (void)safeSetValue:(NSObject *)value forKey:(NSString *)key onDict:(NSMutableD
     }
 }
 
++ (BOOL) supportsSecureCoding {
+    return YES;
+}
+
 @end

Branch-SDK/Branch-SDK/Networking/Requests/BranchCreditHistoryRequest.m

@@ -77,12 +77,12 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
     }
 }
 
-#pragma mark - NSCoding methods
+#pragma mark - NSSecureCoding methods
 
 - (id)initWithCoder:(NSCoder *)decoder {
     if ((self = [super initWithCoder:decoder])) {
-        _bucket = [decoder decodeObjectForKey:@"bucket"];
-        _creditTransactionId = [decoder decodeObjectForKey:@"creditTransactionId"];
+        _bucket = [decoder decodeObjectOfClass:NSString.class forKey:@"bucket"];
+        _creditTransactionId = [decoder decodeObjectOfClass:NSString.class forKey:@"creditTransactionId"];
         _length = [decoder decodeIntegerForKey:@"length"];
         _order = [decoder decodeIntegerForKey:@"order"];
     }
@@ -97,4 +97,8 @@ - (void)encodeWithCoder:(NSCoder *)coder {
     [coder encodeInteger:self.order forKey:@"order"];
 }
 
++ (BOOL) supportsSecureCoding {
+    return YES;
+}
+
 @end

Branch-SDK/Branch-SDK/Networking/Requests/BranchRedeemRewardsRequest.m

@@ -11,11 +11,9 @@
 #import "BranchConstants.h"
 
 @interface BranchRedeemRewardsRequest ()
-
 @property (assign, nonatomic) NSInteger amount;
 @property (strong, nonatomic) NSString *bucket;
 @property (copy) callbackWithStatus callback;
-
 @end
 
 @implementation BranchRedeemRewardsRequest
@@ -60,20 +58,19 @@ - (void)processResponse:(BNCServerResponse *)response error:(NSError *)error {
     }
 }
 
-#pragma mark - NSCoding methods
+#pragma mark - NSSecureCoding methods
 
 - (id)initWithCoder:(NSCoder *)decoder {
     if ((self = [super initWithCoder:decoder])) {
         _amount = [decoder decodeIntegerForKey:@"amount"];
-        _bucket = [decoder decodeObjectForKey:@"bucket"];
+        _bucket = [decoder decodeObjectOfClass:NSString.class forKey:@"bucket"];
     }
 
     return self;
 }
 
 - (void)encodeWithCoder:(NSCoder *)coder {
     [super encodeWithCoder:coder];
-    
     [coder encodeInteger:self.amount forKey:@"amount"];
     [coder encodeObject:self.bucket forKey:@"bucket"];
 }