Merge IID removal code to master

FirebaseMessaging.podspec

@@ -42,7 +42,7 @@ device, and it is completely free.
     'Firebase/InstanceID/Public/*.h',
     'FirebaseInstallations/Source/Library/Private/*.h',
   ]
-  s.requires_arc = base_dir + 'Sources/*.m'
+  s.requires_arc = base_dir + 'Sources/**/*.m'
   s.public_header_files = base_dir + 'Sources/Public/FirebaseMessaging/*.h'
   s.library = 'sqlite3'
   s.pod_target_xcconfig = {
@@ -54,8 +54,9 @@ device, and it is completely free.
   s.tvos.framework = 'SystemConfiguration'
   s.osx.framework = 'SystemConfiguration'
   s.weak_framework = 'UserNotifications'
-  s.dependency 'FirebaseCore', '~> 7.0'
   s.dependency 'FirebaseInstanceID', '~> 7.0'
+  s.dependency 'FirebaseInstallations', '~> 7.0'
+  s.dependency 'FirebaseCore', '~> 7.0'
   s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 7.0'
   s.dependency 'GoogleUtilities/Reachability', '~> 7.0'
   s.dependency 'GoogleUtilities/Environment', '~> 7.0'
@@ -68,7 +69,10 @@ device, and it is completely free.
       :osx => osx_deployment_target,
       :tvos => tvos_deployment_target
     }
-    unit_tests.source_files = 'FirebaseMessaging/Tests/UnitTests*/*.{m,h,swift}'
+    unit_tests.source_files = [
+      'FirebaseMessaging/Tests/UnitTests*/*.{m,h,swift}',
+      'SharedTestUtilities/URLSession/*.[mh]',
+    ]
     unit_tests.requires_app_host = true
     unit_tests.pod_target_xcconfig = {
      'CLANG_ENABLE_OBJC_WEAK' => 'YES'

FirebaseMessaging/Apps/Shared/ContentView.swift

@@ -142,7 +142,6 @@ struct ContentView: View {
             .multilineTextAlignment(.leading)
         }
         .navigationBarTitle("Firebase Messaging")
-
       }.buttonStyle(IdentityButtonStyle())
     }
   }
@@ -338,8 +337,9 @@ struct IdentityButtonStyle: ButtonStyle {
       .padding()
       .foregroundColor(.white)
       .background(Color.yellow)
-      .cornerRadius(40)
+      .cornerRadius(20)
       // Push the button down a bit when it's pressed.
       .scaleEffect(configuration.isPressed ? 0.9 : 1)
+      .font(.footnote)
   }
 }

FirebaseMessaging/Apps/Shared/SceneDelegate.swift

@@ -15,7 +15,6 @@
 import Combine
 import UIKit
 import SwiftUI
-import FirebaseInstanceID
 import FirebaseMessaging
 import FirebaseInstallations
 

FirebaseMessaging/CHANGELOG.md

