reuse MSIDJsonSerializer

Author: kai

IdentityCore/src/telemetry/execution_flow/MSIDExecutionFlowBlob.m

@@ -63,7 +63,7 @@ - (void)setObject:(id)obj forKey:(NSString *)key
 {
     if ([NSString msidIsStringNilOrBlank:key])
     {
-        MSID_LOG_WITH_CTX_PII(MSIDLogLevelWarning, nil, @"Key cannot be nil", nil);
+        MSID_LOG_WITH_CTX_PII(MSIDLogLevelWarning, nil, @"Key cannot be nil or blank", nil);
         return;
     }
 

IdentityCore/src/telemetry/execution_flow/MSIDExecutionFlowUtils.m

@@ -25,6 +25,7 @@
 #import "MSIDExecutionFlowUtils.h"
 #import "MSIDExecutionFlowBlob.h"
 #import "MSIDExecutionFlowConstants.h"
+#import "MSIDJsonSerializer.h"
 
 @implementation MSIDExecutionFlowUtils
 
@@ -41,85 +42,28 @@ + (instancetype)sharedInstance
 - (NSString *)convertDictionary:(NSDictionary *)dictionary
            toJsonStringWithKeys:(NSSet<NSString *> *)queryKeys
 {
-    NSMutableString *result = [NSMutableString stringWithString:@"{"];
+    MSIDJsonSerializer *serializer = [MSIDJsonSerializer new];
 
-    // Always include required fields in specific order: t, tid, ts
-    [result appendFormat:@"\"t\":\"%@\",\"ts\":%@,\"tid\":%@", [self escapeJSONString:dictionary[MSID_EXECUTION_FLOW_TAG]], dictionary[MSID_EXECUTION_FLOW_TIME_SPENT], dictionary[MSID_EXECUTION_FLOW_THREAD_ID]];
-    
-    // Add all other fields
-    NSSet *reservedKeys = [NSSet setWithArray:@[MSID_EXECUTION_FLOW_TAG, MSID_EXECUTION_FLOW_TIME_SPENT, MSID_EXECUTION_FLOW_THREAD_ID]];
-    for (NSString *key in dictionary)
+    if ([queryKeys count] == 0)
     {
-        if ([reservedKeys containsObject:key] || (![queryKeys containsObject:key] && queryKeys.count != 0))
-        {
-            continue;
-        }
+        return [serializer serializeToJsonString:dictionary error:nil];
 
-        id value = dictionary[key];
-        if ([value isKindOfClass:NSString.class])
-        {
-            [result appendFormat:@",\"%@\":\"%@\"", [self escapeJSONString:key], [self escapeJSONString:value]];
-        }
-        else if ([value isKindOfClass:NSNumber.class])
-        {
-            [result appendFormat:@",\"%@\":%@", [self escapeJSONString:key], value];
-        }
-    }
-    
-    [result appendString:@"}"];
-    
-    return result;
-}
-
-// Escapes special characters in a string for safe JSON inclusion
-- (NSString *)escapeJSONString:(NSString *)string
-{
-    if (!string)
-    {
-        return @"";
     }
-    
-    NSMutableString *escaped = [NSMutableString stringWithCapacity:string.length];
-    for (NSUInteger i = 0; i < string.length; i++)
+    else
     {
-        unichar c = [string characterAtIndex:i];
-        switch (c)
+        NSSet *reservedKeys = [NSSet setWithArray:@[MSID_EXECUTION_FLOW_TAG, MSID_EXECUTION_FLOW_TIME_SPENT, MSID_EXECUTION_FLOW_THREAD_ID]];
+        NSMutableDictionary *resultDict = [NSMutableDictionary new];
+        for (NSString *key in dictionary)
         {
-            case '\\':
-                [escaped appendString:@"\\\\"];
-                break;
-            case '"':
-                [escaped appendString:@"\\\""];
-                break;
-            case '\n':
-                [escaped appendString:@"\\n"];
-                break;
-            case '\r':
-                [escaped appendString:@"\\r"];
-                break;
-            case '\t':
-                [escaped appendString:@"\\t"];
-                break;
-            case '\b':
-                [escaped appendString:@"\\b"];
-                break;
-            case '\f':
-                [escaped appendString:@"\\f"];
-                break;
-            default:
-                if (c < 0x20)
-                {
-                    // Escape other control characters as \u00XX
-                    [escaped appendFormat:@"\\u%04x", c];
-                }
-                else
-                {
-                    [escaped appendFormat:@"%C", c];
-                }
-                break;
+            if ([reservedKeys containsObject:key] || [queryKeys containsObject:key])
+            {
+                id value = dictionary[key];
+                resultDict[key] = value;
+            }
         }
+        
+        return [serializer serializeToJsonString:resultDict error:nil];
     }
-    return escaped;
 }
 
 @end

IdentityCore/tests/MSIDExecutionFlowBlobTests.m

@@ -347,7 +347,7 @@ - (void)testSetObjectWithEmptyStringKey_shouldWork
     NSString *jsonString = [blob blobToStringWithKeys:[NSSet setWithArray:@[@""]]];
     NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
     NSDictionary *result = [NSJSONSerialization JSONObjectWithData:jsonData options:0 error:nil];
-    XCTAssertEqualObjects(result[@""], @"value");
+    XCTAssertNil(result[@""]);
 }
 
 - (void)testSetObjectWithEmptyStringValue_shouldWork
@@ -411,11 +411,6 @@ - (void)testBlobToString_shouldReturnExpectedJSONFormat
 
     NSString *jsonString = [blob blobToStringWithKeys:nil];
 
-    // Verify exact output format
-    NSString *expectedJSON = @"{\"t\":\"TestTag\",\"ts\":1234,\"tid\":5678}";
-    XCTAssertEqualObjects(jsonString, expectedJSON, @"JSON string should match expected format exactly");
-    
-    
     // Verify it's valid JSON by parsing it
     NSData *jsonData = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
     NSError *error = nil;
@@ -511,26 +506,6 @@ - (void)testBlobToString_withZeroValues_shouldIncludeZeros
     XCTAssertTrue([jsonString containsString:@"\"e\":0"]);
 }
 
-- (void)testBlobToString_requiredFieldsFirst_shouldBeInCorrectOrder
-{
-    MSIDExecutionFlowBlob *blob = [[MSIDExecutionFlowBlob alloc] initWithTag:@"MyTag"
-                                                                     timeStep:@(100)
-                                                                     threadId:@(200)];
-    
-    [blob setObject:@(999) forKey:@"custom"];
-    NSString *jsonString = [blob blobToStringWithKeys:nil];
-    
-    // Check that required fields appear first
-    NSRange tRange = [jsonString rangeOfString:@"\"t\":"];
-    NSRange tidRange = [jsonString rangeOfString:@"\"tid\":"];
-    NSRange tsRange = [jsonString rangeOfString:@"\"ts\":"];
-    NSRange customRange = [jsonString rangeOfString:@"\"custom\":"];
-    
-    XCTAssertTrue(tRange.location < customRange.location, @"Tag should appear before custom fields");
-    XCTAssertTrue(tidRange.location < customRange.location, @"Thread ID should appear before custom fields");
-    XCTAssertTrue(tsRange.location < customRange.location, @"Timestamp should appear before custom fields");
-}
-
 - (void)testBlobToStringWithKeys_withSpecificKeys_shouldOnlyIncludeRequestedFields
 {
     MSIDExecutionFlowBlob *blob = [[MSIDExecutionFlowBlob alloc] initWithTag:@"TestTag"