Merge pull request arnesson#880 from chrisid/issue866

setup [FIRapp configureWithOptions] passing Google .plist
hvaughan3 · Oct 3, 2018 · 81601bb · 81601bb
2 parents 1dd3b49 + 78bd942
commit 81601bb
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/src/ios/AppDelegate+FirebasePlugin.m b/src/ios/AppDelegate+FirebasePlugin.m
@@ -47,7 +47,22 @@ - (NSNumber *)applicationInBackground {
 - (BOOL)application:(UIApplication *)application swizzledDidFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     [self application:application swizzledDidFinishLaunchingWithOptions:launchOptions];
 
-    if (![FIRApp defaultApp]) {
+    // get GoogleService-Info.plist file path
+    NSString *filePath = [[NSBundle mainBundle] pathForResource:@"GoogleService-Info" ofType:@"plist"];
+
+    // if file is successfully found, use it
+    if(filePath){
+        NSLog(@"GoogleService-Info.plist found, setup: [FIRApp configureWithOptions]");
+        // create firebase configure options passing .plist as content
+        FIROptions *options = [[FIROptions alloc] initWithContentsOfFile:filePath];
+
+        // configure FIRApp with options
+        [FIRApp configureWithOptions:options];
+    }
+
+    // no .plist found, try default App
+    if (![FIRApp defaultApp] && !filePath) {
+        NSLog(@"GoogleService-Info.plist NOT FOUND, setup: [FIRApp defaultApp]");
         [FIRApp configure];
     }
 
@@ -65,7 +80,7 @@ - (BOOL)application:(UIApplication *)application swizzledDidFinishLaunchingWithO
     self.applicationInBackground = @(YES);
 
     return YES;
-      }
+}
 
 - (void)applicationDidBecomeActive:(UIApplication *)application {
     [self connectToFcm];