Merge branch 'facebook' into test2

morganchen12 · morganchen12 · commit 9b66b3dbc7b3 · 2019-05-29T10:29:57.000-07:00
diff --git a/FacebookAuth/FirebaseFacebookAuthUITests/FUIFacebookAuthTest.m b/FacebookAuth/FirebaseFacebookAuthUITests/FUIFacebookAuthTest.m
@@ -23,9 +23,9 @@ @interface FBSDKLoginManagerTest : FBSDKLoginManager
 
 @implementation FBSDKLoginManagerTest
 
-- (void)logInWithReadPermissions:(NSArray *)permissions
-              fromViewController:(UIViewController *)fromViewController
-                         handler:(FBSDKLoginManagerLoginResultBlock)handler {
+- (void)logInWithPermissions:(NSArray *)permissions
+          fromViewController:(UIViewController *)fromViewController
+                     handler:(FBSDKLoginManagerLoginResultBlock)handler {
   handler(self.result, self.error);
 }
 @end
diff --git a/FacebookAuth/FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m b/FacebookAuth/FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m
@@ -83,20 +83,21 @@ - (void)testSuccessfullLogin {
                                                  dataAccessExpirationDate:nil];
   id mockToken = OCMPartialMock(token);
 
+  NSSet *emptySet = [NSSet set];
   FBSDKLoginManagerLoginResult *result = [[FBSDKLoginManagerLoginResult alloc] initWithToken:mockToken
                                                                                  isCancelled:NO
-                                                                          grantedPermissions:nil
-                                                                         declinedPermissions:nil];
+                                                                          grantedPermissions:emptySet
+                                                                         declinedPermissions:emptySet];
   XCTAssertNil(_provider.accessToken);
   [self.provider configureLoginManager:result withError:nil];
 
   XCTestExpectation *expectation = [self expectationWithDescription:@"logged in"];
