From 66aa5ccb67356bc22ef27507c93be737d1871b4b Mon Sep 17 00:00:00 2001
From: Salakar <mike.diarmid@gmail.com>
Date: Fri, 20 Jul 2018 16:28:07 +0100
Subject: [PATCH] [ios][messaging] fix #1286 - 'getToken resolves to null if
 called too early'

---
 ios/RNFirebase/messaging/RNFirebaseMessaging.m | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/ios/RNFirebase/messaging/RNFirebaseMessaging.m b/ios/RNFirebase/messaging/RNFirebaseMessaging.m
index bc9caa57..704875a0 100644
--- a/ios/RNFirebase/messaging/RNFirebaseMessaging.m
+++ b/ios/RNFirebase/messaging/RNFirebaseMessaging.m
@@ -108,7 +108,22 @@ didReceiveMessage:(nonnull FIRMessagingRemoteMessage *)remoteMessage {
 
 // ** Start React Module methods **
 RCT_EXPORT_METHOD(getToken:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-    resolve([[FIRInstanceID instanceID] token]);
+    if (initialToken) {
+        resolve(initialToken);
+    } else if ([[FIRInstanceID instanceID] token]) {
+        resolve([[FIRInstanceID instanceID] token]);
+    } else {
+        NSString * senderId = [[FIRApp defaultApp] options].GCMSenderID;
+        [[FIRMessaging messaging] retrieveFCMTokenForSenderID:senderId completion:^(NSString * _Nullable FCMToken, NSError * _Nullable error) {
+            if (error) {
+                reject(@"messaging/fcm-token-error", @"Failed to retrieve FCM token.", error);
+            } else if (FCMToken) {
+                resolve(FCMToken);
+            } else {
+                resolve([NSNull null]);
+            }
+        }];
+    }
 }
 
 RCT_EXPORT_METHOD(requestPermission:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {