From e8aef8740fcb0ec174e223ec2bc4b499f1502aba Mon Sep 17 00:00:00 2001 From: Jacint Varga Date: Wed, 27 Dec 2023 22:37:19 +0000 Subject: [PATCH 1/6] fix(auth,ios): factorId null check --- packages/auth/ios/RNFBAuth/RNFBAuthModule.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m index 3986f428a9..28a9785ce1 100644 --- a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m +++ b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m @@ -1374,11 +1374,11 @@ - (NSDictionary *)multiFactorResolverToDict:(FIRMultiFactorResolver *)resolver { } - (NSString *)getJSFactorId:(NSString *)factorId { - if ([factorId isEqualToString:@"1"]) { + if (factorId == nil || [factorId isEqualToString:@"1"]) { // Only phone is supported by the front-end so far return @"phone"; } - + return factorId; } @@ -1649,7 +1649,7 @@ - (NSDictionary *)firebaseUserToDict:(FIRUser *)user { [[[NSISO8601DateFormatter alloc] init] stringFromDate:hint.enrollmentDate]; [enrolledFactors addObject:@{ @"uid" : hint.UID, - @"factorId" : [self getJSFactorId:(hint.factorID)], + @"factorId" : [self getJSFactorId:(hint.factorID == nil ? nil : hint.factorID)], @"displayName" : hint.displayName == nil ? [NSNull null] : hint.displayName, @"enrollmentDate" : enrollmentDate, }]; From 7769bc7b4f293e823b9eccd478c0609d6b7489b6 Mon Sep 17 00:00:00 2001 From: Jacint Varga Date: Wed, 27 Dec 2023 22:37:19 +0000 Subject: [PATCH 2/6] fix(auth,ios): factorId null check --- packages/auth/ios/RNFBAuth/RNFBAuthModule.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m index 28a9785ce1..7dabbc10da 100644 --- a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m +++ b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m @@ -1378,7 +1378,6 @@ - (NSString *)getJSFactorId:(NSString *)factorId { // Only phone is supported by the front-end so far return @"phone"; } - return factorId; } @@ -1650,7 +1649,7 @@ - (NSDictionary *)firebaseUserToDict:(FIRUser *)user { [enrolledFactors addObject:@{ @"uid" : hint.UID, @"factorId" : [self getJSFactorId:(hint.factorID == nil ? nil : hint.factorID)], - @"displayName" : hint.displayName == nil ? [NSNull null] : hint.displayName, + @"displayName" : hint.factorID == nil ? [NSNull null] : [self getJSFactorID:(hint.factorID)], @"enrollmentDate" : enrollmentDate, }]; } From 5d7109ff9e6801ad8d60604f4a1b09a1c268cace Mon Sep 17 00:00:00 2001 From: Jacint Varga Date: Wed, 27 Dec 2023 22:37:19 +0000 Subject: [PATCH 3/6] fix(auth,ios): factorId null check --- packages/auth/ios/RNFBAuth/RNFBAuthModule.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m index 7dabbc10da..dd25391da2 100644 --- a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m +++ b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m @@ -1648,8 +1648,8 @@ - (NSDictionary *)firebaseUserToDict:(FIRUser *)user { [[[NSISO8601DateFormatter alloc] init] stringFromDate:hint.enrollmentDate]; [enrolledFactors addObject:@{ @"uid" : hint.UID, - @"factorId" : [self getJSFactorId:(hint.factorID == nil ? nil : hint.factorID)], - @"displayName" : hint.factorID == nil ? [NSNull null] : [self getJSFactorID:(hint.factorID)], + @"factorId" : hint.factorID == nil ? [NSNull null] : [self getJSFactorId:(hint.factorID)], + @"displayName" : hint.displayName == nil ? [NSNull null] : hint.displayName, @"enrollmentDate" : enrollmentDate, }]; } From c6df38629d280f1bf11d36079a093de66801ab6a Mon Sep 17 00:00:00 2001 From: Jacint Varga Date: Sat, 6 Jan 2024 20:19:24 +0100 Subject: [PATCH 4/6] fix(auth,ios): removed unneces. check --- packages/auth/ios/RNFBAuth/RNFBAuthModule.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m index dd25391da2..08a7bc4b53 100644 --- a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m +++ b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m @@ -1374,7 +1374,7 @@ - (NSDictionary *)multiFactorResolverToDict:(FIRMultiFactorResolver *)resolver { } - (NSString *)getJSFactorId:(NSString *)factorId { - if (factorId == nil || [factorId isEqualToString:@"1"]) { + if ([factorId isEqualToString:@"1"]) { // Only phone is supported by the front-end so far return @"phone"; } From f3705c0f705a9e703ba84c56aae9e343934aabac Mon Sep 17 00:00:00 2001 From: Jacint Varga Date: Sat, 6 Jan 2024 20:20:41 +0100 Subject: [PATCH 5/6] fix(auth,ios): unnces. linting change --- packages/auth/ios/RNFBAuth/RNFBAuthModule.m | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m index 08a7bc4b53..12b50a4440 100644 --- a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m +++ b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m @@ -1378,6 +1378,7 @@ - (NSString *)getJSFactorId:(NSString *)factorId { // Only phone is supported by the front-end so far return @"phone"; } + return factorId; } From 48924a83583db9f7586c8ca91733ba65986c87e7 Mon Sep 17 00:00:00 2001 From: Jacint Varga Date: Sat, 6 Jan 2024 20:23:26 +0100 Subject: [PATCH 6/6] fix(ios, auth): spacing removed --- packages/auth/ios/RNFBAuth/RNFBAuthModule.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m index 12b50a4440..2bc27deab5 100644 --- a/packages/auth/ios/RNFBAuth/RNFBAuthModule.m +++ b/packages/auth/ios/RNFBAuth/RNFBAuthModule.m @@ -1378,7 +1378,7 @@ - (NSString *)getJSFactorId:(NSString *)factorId { // Only phone is supported by the front-end so far return @"phone"; } - + return factorId; }