-  [self.provider signInWithEmail:nil
-        presentingViewController:nil
-                      completion:^(FIRAuthCredential *_Nullable credential,
-                                   NSError *_Nullable error,
-                                   FIRAuthResultCallback _Nullable result,
-                                   NSDictionary *_Nullable userInfo) {
+  [self.provider signInWithDefaultValue:nil
+               presentingViewController:nil
+                             completion:^(FIRAuthCredential *_Nullable credential,
+                                          NSError *_Nullable error,
+                                          FIRAuthResultCallback _Nullable result,
+                                          NSDictionary *_Nullable userInfo) {
     XCTAssertNil(error);
     XCTAssertNotNil(credential);
     XCTAssertNotNil(result);
@@ -128,17 +129,17 @@ - (void)testCancelLogin {
   id mockToken = OCMPartialMock(token);
   FBSDKLoginManagerLoginResult *result = [[FBSDKLoginManagerLoginResult alloc] initWithToken:mockToken
                                                                                  isCancelled:YES
-                                                                          grantedPermissions:nil
-                                                                         declinedPermissions:nil];
+                                                                          grantedPermissions:[NSSet set]
+                                                                         declinedPermissions:[NSSet set]];
   [self.provider configureLoginManager:result withError:nil];
 
   XCTestExpectation *expectation = [self expectationWithDescription:@"logged in"];
-  [self.provider signInWithEmail:nil
-        presentingViewController:nil
-                      completion:^(FIRAuthCredential *_Nullable credential,
-                                   NSError *_Nullable error,
-                                   FIRAuthResultCallback _Nullable result,
-                                   NSDictionary *_Nullable userInfo) {
+  [self.provider signInWithDefaultValue:nil
+               presentingViewController:nil
+                             completion:^(FIRAuthCredential *_Nullable credential,
+                                          NSError *_Nullable error,
+                                          FIRAuthResultCallback _Nullable result,
+                                          NSDictionary *_Nullable userInfo) {
     XCTAssertNotNil(error);
     XCTAssertEqual(error.code, FUIAuthErrorCodeUserCancelledSignIn);
     XCTAssertNil(credential);
@@ -161,12 +162,12 @@ - (void)testErrorLogin {
   [self.provider configureLoginManager:nil withError:testError];
 
   XCTestExpectation *expectation = [self expectationWithDescription:@"logged in"];
-  [self.provider signInWithEmail:nil
-        presentingViewController:nil
-                      completion:^(FIRAuthCredential *_Nullable credential,
-                                   NSError *_Nullable error,
-                                   FIRAuthResultCallback _Nullable result,
-                                   NSDictionary *_Nullable userInfo) {
+  [self.provider signInWithDefaultValue:nil
+               presentingViewController:nil
+                             completion:^(FIRAuthCredential *_Nullable credential,
+                                          NSError *_Nullable error,
+                                          FIRAuthResultCallback _Nullable result,
+                                          NSDictionary *_Nullable userInfo) {
     XCTAssertNotNil(error);
     XCTAssertEqual(error.userInfo[NSUnderlyingErrorKey], testError);
     XCTAssertNil(credential);
diff --git a/FacebookAuth/Podfile b/FacebookAuth/Podfile
@@ -1,4 +1,4 @@
-source 'sso://cpdc-internal/firebase'
+# source 'sso://cpdc-internal/firebase'
 source 'https://github.com/CocoaPods/Specs.git'
 
 platform :ios, '8.0'
diff --git a/FacebookAuth/Podfile.lock b/FacebookAuth/Podfile.lock
@@ -1,35 +1,47 @@
 PODS:
-  - FBSDKCoreKit (5.0.0):
-    - FBSDKCoreKit/Basics (= 5.0.0)
-    - FBSDKCoreKit/Core (= 5.0.0)
-  - FBSDKCoreKit/Basics (5.0.0)
-  - FBSDKCoreKit/Core (5.0.0):
+  - FBSDKCoreKit (5.0.1):
+    - FBSDKCoreKit/Basics (= 5.0.1)
+    - FBSDKCoreKit/Core (= 5.0.1)
+  - FBSDKCoreKit/Basics (5.0.1)
+  - FBSDKCoreKit/Core (5.0.1):
     - FBSDKCoreKit/Basics
-  - FBSDKLoginKit (5.0.0):
-    - FBSDKCoreKit (= 5.0.0)
-  - Firebase/Auth (5.20.2):
+  - FBSDKLoginKit (5.0.1):
+    - FBSDKCoreKit (~> 5.0)
+  - Firebase/Auth (6.1.0):
     - Firebase/CoreOnly
-    - FirebaseAuth (= 5.4.2)
-  - Firebase/CoreOnly (5.20.2):
-    - FirebaseCore (= 5.4.1)
-  - FirebaseAuth (5.4.2):
+    - FirebaseAuth (~> 6.1.0)
+  - Firebase/CoreOnly (6.1.0):
+    - FirebaseCore (= 6.0.1)
+  - FirebaseAuth (6.1.0):
     - FirebaseAuthInterop (~> 1.0)
-    - FirebaseCore (~> 5.2)
-    - GoogleUtilities/Environment (~> 5.2)
+    - FirebaseCore (~> 6.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 6.0)
+    - GoogleUtilities/Environment (~> 6.0)
     - GTMSessionFetcher/Core (~> 1.1)
   - FirebaseAuthInterop (1.0.0)
-  - FirebaseCore (5.4.1):
-    - GoogleUtilities/Environment (~> 5.2)
-    - GoogleUtilities/Logger (~> 5.2)
-  - FirebaseUI/Auth (6.2.1):
-    - Firebase/Auth (~> 5.4)
+  - FirebaseCore (6.0.1):
+    - GoogleUtilities/Environment (~> 6.0)
+    - GoogleUtilities/Logger (~> 6.0)
+  - FirebaseUI/Auth (7.0.0):
+    - Firebase/Auth (~> 6.0)
     - GoogleUtilities/UserDefaults
-  - GoogleUtilities/Environment (5.8.0)
-  - GoogleUtilities/Logger (5.8.0):
+  - GoogleUtilities/AppDelegateSwizzler (6.2.0):
     - GoogleUtilities/Environment
-  - GoogleUtilities/UserDefaults (5.8.0):
     - GoogleUtilities/Logger
-  - GTMSessionFetcher/Core (1.2.1)
+    - GoogleUtilities/Network
+  - GoogleUtilities/Environment (6.2.0)
+  - GoogleUtilities/Logger (6.2.0):
+    - GoogleUtilities/Environment
+  - GoogleUtilities/Network (6.2.0):
+    - GoogleUtilities/Logger
+    - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Reachability
+  - "GoogleUtilities/NSData+zlib (6.2.0)"
+  - GoogleUtilities/Reachability (6.2.0):
+    - GoogleUtilities/Logger
+  - GoogleUtilities/UserDefaults (6.2.0):
+    - GoogleUtilities/Logger
+  - GTMSessionFetcher/Core (1.2.2)
   - OCMock (3.4.3)
 
 DEPENDENCIES:
@@ -55,17 +67,17 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  FBSDKCoreKit: ba361d4a9d4dc29ff218822b849b22d4f869c7bb
-  FBSDKLoginKit: c6d0dc187bd076e370dffa10f7fc8a3562a6892c
-  Firebase: 0c8cf33f266410c61ab3e2265cfa412200351d9c
-  FirebaseAuth: dd7bbf03a5aee0eafb3a1aee4d2812bd74bac890
+  FBSDKCoreKit: 4a19534474ade7c71bd016d800aa5e7722bcdda1
+  FBSDKLoginKit: 41efa754b909b0ea813fa9a8596dacc8ed196d50
+  Firebase: 8d77bb33624ae9b62d745d82ec023de5f70f7e4f
+  FirebaseAuth: 4281d6d98a90881e00710fa8d9e37c2ccdfc7d80
   FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc
-  FirebaseCore: f1a9a8be1aee4bf71a2fc0f4096df6788bdfda61
-  FirebaseUI: a2edbe63a90dff4a9ac715f4dd2869411528eedc
-  GoogleUtilities: 04fce34bcd5620c1ee76fb79172105c74a4df335
-  GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca
+  FirebaseCore: 66bdef3b310a026880e2a5bc8aa586ab62ce4543
+  FirebaseUI: f9367cd5cacde991d9bcce9278d3fcb858f84f6a
+  GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba
+  GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23
   OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab
 
-PODFILE CHECKSUM: 4a628fc1e0dd4b8135687af583b15c395645a8d1
+PODFILE CHECKSUM: d4087ca55e7289fffba35c7dae37752581dfdfe2
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.7.0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-source 'sso://cpdc-internal/firebase'`
	`1`	`+# source 'sso://cpdc-internal/firebase'`
`2`	`2`	`source 'https://github.com/CocoaPods/Specs.git'`
`3`	`3`
`4`	`4`	`platform :ios, '8.0'`