Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: create mutable copy of JSON serialisation object #479

Merged
merged 3 commits into from
Mar 11, 2024
Merged

fix: create mutable copy of JSON serialisation object #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e47b14
chore: remove lingering reference to deleted RudderConfig file
1abhishekpandey Mar 7, 2024
c56b825
fix: create mutable copy of JSON seiralisation object
1abhishekpandey Mar 11, 2024
3fc3574
test: add case for merging externalId simulating app relaunch
1abhishekpandey Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Examples/RudderSampleAppObjC/RudderSampleAppObjC.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
ED761A062727E28800B086F4 /* CustomFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = ED7619FC2727E28800B086F4 /* CustomFactory.m */; };
ED761A072727E28800B086F4 /* _AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = ED7619FD2727E28800B086F4 /* _AppDelegate.m */; };
ED8738CE2AB363A80076D24A /* EncryptedDatabaseProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = ED8738CC2AB363A80076D24A /* EncryptedDatabaseProvider.m */; };
F6149CC52B32FBC2006995B7 /* RudderConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = F6149CC42B32FBC2006995B7 /* RudderConfig.plist */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -57,7 +56,6 @@
ED7619FD2727E28800B086F4 /* _AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _AppDelegate.m; sourceTree = "<group>"; };
ED8738CA2AB363A80076D24A /* EncryptedDatabaseProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncryptedDatabaseProvider.h; sourceTree = "<group>"; };
ED8738CC2AB363A80076D24A /* EncryptedDatabaseProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EncryptedDatabaseProvider.m; sourceTree = "<group>"; };
F6149CC42B32FBC2006995B7 /* RudderConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = RudderConfig.plist; sourceTree = "<group>"; };
F928F8A942558010CC7088BF /* Pods-RudderSampleAppObjC.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RudderSampleAppObjC.debug.xcconfig"; path = "Target Support Files/Pods-RudderSampleAppObjC/Pods-RudderSampleAppObjC.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -137,7 +135,6 @@
ED7619FD2727E28800B086F4 /* _AppDelegate.m */,
ED7619F02727E28700B086F4 /* _ViewController.h */,
ED7619F92727E28800B086F4 /* _ViewController.m */,
F6149CC42B32FBC2006995B7 /* RudderConfig.plist */,
ED7619F22727E28700B086F4 /* CustomFactory.h */,
ED7619FC2727E28800B086F4 /* CustomFactory.m */,
ED7619FB2727E28800B086F4 /* CustomIntegration.h */,
Expand Down Expand Up @@ -219,7 +216,6 @@
files = (
ED761A012727E28800B086F4 /* LaunchScreen.storyboard in Resources */,
ED0CA6DE2A7D049E00899C1C /* SampleRudderConfig.plist in Resources */,
F6149CC52B32FBC2006995B7 /* RudderConfig.plist in Resources */,
ED761A052727E28800B086F4 /* Images.xcassets in Resources */,
ED7619FF2727E28800B086F4 /* InfoPlist.strings in Resources */,
ED761A022727E28800B086F4 /* Main.storyboard in Resources */,
Expand Down
2 changes: 1 addition & 1 deletion Sources/Classes/RSUtils.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ + (id _Nullable) deserialize:(NSString*) jsonString {
@try {
NSError *error = nil;
NSData* data = [jsonString dataUsingEncoding:NSUTF8StringEncoding];
id object = [NSJSONSerialization JSONObjectWithData:data options:0 error:&error];
id object = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableContainers error:&error];
if(error) {
[RSLogger logError:[[NSString alloc] initWithFormat:@"RSUtils: deserialize: Failed to de-serialize the given string back to an object %@", jsonString]];
return nil;
Expand Down
13 changes: 13 additions & 0 deletions Tests/ContextTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,19 @@ class ContextTests: XCTestCase {
XCTAssertEqual(context.externalIds, finalExternalIds)
}

// This test case verifies the scenario when someone has made an identify call with some externalId and then app is stopped.
// At next app launch, externalId is read from the preferenceManager and then RSUtils.deserialize() returns the mutable externalId object.
// Now, if someone makes an indentify call with the same userId and externalId-type then externalId must be merged properly without any exception.
func test_updateExternalIds_simulatingAppRelaunche() {
guard let externalIdString = RSUtils.serialize(externalIds1) else { return XCTAssertThrowsError("externalIdString cannot be null") }
preferenceManager.saveExternalIds(externalIdString)
context = RSContext(config: RSConfig())

context.updateExternalIds(externalIds2)

XCTAssertEqual(context.externalIds, finalExternalIds)
}

func test_persistExternalIds() {
context.updateExternalIds(externalIds1)
context.persistExternalIds()
Expand Down
Loading