diff --git a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryUserTests.m b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryUserTests.m index fe91d5f913..3d17c070ec 100644 --- a/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryUserTests.m +++ b/packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryUserTests.m @@ -172,13 +172,11 @@ - (void)testUserWithEmptyGeo - (void)testUserWithInvalidGeo { - SentryUser *expected = [[SentryUser alloc] init]; - [expected setUserId:@"123"]; - SentryUser *actual = [RNSentry userFrom:@{ @"id" : @"123", @"geo" : @"invalid_geo_data" } otherUserKeys:nil]; - XCTAssertTrue([actual isEqualToUser:expected]); + XCTAssertEqualObjects(actual.userId, @"123"); + XCTAssertNil(actual.geo); } @end diff --git a/packages/core/ios/RNSentry.mm b/packages/core/ios/RNSentry.mm index c64cc6bb5e..0d528e9acb 100644 --- a/packages/core/ios/RNSentry.mm +++ b/packages/core/ios/RNSentry.mm @@ -24,7 +24,6 @@ #import #import #import -#import #import @interface SentryUser () @@ -658,32 +657,7 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys { // we can safely ignore userDataKeys since if original JS user was null userKeys will be null if ([userKeys isKindOfClass:NSDictionary.class]) { - NSMutableDictionary *filteredKeys = [userKeys mutableCopy]; - [filteredKeys removeObjectForKey:@"geo"]; - SentryUser *userInstance = [[SentryUser alloc] initWithDictionary:filteredKeys]; - - id geo = [userKeys valueForKey:@"geo"]; - if ([geo isKindOfClass:NSDictionary.class]) { - NSDictionary *geoDict = (NSDictionary *)geo; - SentryGeo *sentryGeo = [SentryGeo alloc]; - - id city = [geoDict valueForKey:@"city"]; - if ([city isKindOfClass:NSString.class]) { - [sentryGeo setCity:city]; - } - - id countryCode = [geoDict valueForKey:@"country_code"]; - if ([countryCode isKindOfClass:NSString.class]) { - [sentryGeo setCountryCode:countryCode]; - } - - id region = [geoDict valueForKey:@"region"]; - if ([region isKindOfClass:NSString.class]) { - [sentryGeo setRegion:region]; - } - - [userInstance setGeo:sentryGeo]; - } + SentryUser *userInstance = [[SentryUser alloc] initWithDictionary:userKeys]; if ([userDataKeys isKindOfClass:NSDictionary.class]) { [userInstance setData:userDataKeys];