@@ -1,3 +1,6 @@
+#unreleased
+- [changed] Refactor Messaging to internally not depending on InstanceID, but can co-exist. Will remove InstanceID dependency in the next Firebase breaking change. (#7814)
+
 # 2021-02 -- v7.7.0
 - [fixed] Fixed an issue in which, when checking storage size before writing to disk, the client was checking document folders that were no longer used. (#7480)
 

FirebaseMessaging/Sources/FIRMMessageCode.h → FirebaseMessaging/Sources/FIRMessagingCode.h

@@ -36,10 +36,10 @@ typedef NS_ENUM(NSInteger, FIRMessagingMessageCode) {
   kFIRMessagingMessageCodeMessaging012 = 2012,                  // I-FCM002012
   kFIRMessagingMessageCodeMessaging013 = 2013,                  // I-FCM002013
   kFIRMessagingMessageCodeMessaging014 = 2014,                  // I-FCM002014
-  kFIRMessagingMessageCodeMessaging015 = 2015,                  // I-FCM002015
-  kFIRMessagingMessageCodeMessaging016 = 2016,                  // I-FCM002016 - no longer used
-  kFIRMessagingMessageCodeMessaging017 = 2017,                  // I-FCM002017
-  kFIRMessagingMessageCodeMessaging018 = 2018,                  // I-FCM002018
+  kFIRMessagingMessageCodeMessaging015 = 2015,
+  kFIRMessagingMessageCodeMessaging016 = 2016,  // I-FCM002016 - no longer used
+  kFIRMessagingMessageCodeMessaging017 = 2017,  // I-FCM002017
+  kFIRMessagingMessageCodeMessaging018 = 2018,  // I-FCM002018
   kFIRMessagingMessageCodeRemoteMessageDelegateMethodNotImplemented = 2019,  // I-FCM002019
   kFIRMessagingMessageCodeSenderIDNotSuppliedForTokenFetch = 2020,           // I-FCM002020
   kFIRMessagingMessageCodeSenderIDNotSuppliedForTokenDelete = 2021,          // I-FCM002021
@@ -137,4 +137,121 @@ typedef NS_ENUM(NSInteger, FIRMessagingMessageCode) {
   kFIRMessagingServiceExtensionLocalFileNotCreated = 20002,
   kFIRMessagingServiceExtensionImageNotAttached = 20003,
 
+  kFIRMessagingMessageCodeFIRApp002 = 22002,
+  kFIRMessagingMessageCodeInternal001 = 22001,
+  kFIRMessagingMessageCodeInternal002 = 22002,
+  // FIRMessaging.m
+  // DO NOT USE 4000.
+  kFIRMessagingMessageCodeInstanceID000 = 23000,
+  kFIRMessagingMessageCodeInstanceID001 = 23001,
+  kFIRMessagingMessageCodeInstanceID002 = 23002,
+  kFIRMessagingMessageCodeInstanceID003 = 23003,
+  kFIRMessagingMessageCodeInstanceID004 = 23004,
+  kFIRMessagingMessageCodeInstanceID005 = 23005,
+  kFIRMessagingMessageCodeInstanceID006 = 23006,
+  kFIRMessagingMessageCodeInstanceID007 = 23007,
+  kFIRMessagingMessageCodeInstanceID008 = 23008,
+  kFIRMessagingMessageCodeInstanceID009 = 23009,
+  kFIRMessagingMessageCodeInstanceID010 = 23010,
+  kFIRMessagingMessageCodeInstanceID011 = 23011,
+  kFIRMessagingMessageCodeInstanceID012 = 23012,
+  kFIRMessagingMessageCodeInstanceID013 = 23013,
+  kFIRMessagingMessageCodeInstanceID014 = 23014,
+  kFIRMessagingMessageCodeInstanceID015 = 23015,
+  kFIRMessagingMessageCodeRefetchingTokenForAPNS = 23016,
+  kFIRMessagingMessageCodeInstanceID017 = 23017,
+  kFIRMessagingMessageCodeInstanceID018 = 23018,
+  // FIRMessagingAuthService.m
+  kFIRMessagingMessageCodeAuthService000 = 25000,
+  kFIRMessagingMessageCodeAuthService001 = 25001,
+  kFIRMessagingMessageCodeAuthService002 = 25002,
+  kFIRMessagingMessageCodeAuthService003 = 25003,
+  kFIRMessagingMessageCodeAuthService004 = 25004,
+  kFIRMessagingMessageCodeAuthServiceCheckinInProgress = 25004,
+
+  // FIRMessagingBackupExcludedPlist.m
+  // Do NOT USE 6003
+  kFIRMessagingMessageCodeBackupExcludedPlist000 = 26000,
+  kFIRMessagingMessageCodeBackupExcludedPlist001 = 26001,
+  kFIRMessagingMessageCodeBackupExcludedPlist002 = 26002,
+  // FIRMessagingCheckinService.m
+  kFIRMessagingMessageCodeService000 = 27000,
+  kFIRMessagingMessageCodeService001 = 27001,
+  kFIRMessagingMessageCodeService002 = 27002,
+  kFIRMessagingMessageCodeService003 = 27003,
+  kFIRMessagingMessageCodeService004 = 27004,
+  kFIRMessagingMessageCodeService005 = 27005,
+  kFIRMessagingMessageCodeService006 = 27006,
+  kFIRMessagingInvalidSettingResponse = 27008,
+  // FIRMessagingCheckinStore.m
+  // DO NOT USE 8002, 8004 - 8008
+  kFIRMessagingMessageCodeCheckinStore000 = 28000,
+  kFIRMessagingMessageCodeCheckinStore001 = 28001,
+  kFIRMessagingMessageCodeCheckinStore003 = 28003,
+  kFIRMessagingMessageCodeCheckinStoreCheckinPlistDeleted = 28009,
+  kFIRMessagingMessageCodeCheckinStoreCheckinPlistSaved = 28010,
+
+  // DO NOT USE 9000 - 9006
+
+  // DO NOT USE 10000 - 10009
+
+  // DO NOT USE 11000 - 11002
+
+  // DO NOT USE 12000 - 12014
+
+  // DO NOT USE 13004, 13005, 13007, 13008, 13010, 13011, 13013, 13014
+  kFIRMessagingMessageCodeStore000 = 33000,
+  kFIRMessagingMessageCodeStore002 = 33002,
+  kFIRMessagingMessageCodeStore003 = 33003,
+  kFIRMessagingMessageCodeStore006 = 33006,
+  kFIRMessagingMessageCodeStore009 = 33009,
+  kFIRMessagingMessageCodeStore012 = 33012,
+  // FIRMessagingTokenManager.m
+  // DO NOT USE 14002, 14005
+  kFIRMessagingMessageCodeTokenManager000 = 34000,
+  kFIRMessagingMessageCodeTokenManager001 = 34001,
+  kFIRMessagingMessageCodeTokenManager003 = 34003,
+  kFIRMessagingMessageCodeTokenManager004 = 34004,
+  kFIRMessagingMessageCodeTokenManagerErrorDeletingFCMTokensOnAppReset = 34006,
+  kFIRMessagingMessageCodeTokenManagerDeletedFCMTokensOnAppReset = 34007,
+  kFIRMessagingMessageCodeTokenManagerSavedAppVersion = 34008,
+  kFIRMessagingMessageCodeTokenManagerErrorInvalidatingAllTokens = 34009,
+  kFIRMessagingMessageCodeTokenManagerAPNSChanged = 34010,
+  kFIRMessagingMessageCodeTokenManagerAPNSChangedTokenInvalidated = 34011,
+  kFIRMessagingMessageCodeTokenManagerInvalidateStaleToken = 34012,
+  // FIRMessagingTokenStore.m
+  // DO NOT USE 15002 - 15013
+  kFIRMessagingMessageCodeTokenStore000 = 35000,
+  kFIRMessagingMessageCodeTokenStore001 = 35001,
+  kFIRMessagingMessageCodeTokenStoreExceptionUnarchivingTokenInfo = 35015,
+
+  // DO NOT USE 16000, 18004
+
+  // FIRMessagingUtilities.m
+  kFIRMessagingMessageCodeUtilitiesMissingBundleIdentifier = 38000,
+  kFIRMessagingMessageCodeUtilitiesAppEnvironmentUtilNotAvailable = 38001,
+  kFIRMessagingMessageCodeUtilitiesCannotGetHardwareModel = 38002,
+  kFIRMessagingMessageCodeUtilitiesCannotGetSystemVersion = 38003,
+  // FIRMessagingTokenOperation.m
+  kFIRMessagingMessageCodeTokenOperationFailedToSignParams = 39000,
+  // FIRMessagingTokenFetchOperation.m
+  // DO NOT USE 40004, 40005
+  kFIRMessagingMessageCodeTokenFetchOperationFetchRequest = 40000,
+  kFIRMessagingMessageCodeTokenFetchOperationRequestError = 40001,
+  kFIRMessagingMessageCodeTokenFetchOperationBadResponse = 40002,
+  kFIRMessagingMessageCodeTokenFetchOperationBadTokenStructure = 40003,
+  // FIRMessagingTokenDeleteOperation.m
+  kFIRMessagingMessageCodeTokenDeleteOperationFetchRequest = 41000,
+  kFIRMessagingMessageCodeTokenDeleteOperationRequestError = 41001,
+  kFIRMessagingMessageCodeTokenDeleteOperationBadResponse = 41002,
+  // FIRMessagingTokenInfo.m
+  kFIRMessagingMessageCodeTokenInfoBadAPNSInfo = 42000,
+  kFIRMessagingMessageCodeTokenInfoFirebaseAppIDChanged = 42001,
+  kFIRMessagingMessageCodeTokenInfoLocaleChanged = 42002,
+  // FIRMessagingKeychain.m
+  kFIRMessagingKeychainReadItemError = 43000,
+  kFIRMessagingKeychainAddItemError = 43001,
+  kFIRMessagingKeychainDeleteItemError = 43002,
+  kFIRMessagingKeychainCreateKeyPairError = 43003,
+  kFIRMessagingKeychainUpdateItemError = 43004,
 };

FirebaseMessaging/Sources/FIRMessagingConstants.h

@@ -31,9 +31,52 @@ FOUNDATION_EXPORT NSString *const kFIRMessagingMessageLinkKey;
 FOUNDATION_EXPORT NSString *const kFIRMessagingRemoteNotificationsProxyEnabledInfoPlistKey;
 FOUNDATION_EXPORT NSString *const kFIRMessagingSubDirectoryName;
 
-// Notifications
+#pragma mark - Notifications
+
 FOUNDATION_EXPORT NSString *const kFIRMessagingCheckinFetchedNotification;
 FOUNDATION_EXPORT NSString *const kFIRMessagingAPNSTokenNotification;
+FOUNDATION_EXPORT NSString *const kFIRMessagingDefaultGCMTokenFailNotification;
 FOUNDATION_EXPORT NSString *const kFIRMessagingRegistrationTokenRefreshNotification;
 
+FOUNDATION_EXPORT const int kFIRMessagingSendTtlDefault;  // 24 hours
+
+/**
+ *  Value included in a structured response or GCM message from IID, indicating
+ *  an identity reset.
+ */
+FOUNDATION_EXPORT NSString *const kFIRMessaging_CMD_RST;
+
+#pragma mark - Miscellaneous
+
+/// The scope used to save the IID "*" scope token. This is used for saving the
+/// IID auth token that we receive from the server. This feature was never
+/// implemented on the server side.
+FOUNDATION_EXPORT NSString *const kFIRMessagingAllScopeIdentifier;
+/// The scope used to save the IID "*" scope token.
+FOUNDATION_EXPORT NSString *const kFIRMessagingDefaultTokenScope;
+
+/// Subdirectory in search path directory to store InstanceID preferences.
+FOUNDATION_EXPORT NSString *const kFIRMessagingInstanceIDSubDirectoryName;
+
+/// The key for APNS token in options dictionary.
+FOUNDATION_EXPORT NSString *const kFIRMessagingTokenOptionsAPNSKey;
+
+/// The key for APNS token environment type in options dictionary.
+FOUNDATION_EXPORT NSString *const kFIRMessagingTokenOptionsAPNSIsSandboxKey;
+
+/// The key for GMP AppID sent in registration requests.
+FOUNDATION_EXPORT NSString *const kFIRMessagingTokenOptionsFirebaseAppIDKey;
+
+FOUNDATION_EXPORT NSString *const kFIRMessagingAPNSTokenType;
+
+/// The key to enable auto-register by swizzling AppDelegate's methods.
+FOUNDATION_EXPORT NSString *const kFIRMessagingAppDelegateProxyEnabledInfoPlistKey;
+
+/// Error code for missing entitlements in Keychain. iOS Keychain error
+/// https://forums.developer.apple.com/thread/4743
+FOUNDATION_EXPORT const int kFIRMessagingSecMissingEntitlementErrorCode;
+
+/// The key for InstallationID or InstanceID in token request.
+FOUNDATION_EXPORT NSString *const kFIRMessagingParamInstanceID;
+
 #endif

FirebaseMessaging/Sources/FIRMessagingConstants.m

@@ -36,3 +36,33 @@
 NSString *const kFIRMessagingAPNSTokenNotification = @"com.firebase.iid.notif.apns-token";
 NSString *const kFIRMessagingRegistrationTokenRefreshNotification =
     @"com.firebase.iid.notif.refresh-token";
+
+const int kFIRMessagingSendTtlDefault = 24 * 60 * 60;  // 24 hours
+
+// Commands
+NSString *const kFIRMessaging_CMD_RST = @"RST";
+
+// NOTIFICATIONS
+NSString *const kFIRMessagingDefaultGCMTokenFailNotification =
+    @"com.firebase.iid.notif.fcm-token-fail";
+
+// Miscellaneous
+NSString *const kFIRMessagingAllScopeIdentifier = @"iid-all";
+NSString *const kFIRMessagingDefaultTokenScope = @"*";
+NSString *const kFIRMessagingInstanceIDSubDirectoryName = @"Google/FirebaseInstanceID";
+
+// Registration Options
+NSString *const kFIRMessagingTokenOptionsAPNSKey = @"apns_token";
+NSString *const kFIRMessagingTokenOptionsAPNSIsSandboxKey = @"apns_sandbox";
+NSString *const kFIRMessagingTokenOptionsFirebaseAppIDKey = @"gmp_app_id";
+NSString *const kFIRMessagingParamInstanceID = @"appid";
+
+NSString *const kFIRMessagingAPNSTokenType =
+    @"APNSTokenType";  // APNS Token type key stored in user info.
+
+NSString *const kFIRMessagingAppDelegateProxyEnabledInfoPlistKey =
+    @"FirebaseAppDelegateProxyEnabled";
+
+// iOS Keychain error https://forums.developer.apple.com/thread/4743
+// An undocumented error code hence need to be redeclared.
+const int kFIRMessagingSecMissingEntitlementErrorCode = -34018;

FirebaseMessaging/Sources/FIRMessagingExtensionHelper.m

@@ -16,7 +16,7 @@
 
 #import "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h"
 
-#import "FirebaseMessaging/Sources/FIRMMessageCode.h"
+#import "FirebaseMessaging/Sources/FIRMessagingCode.h"
 #import "FirebaseMessaging/Sources/FIRMessagingLogger.h"
 
 static NSString *const kPayloadOptionsName = @"fcm_options";

FirebaseMessaging/Sources/FIRMessagingLogger.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FirebaseMessaging/Sources/FIRMMessageCode.h"
+#import "FirebaseMessaging/Sources/FIRMessagingCode.h"
 
 // The convenience macros are only defined if they haven't already been defined.
 #ifndef FIRMessagingLoggerInfo

FirebaseMessaging/Sources/FIRMessagingPubSub.h

@@ -18,7 +18,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@class FIRMessagingPubSubCache;
+@class FIRMessagingTokenManager;
 
 /**
  *  FIRMessagingPubSub provides a publish-subscribe model for sending FIRMessaging topic messages.
@@ -37,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface FIRMessagingPubSub : NSObject
 
-@property(nonatomic, readonly, strong) FIRMessagingPubSubCache *cache;
+- (instancetype)initWithTokenManager:(FIRMessagingTokenManager *)tokenManager;
 
 /**
  *  Subscribes an app instance to a topic, enabling it to receive messages