Merge remote-tracking branch 'origin/master'

android/src/main/java/io/invertase/firebase/auth/RNFirebaseAuth.java

@@ -917,6 +917,8 @@ class RNFirebaseAuth extends ReactContextBaseJavaModule {
         return TwitterAuthProvider.getCredential(authToken, authSecret);
       case "github":
         return GithubAuthProvider.getCredential(authToken);
+      case "phone":
+        return PhoneAuthProvider.getCredential(authToken, authSecret);
       case "password":
         return EmailAuthProvider.getCredential(authToken, authSecret);
       default:

docs/_sidebar.md

@@ -18,7 +18,7 @@
 ---
 
 - Modules
- - [Admob](/modules/admob)
+ - [Admob (Disable Adblock)](/modules/admob)
  - [Analytics](/modules/analytics)
  - [Authentication](/modules/authentication)
  - [Cloud Messaging](/modules/cloud-messaging)

index.d.ts

@@ -454,6 +454,10 @@ declare module "react-native-firebase" {
        * Reauthenticate the current user with credentials:
        */
       reauthenticate(credential: Credential): Promise<void>
+      /**
+       * Link the user with a 3rd party credential provider.
+       */
+      linkWithCredential(credential: Credential): Promise<User>
       /**
        * Refreshes the current user.
        */

ios/RNFirebase/auth/RNFirebaseAuth.m

@@ -825,6 +825,8 @@ RCT_EXPORT_METHOD(fetchProvidersForEmail:
         credential = [FIREmailAuthProvider credentialWithEmail:authToken password:authTokenSecret];
     } else if ([provider compare:@"github" options:NSCaseInsensitiveSearch] == NSOrderedSame) {
         credential = [FIRGitHubAuthProvider credentialWithToken:authToken];
+    } else if ([provider compare:@"phone" options:NSCaseInsensitiveSearch] == NSOrderedSame) {
+        credential = [[FIRPhoneAuthProvider provider] credentialWithVerificationID:authToken verificationCode:authTokenSecret];
     } else {
         NSLog(@"Provider not yet handled: %@", provider);
     }