Merge 846f4b2 into 13b68d9

Author: krystofwoldrich

packages/core/ios/RNSentry.mm

@@ -641,24 +641,40 @@ - (NSDictionary *)fetchNativeStackFramesBy:(NSArray<NSNumber *> *)instructionsAd
 RCT_EXPORT_METHOD(setUser : (NSDictionary *)userKeys otherUserKeys : (NSDictionary *)userDataKeys)
 {
     [SentrySDK configureScope:^(SentryScope *_Nonnull scope) {
-        if (nil == userKeys && nil == userDataKeys) {
+        // we can safelly ignore userDataKeys since if original JS user was null userKeys will be null
+        if ([[NSNull null] isEqual:userKeys] || nil == userKeys) {
             [scope setUser:nil];
-        } else {
+        } else if ([userKeys isKindOfClass:NSDictionary.class]) {
             SentryUser *userInstance = [[SentryUser alloc] init];
 
-            if (nil != userKeys) {
-                [userInstance setUserId:userKeys[@"id"]];
-                [userInstance setIpAddress:userKeys[@"ip_address"]];
-                [userInstance setEmail:userKeys[@"email"]];
-                [userInstance setUsername:userKeys[@"username"]];
-                [userInstance setSegment:userKeys[@"segment"]];
+            id userId = [userKeys valueForKey:@"id"];
+            if ([userId isKindOfClass:NSString.class]) {
+                [userInstance setUserId:userId];
+            }
+            id ipAddress = [userKeys valueForKey:@"ip_address"];
+            if ([ipAddress isKindOfClass:NSString.class]) {
+                [userInstance setIpAddress:ipAddress];
+            }
+            id email = [userKeys valueForKey:@"email"];
+            if ([email isKindOfClass:NSString.class]) {
+                [userInstance setEmail:email];
+            }
+            id username = [userKeys valueForKey:@"username"];
+            if ([username isKindOfClass:NSString.class]) {
+                [userInstance setUsername:username];
+            }
+            id segment = [userKeys valueForKey:@"segment"];
+            if ([segment isKindOfClass:NSString.class]) {
+                [userInstance setSegment:segment];
             }
 
-            if (nil != userDataKeys) {
+            if ([userDataKeys isKindOfClass:NSDictionary.class]) {
                 [userInstance setData:userDataKeys];
             }
 
             [scope setUser:userInstance];
+        } else {
+            NSLog(@"[RNSentry] Method setUser received unexpected type of userKeys.");
         }
     }];
 }