From 32cb4155b4a322b23f930812818bea0ff5b07ab7 Mon Sep 17 00:00:00 2001 From: Brian M Hiss Date: Fri, 1 Sep 2017 15:47:42 +0800 Subject: [PATCH 1/2] [auth][phone] Allow for linkWithCredential() for PhoneAuthProvider. --- .../main/java/io/invertase/firebase/auth/RNFirebaseAuth.java | 2 ++ index.d.ts | 4 ++++ ios/RNFirebase/auth/RNFirebaseAuth.m | 2 ++ 3 files changed, 8 insertions(+) diff --git a/android/src/main/java/io/invertase/firebase/auth/RNFirebaseAuth.java b/android/src/main/java/io/invertase/firebase/auth/RNFirebaseAuth.java index 76a88c80..f0dcb371 100644 --- a/android/src/main/java/io/invertase/firebase/auth/RNFirebaseAuth.java +++ b/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: diff --git a/index.d.ts b/index.d.ts index 2041bafe..eb3bd157 100644 --- a/index.d.ts +++ b/index.d.ts @@ -454,6 +454,10 @@ declare module "react-native-firebase" { * Reauthenticate the current user with credentials: */ reauthenticate(credential: Credential): Promise + /** + * Link the user with a 3rd party credential provider. + */ + linkWithCredential(credential: Credential): Promise /** * Refreshes the current user. */ diff --git a/ios/RNFirebase/auth/RNFirebaseAuth.m b/ios/RNFirebase/auth/RNFirebaseAuth.m index 59371314..18faac5c 100644 --- a/ios/RNFirebase/auth/RNFirebaseAuth.m +++ b/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); } From a5645c98848439cdfe07b3ac13644dd86488a4be Mon Sep 17 00:00:00 2001 From: Elliot Hesp Date: Mon, 4 Sep 2017 15:52:31 +0100 Subject: [PATCH 2/2] Add note on sidebar to disable adblock for admob page --- docs/_sidebar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_sidebar.md b/docs/_sidebar.md index aa87b0f2..e5b01cd8 100644 --- a/docs/_sidebar.md +++ b/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)