Merge pull request #1015 from OneSignal/fix/unescapeEID

Don't escape slashes on PUTs

Author: adamschlesinger

iOS_SDK/OneSignalSDK/Source/OneSignalRequest.m

@@ -101,9 +101,20 @@ -(void)attachBodyToRequest:(NSMutableURLRequest *)request withParameters:(NSDict
     }
 
     NSError *error;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:parameters options:NSJSONWritingPrettyPrinted error:&error];
-    
-    request.HTTPBody = jsonData;
+    NSData *requestData = [NSJSONSerialization dataWithJSONObject:parameters options:0 error:&error];
+    NSString *requestString = [[NSString alloc] initWithData:requestData encoding:NSUTF8StringEncoding];
+
+    NSRegularExpression *eidRegex = [NSRegularExpression regularExpressionWithPattern:@"(?<=\"external_user_id\":\").*\\/.*?(?=\",|\"\\})" options:0 error:&error];
+    NSArray *matches = [eidRegex matchesInString:requestString options:0 range:NSMakeRange(0, [requestString length])];
+
+    if ([matches count] > 0) {
+        NSTextCheckingResult *match = matches[0];
+        NSString *matched = [requestString substringWithRange:[match range]];
+        NSString *unescapedEID = [matched stringByReplacingOccurrencesOfString:@"\\/" withString:@"/"];
+        requestString = [requestString stringByReplacingOccurrencesOfString:matched withString:unescapedEID];
+    }
+
+    request.HTTPBody = [requestString dataUsingEncoding:NSUTF8StringEncoding];
 }
 
 -(void)attachQueryParametersToRequest:(NSMutableURLRequest *)request withParameters:(NSDictionary *)parameters {

iOS_SDK/OneSignalSDK/UnitTests/RequestTests.m

@@ -724,6 +724,15 @@ - (void)testSendExternalUserId {
     XCTAssertTrue(checkHttpBody(request.urlRequest.HTTPBody, @{@"app_id" : testAppId, @"external_user_id" : testExternalUserId}));
 }
 
+- (void)testSendExternalUserIdWithForwardSlashes {
+    let externalUserId = @"abc/123";
+    let request = [OSRequestUpdateExternalUserId withUserId:externalUserId withUserIdHashToken:nil withOneSignalUserId:testUserId appId:testAppId];
+    let correctUrl = correctUrlWithPath([NSString stringWithFormat:@"players/%@", testUserId]);
+
+    XCTAssertTrue([correctUrl isEqualToString:request.urlRequest.URL.absoluteString]);
+    XCTAssertTrue(checkHttpBody(request.urlRequest.HTTPBody, @{@"app_id" : testAppId, @"external_user_id" : externalUserId}));
+}
+
 - (void)testSendExternalWithAuthUserId {
     let request = [OSRequestUpdateExternalUserId withUserId:testExternalUserId withUserIdHashToken:testExternalUserIdHashToken withOneSignalUserId:testUserId appId:testAppId];