Add GMPID header to the RTDB SDK (#5761)

Author: schmidt-sebastian

Example/Database/Tests/Helpers/FIRFakeApp.m

@@ -22,6 +22,7 @@
 
 @interface FIRFakeOptions : NSObject
 @property(nonatomic, readonly, copy) NSString *databaseURL;
+@property(nonatomic, readonly, copy) NSString *googleAppID;
 - (instancetype)initWithURL:(NSString *)url;
 @end
 
@@ -30,6 +31,7 @@ - (instancetype)initWithURL:(NSString *)url {
   self = [super init];
   if (self) {
     _databaseURL = url;
+    _googleAppID = @"fake-app-id";
   }
   return self;
 }

Example/Database/Tests/Helpers/FTestHelpers.m

@@ -58,6 +58,7 @@ + (FIRDatabaseConfig *)configForName:(NSString *)name {
   id<FIRAuthInterop> auth = [[FIRAuthInteropFake alloc] initWithToken:nil userID:nil error:nil];
   id<FAuthTokenProvider> authTokenProvider = [FAuthTokenProvider authTokenProviderWithAuth:auth];
   return [[FIRDatabaseConfig alloc] initWithSessionIdentifier:name
+                                                  googleAppID:@"fake-app-id"
                                             authTokenProvider:authTokenProvider];
 }
 

Example/Database/Tests/Integration/FConnectionTest.m

@@ -59,6 +59,7 @@ - (void)XXXtestObtainSessionId {
   FRepoInfo *info = [[FRepoInfo alloc] initWithHost:host isSecure:YES withNamespace:@"default"];
   FConnection *conn = [[FConnection alloc] initWith:info
                                    andDispatchQueue:[FIRDatabaseQuery sharedQueue]
+                                        googleAppID:@"fake-app-id"
                                       lastSessionID:nil];
   FTestConnectionDelegate *delegate = [[FTestConnectionDelegate alloc] init];
 

Firebase/Database/Api/FIRDatabaseComponent.m

@@ -157,6 +157,7 @@ - (FIRDatabase *)databaseForApp:(FIRApp *)app URL:(NSString *)url {
 
             FIRDatabaseConfig *config = [[FIRDatabaseConfig alloc]
                 initWithSessionIdentifier:sessionIdentifier
+                              googleAppID:app.options.googleAppID
                         authTokenProvider:authTokenProvider];
             database = [[FIRDatabase alloc] initWithApp:app
                                                repoInfo:parsedUrl.repoInfo

Firebase/Database/Api/FIRDatabaseConfig.h

@@ -26,6 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface FIRDatabaseConfig : NSObject
 
 - (id)initWithSessionIdentifier:(NSString *)identifier
+                    googleAppID:(NSString *)googleAppID
               authTokenProvider:(id<FAuthTokenProvider>)authTokenProvider;
 
 /**

Firebase/Database/Api/FIRDatabaseConfig.m

@@ -23,6 +23,7 @@
 @interface FIRDatabaseConfig (Private)
 
 @property(nonatomic, strong, readwrite) NSString *sessionIdentifier;
+@property(nonatomic, strong, readwrite) NSString *googleAppID;
 
 @end
 
@@ -35,11 +36,13 @@ - (id)init {
 }
 
 - (id)initWithSessionIdentifier:(NSString *)identifier
+                    googleAppID:(NSString *)googleAppID
               authTokenProvider:(id<FAuthTokenProvider>)authTokenProvider {
     self = [super init];
     if (self != nil) {
         self->_sessionIdentifier = identifier;
         self->_callbackQueue = dispatch_get_main_queue();
+        self->_googleAppID = googleAppID;
         self->_persistenceCacheSizeBytes =
             10 * 1024 * 1024; // Default cache size is 10MB
         self->_authTokenProvider = authTokenProvider;

Firebase/Database/CHANGELOG.md

@@ -1,6 +1,8 @@
 # v6.2.2
 - [fixed] Addressed crash that prevented the SDK from opening when the versioning file was
   corrupted. (#5686)
+- [changed] Added internal HTTP header to the WebChannel connection.
+
 
 # v6.2.1
 - [fixed] Fixed documentation typos. (#5406, #5418)

Firebase/Database/Core/FPersistentConnection.m

@@ -511,6 +511,7 @@ - (void)openNetworkConnectionWithToken:(NSString *)token {
     self->connectionState = ConnectionStateConnecting;
     self.realtime = [[FConnection alloc] initWith:self.repoInfo
                                  andDispatchQueue:self.dispatchQueue
+                                      googleAppID:self.config.googleAppID
                                     lastSessionID:self.lastSessionID];
     self.realtime.delegate = self;
     [self.realtime open];

Firebase/Database/FIRDatabaseConfig_Private.h

@@ -23,6 +23,7 @@
 
 @property(nonatomic, readonly) BOOL isFrozen;
 @property(nonatomic, strong, readonly) NSString *sessionIdentifier;
+@property(nonatomic, strong, readonly) NSString *googleAppID;
 @property(nonatomic, strong) id<FAuthTokenProvider> authTokenProvider;
 @property(nonatomic, strong) id<FStorageEngine> forceStorageEngine;
 

Firebase/Database/Realtime/FConnection.h

@@ -26,6 +26,7 @@
 
 - (id)initWith:(FRepoInfo *)aRepoInfo
     andDispatchQueue:(dispatch_queue_t)queue
+         googleAppID:(NSString *)googleAppID
        lastSessionID:(NSString *)lastSessionID;
 
 - (void)open;