get token from messaging sdk

messaging/MessagingExample/Base.lproj/Main.storyboard

@@ -57,7 +57,7 @@
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No InstanceID token" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1wF-0v-e01">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No FCM registration token" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1wF-0v-e01">
                                 <rect key="frame" x="67.5" y="565" width="240" height="13.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="240" id="FXq-Tm-sRh"/>
@@ -83,7 +83,7 @@
                     <navigationItem key="navigationItem" title="FCM Example" id="uI5-jL-nrY"/>
                     <connections>
                         <outlet property="fcmTokenMessage" destination="RBg-uJ-gCV" id="FUs-GZ-mfF"/>
-                        <outlet property="instanceIDTokenMessage" destination="1wF-0v-e01" id="Dmb-Lh-hLD"/>
+                        <outlet property="fcmRegTokenMessage" destination="1wF-0v-e01" id="Dmb-Lh-hLD"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>

messaging/MessagingExample/ViewController.h

@@ -18,5 +18,5 @@
 
 @interface ViewController : UIViewController
 @property (weak, nonatomic) IBOutlet UILabel *fcmTokenMessage;
-@property (weak, nonatomic) IBOutlet UILabel *instanceIDTokenMessage;
+@property (weak, nonatomic) IBOutlet UILabel *fcmRegTokenMessage;
 @end

messaging/MessagingExample/ViewController.m

@@ -31,23 +31,20 @@ - (IBAction)handleLogTokenTouch:(id)sender {
   NSString *fcmToken = [FIRMessaging messaging].FCMToken;
   NSLog(@"Local FCM registration token: %@", fcmToken);
   // [END log_fcm_reg_token]
-    
+
   NSString* displayToken = [NSString stringWithFormat:@"Logged FCM token: %@", fcmToken];
   self.fcmTokenMessage.text = displayToken;
-
-  // [START log_iid_reg_token]
-  [[FIRInstanceID instanceID] instanceIDWithHandler:^(FIRInstanceIDResult * _Nullable result,
-                                                      NSError * _Nullable error) {
+
+  // [START log_reg_token]
+  [[FIRMessaging messaging] tokenWithCompletion:^(NSString *token, NSError *error) {
     if (error != nil) {
-      NSLog(@"Error fetching remote instance ID: %@", error);
+      NSLog(@"Error getting FCM registration token: %@", error);
     } else {
-      NSLog(@"Remote instance ID token: %@", result.token);
-      NSString* message =
-        [NSString stringWithFormat:@"Remote InstanceID token: %@", result.token];
-      self.instanceIDTokenMessage.text = message;
+      NSLog(@"FCM registration token: %@", token);
+      self.fcmRegTokenMessage.text = token;
     }
   }];
-  // [END log_iid_reg_token]
+  // [END log_reg_token]
 }
 
 - (IBAction)handleSubscribeTouch:(id)sender {

messaging/MessagingExampleSwift/ViewController.swift

@@ -19,32 +19,32 @@ import Firebase
 
 @objc(ViewController)
 class ViewController: UIViewController {
- 
+
   @IBOutlet weak var fcmTokenMessage: UILabel!
-  @IBOutlet weak var instanceIDTokenMessage: UILabel!
-    
+  @IBOutlet weak var fcmRegTokenMessage: UILabel!
+
   override func viewDidLoad() {
     NotificationCenter.default.addObserver(self, selector: #selector(self.displayFCMToken(notification:)),
                                            name: Notification.Name("FCMToken"), object: nil)
   }
-    
+
   @IBAction func handleLogTokenTouch(_ sender: UIButton) {
     // [START log_fcm_reg_token]
     let token = Messaging.messaging().fcmToken
     print("FCM token: \(token ?? "")")
     // [END log_fcm_reg_token]
     self.fcmTokenMessage.text  = "Logged FCM token: \(token ?? "")"
 
-    // [START log_iid_reg_token]
-    InstanceID.instanceID().instanceID { (result, error) in
+    // [START log_reg_token]
+    Messaging.messaging().token { token, error in
       if let error = error {
-        print("Error fetching remote instance ID: \(error)")
-      } else if let result = result {
-        print("Remote instance ID token: \(result.token)")
-        self.instanceIDTokenMessage.text  = "Remote InstanceID token: \(result.token)"
+        print("Error fetching FCM registration token: \(error)")
+      } else if let token = token {
+        print("FCM registration token: \(token)")
+        self.fcmRegTokenMessage.text  = "Remote FCM registration token: \(token)"
       }
     }
-    // [END log_iid_reg_token]
+    // [END log_reg_token]
   }
 
   @IBAction func handleSubscribeTouch(_ sender: UIButton) {

messaging/MessagingExampleUITests/MessagingExampleUITests.m

@@ -76,14 +76,14 @@ - (void)testVerifyAppLaunched {
 
   // Wait till network call is finished.
   NSPredicate *gone = [NSPredicate predicateWithFormat:@"exists == false"];
-  FIRWaitForPredicateWithTimeout(gone, [_app staticTexts][@"No InstanceID token"], 20);
+  FIRWaitForPredicateWithTimeout(gone, [_app staticTexts][@"No FCM registration token"], 20);
 
   // Make sure [FIRMessaging messaging].FCMToken returns FCM token.
   XCTAssertTrue(
       [[[[_app staticTexts] elementBoundByIndex:1] label] containsString:@"Logged FCM token"]);
-  // Make sure [FIRInstanceID instanceID] instanceIDWithHandler: returns FCM token.
+  // Make sure [FIRMessaging messaging] tokenWithCompletion: returns FCM token.
   XCTAssertTrue([[[[_app staticTexts] elementBoundByIndex:2] label]
-      containsString:@"Remote InstanceID token"]);
+      containsString:@"Remote FCM registration token"]);
 }
 
 @end