From 2662a13514599b6de19b1537cc2dbbdba01c227c Mon Sep 17 00:00:00 2001 From: chuanr Date: Mon, 6 Feb 2023 18:11:46 -0800 Subject: [PATCH 1/6] Update FB sdk to v14 --- FirebaseAuth/Tests/Sample/Podfile | 2 +- FirebaseAuth/Tests/Sample/Sample/FacebookAuthProvider.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/FirebaseAuth/Tests/Sample/Podfile b/FirebaseAuth/Tests/Sample/Podfile index 86e81c13d49..a84cd3f21dd 100644 --- a/FirebaseAuth/Tests/Sample/Podfile +++ b/FirebaseAuth/Tests/Sample/Podfile @@ -15,7 +15,7 @@ target 'AuthSample' do pod 'FirebaseCoreInternal', :path => '../../../' pod 'FirebaseAuth', :path => '../../../', :testspecs => ['unit'] pod 'FirebaseInstallations', :path => '../../..' - pod 'FBSDKLoginKit', '< 13' + pod 'FBSDKLoginKit', '~> 14' pod 'GoogleSignIn', '~> 6' pod 'GTMSessionFetcher/Core' pod 'RecaptchaEnterprise', '~> 18.3' diff --git a/FirebaseAuth/Tests/Sample/Sample/FacebookAuthProvider.m b/FirebaseAuth/Tests/Sample/Sample/FacebookAuthProvider.m index d23e52ff245..d08bbaf2646 100644 --- a/FirebaseAuth/Tests/Sample/Sample/FacebookAuthProvider.m +++ b/FirebaseAuth/Tests/Sample/Sample/FacebookAuthProvider.m @@ -48,7 +48,7 @@ - (void)getAuthCredentialWithPresentingViewController:(UIViewController *)viewCo [self signOut]; [ApplicationDelegate setOpenURLDelegate:self]; - [FBSDKSettings setAppID:kFacebookAppID]; + [FBSDKSettings.sharedSettings setAppID:kFacebookAppID]; [_loginManager logInWithPermissions:@[ @"email" ] fromViewController:viewController handler:^(FBSDKLoginManagerLoginResult *result, NSError *error) { From f645e1ee67ae65ac87eca4c63bd1b9dbadcb3488 Mon Sep 17 00:00:00 2001 From: chuanr Date: Wed, 8 Feb 2023 15:59:04 -0800 Subject: [PATCH 2/6] Update FacebookAuthTests.m --- FirebaseAuth/Tests/Sample/ApiTests/FacebookAuthTests.m | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/FirebaseAuth/Tests/Sample/ApiTests/FacebookAuthTests.m b/FirebaseAuth/Tests/Sample/ApiTests/FacebookAuthTests.m index 0c37ae394ef..455aa3edfae 100644 --- a/FirebaseAuth/Tests/Sample/ApiTests/FacebookAuthTests.m +++ b/FirebaseAuth/Tests/Sample/ApiTests/FacebookAuthTests.m @@ -36,8 +36,7 @@ @interface FacebookAuthTests : FIRAuthApiTestsBase @implementation FacebookAuthTests -// TODO(#10752) - Update and fix the Facebook login Sample app and tests. -- (void)SKIPtestSignInWithFaceboook { +- (void)testSignInWithFaceboook { FIRAuth *auth = [FIRAuth auth]; if (!auth) { XCTFail(@"Could not obtain auth object."); @@ -77,8 +76,7 @@ - (void)SKIPtestSignInWithFaceboook { [self deleteFacebookTestingAccountbyId:facebookAccountId]; } -// TODO(#10752) - Update and fix the Facebook login Sample app and tests. -- (void)SKIPtestLinkAnonymousAccountToFacebookAccount { +- (void)testLinkAnonymousAccountToFacebookAccount { FIRAuth *auth = [FIRAuth auth]; if (!auth) { XCTFail(@"Could not obtain auth object."); From 29770694b799a0839b8b2d4751e7b945ba2b0ed6 Mon Sep 17 00:00:00 2001 From: renkelvin Date: Thu, 27 Apr 2023 10:29:23 -0700 Subject: [PATCH 3/6] Update FacebookAuthTests.m --- FirebaseAuth/Tests/Sample/ApiTests/FacebookAuthTests.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirebaseAuth/Tests/Sample/ApiTests/FacebookAuthTests.m b/FirebaseAuth/Tests/Sample/ApiTests/FacebookAuthTests.m index 455aa3edfae..e2c2d2ceb6d 100644 --- a/FirebaseAuth/Tests/Sample/ApiTests/FacebookAuthTests.m +++ b/FirebaseAuth/Tests/Sample/ApiTests/FacebookAuthTests.m @@ -141,7 +141,7 @@ - (NSDictionary *)createFacebookTestingAccount { __block NSData *data = nil; [fetcher beginFetchWithCompletionHandler:^(NSData *receivedData, NSError *error) { if (error) { - NSLog(@"Creating Facebook account finished with error: %@", error); + NSLog(@"Error: Creating Facebook account finished with error: %@", error); return; } data = receivedData; From bf1a05371c44fc7955e3c20189fa46c98813fd1a Mon Sep 17 00:00:00 2001 From: renkelvin Date: Wed, 15 Nov 2023 14:09:09 -0800 Subject: [PATCH 4/6] Update Podfile --- FirebaseAuth/Tests/Sample/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirebaseAuth/Tests/Sample/Podfile b/FirebaseAuth/Tests/Sample/Podfile index a84cd3f21dd..004e2e58ab0 100644 --- a/FirebaseAuth/Tests/Sample/Podfile +++ b/FirebaseAuth/Tests/Sample/Podfile @@ -15,7 +15,7 @@ target 'AuthSample' do pod 'FirebaseCoreInternal', :path => '../../../' pod 'FirebaseAuth', :path => '../../../', :testspecs => ['unit'] pod 'FirebaseInstallations', :path => '../../..' - pod 'FBSDKLoginKit', '~> 14' + pod 'FBSDKLoginKit', '~> 16' pod 'GoogleSignIn', '~> 6' pod 'GTMSessionFetcher/Core' pod 'RecaptchaEnterprise', '~> 18.3' From 01fff2b1ebe838ff79372fde76e24ed6d55970ba Mon Sep 17 00:00:00 2001 From: renkelvin Date: Wed, 15 Nov 2023 14:28:41 -0800 Subject: [PATCH 5/6] Update Podfile --- FirebaseAuth/Tests/Sample/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirebaseAuth/Tests/Sample/Podfile b/FirebaseAuth/Tests/Sample/Podfile index 004e2e58ab0..3f14933c58d 100644 --- a/FirebaseAuth/Tests/Sample/Podfile +++ b/FirebaseAuth/Tests/Sample/Podfile @@ -15,7 +15,7 @@ target 'AuthSample' do pod 'FirebaseCoreInternal', :path => '../../../' pod 'FirebaseAuth', :path => '../../../', :testspecs => ['unit'] pod 'FirebaseInstallations', :path => '../../..' - pod 'FBSDKLoginKit', '~> 16' + pod 'FBSDKLoginKit', '~> 16.2' pod 'GoogleSignIn', '~> 6' pod 'GTMSessionFetcher/Core' pod 'RecaptchaEnterprise', '~> 18.3' From c67c0f28f540a973687d04755b77235fae722bf3 Mon Sep 17 00:00:00 2001 From: renkelvin Date: Wed, 15 Nov 2023 15:59:05 -0800 Subject: [PATCH 6/6] Update Podfile --- FirebaseAuth/Tests/Sample/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FirebaseAuth/Tests/Sample/Podfile b/FirebaseAuth/Tests/Sample/Podfile index 3f14933c58d..be9d4e3b34e 100644 --- a/FirebaseAuth/Tests/Sample/Podfile +++ b/FirebaseAuth/Tests/Sample/Podfile @@ -15,7 +15,7 @@ target 'AuthSample' do pod 'FirebaseCoreInternal', :path => '../../../' pod 'FirebaseAuth', :path => '../../../', :testspecs => ['unit'] pod 'FirebaseInstallations', :path => '../../..' - pod 'FBSDKLoginKit', '~> 16.2' + pod 'FBSDKLoginKit', '~> 15' pod 'GoogleSignIn', '~> 6' pod 'GTMSessionFetcher/Core' pod 'RecaptchaEnterprise', '~> 18.3'