From 535de47ee1bf31fb54f0e01b323a8e4dcf35cd7a Mon Sep 17 00:00:00 2001
From: Salakar <mike.diarmid@gmail.com>
Date: Tue, 7 Nov 2017 09:54:38 +0000
Subject: [PATCH] [ios][auth] Fix issue with confirmPasswordReset,
 applyActionCode and checkActionCode not handling specific app instances

---
 ios/RNFirebase/auth/RNFirebaseAuth.m | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/ios/RNFirebase/auth/RNFirebaseAuth.m b/ios/RNFirebase/auth/RNFirebaseAuth.m
index 1aa0004c..b4b7fa79 100644
--- a/ios/RNFirebase/auth/RNFirebaseAuth.m
+++ b/ios/RNFirebase/auth/RNFirebaseAuth.m
@@ -481,14 +481,18 @@ RCT_EXPORT_METHOD(signInWithCredential:
  @return
  */
 RCT_EXPORT_METHOD(confirmPasswordReset:
-    (NSString *) code
+        (NSString *) appName
+            code:
+            (NSString *) code
             newPassword:
             (NSString *) newPassword
             resolver:
             (RCTPromiseResolveBlock) resolve
             rejecter:
             (RCTPromiseRejectBlock) reject) {
-    [[FIRAuth auth] confirmPasswordResetWithCode:code newPassword:newPassword completion:^(NSError *_Nullable error) {
+    FIRApp *firApp = [FIRApp appNamed:appName];
+    
+    [[FIRAuth authWithApp:firApp] confirmPasswordResetWithCode:code newPassword:newPassword completion:^(NSError *_Nullable error) {
         if (error) {
             [self promiseRejectAuthException:reject error:error];
         } else {
@@ -507,12 +511,16 @@ RCT_EXPORT_METHOD(confirmPasswordReset:
  * @return
  */
 RCT_EXPORT_METHOD(applyActionCode:
-    (NSString *) code
+        (NSString *) appName
+            code:
+            (NSString *) code
             resolver:
             (RCTPromiseResolveBlock) resolve
             rejecter:
             (RCTPromiseRejectBlock) reject) {
-    [[FIRAuth auth] applyActionCode:code completion:^(NSError *_Nullable error) {
+    FIRApp *firApp = [FIRApp appNamed:appName];
+    
+    [[FIRAuth authWithApp:firApp] applyActionCode:code completion:^(NSError *_Nullable error) {
         if (error) {
             [self promiseRejectAuthException:reject error:error];
         } else {
@@ -530,12 +538,16 @@ RCT_EXPORT_METHOD(applyActionCode:
  * @return
  */
 RCT_EXPORT_METHOD(checkActionCode:
-    (NSString *) code
+        (NSString *) appName
+            code:
+            (NSString *) code
             resolver:
             (RCTPromiseResolveBlock) resolve
             rejecter:
             (RCTPromiseRejectBlock) reject) {
-    [[FIRAuth auth] checkActionCode:code completion:^(FIRActionCodeInfo *_Nullable info, NSError *_Nullable error) {
+    FIRApp *firApp = [FIRApp appNamed:appName];
+    
+    [[FIRAuth authWithApp:firApp] checkActionCode:code completion:^(FIRActionCodeInfo *_Nullable info, NSError *_Nullable error) {
         if (error) {
             [self promiseRejectAuthException:reject error:error];
         } else {