Add support for all userId variations

Author: HazAT

android/src/main/java/io/sentry/RNSentryModule.java

@@ -255,6 +255,8 @@ private UserBuilder getUserBuilder(ReadableMap user) {
         }
         if (user.hasKey("userID")) {
             userBuilder.setId(user.getString("userID"));
+        } else if (user.hasKey("userId")) {
+            userBuilder.setId(user.getString("userId"));
         } else if (user.hasKey("id")) {
             userBuilder.setId(user.getString("id"));
         }

ios/RNSentry.m

@@ -312,11 +312,7 @@ - (void)swizzleCallNativeModule:(Class)class {
 
 RCT_EXPORT_METHOD(setUser:(NSDictionary *_Nonnull)user)
 {
-    SentryUser *sentryUser = [[SentryUser alloc] initWithUserId:[RCTConvert NSString:user[@"userID"]]];
-    sentryUser.email = [RCTConvert NSString:user[@"email"]];
-    sentryUser.username = [RCTConvert NSString:user[@"username"]];
-    sentryUser.extra = [RCTConvert NSDictionary:user[@"extra"]];
-    SentryClient.sharedClient.user = sentryUser;
+    SentryClient.sharedClient.user = [self createUser:user];
 }
 
 RCT_EXPORT_METHOD(captureBreadcrumb:(NSDictionary * _Nonnull)breadcrumb)
@@ -334,13 +330,7 @@ - (void)swizzleCallNativeModule:(Class)class {
 {
     SentrySeverity level = [self sentrySeverityFromLevel:event[@"level"]];
 
-    SentryUser *user = nil;
-    if (event[@"user"] != nil) {
-        user = [[SentryUser alloc] initWithUserId:[NSString stringWithFormat:@"%@", event[@"user"][@"userID"]]];
-        user.email = [NSString stringWithFormat:@"%@", event[@"user"][@"email"]];
-        user.username = [NSString stringWithFormat:@"%@", event[@"user"][@"username"]];
-        user.extra = [RCTConvert NSDictionary:event[@"user"][@"extra"]];
-    }
+    SentryUser *user = [self createUser:event[@"user"]];
 
     SentryEvent *sentryEvent = [[SentryEvent alloc] initWithLevel:level];
     sentryEvent.eventId = event[@"event_id"];
@@ -370,6 +360,23 @@ - (void)addExceptionToEvent:(SentryEvent *)event type:(NSString *)type value:(NS
     event.exceptions = @[sentryException];
 }
 
+- (SentryUser *_Nullable)createUser:(NSDictionary *_Nonnull)user {
+    NSString *userId = nil;
+    if (nil != user[@"userID"]) {
+        userId = [NSString stringWithFormat:@"%@", user[@"userID"]];
+    } else if (nil != user[@"userId"]) {
+        userId = [NSString stringWithFormat:@"%@", user[@"userId"]];
+    } else if (nil != user[@"id"]) {
+        userId = [NSString stringWithFormat:@"%@", user[@"id"]];
+    }
+    SentryUser *sentryUser = nil;
+    sentryUser = [[SentryUser alloc] initWithUserId:userId];
+    sentryUser.email = [NSString stringWithFormat:@"%@", user[@"email"]];
+    sentryUser.username = [NSString stringWithFormat:@"%@", user[@"username"]];
+    sentryUser.extra = [RCTConvert NSDictionary:user[@"extra"]];
+    return sentryUser;
+}
+
 RCT_EXPORT_METHOD(crash)
 {
     [SentryClient.sharedClient crash];