Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Example/InstanceID/Tests/FIRInstanceIDTokenOperationsTest.m
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#import "Firebase/InstanceID/NSError+FIRInstanceID.h"

#import <FirebaseCore/FIRAppInternal.h>
#import <GoogleUtilities/GULHeartbeatDateStorage.h>

static NSString *kDeviceID = @"fakeDeviceID";
static NSString *kSecretToken = @"fakeSecretToken";
Expand Down Expand Up @@ -83,6 +84,11 @@ - (void)setUp {
_keyPair =
[[FIRInstanceIDKeychain sharedInstance] generateKeyPairWithPrivateTag:kPrivateKeyPairTag
publicTag:kPublicKeyPairTag];

NSString *const kHeartbeatStorageFile = @"HEARTBEAT_INFO_STORAGE";
GULHeartbeatDateStorage *dataStorage =
[[GULHeartbeatDateStorage alloc] initWithFileName:kHeartbeatStorageFile];
[[NSFileManager defaultManager] removeItemAtURL:[dataStorage fileURL] error:nil];
}

- (void)tearDown {
Expand Down Expand Up @@ -319,7 +325,7 @@ - (void)testHTTPAuthHeaderGenerationFromCheckin {
XCTAssertEqualObjects(generatedHeader, expectedHeader);
}

- (void)testTokenFetchOperationFirebaseUserAgentHeader {
- (void)testTokenFetchOperationFirebaseUserAgentAndHeartbeatHeader {
XCTestExpectation *completionExpectation =
[self expectationWithDescription:@"completionExpectation"];

Expand All @@ -336,6 +342,8 @@ - (void)testTokenFetchOperationFirebaseUserAgentHeader {
^(NSURLRequest *request, FIRInstanceIDURLRequestTestResponseBlock response) {
NSString *userAgentValue = request.allHTTPHeaderFields[kFIRInstanceIDFirebaseUserAgentKey];
XCTAssertEqualObjects(userAgentValue, [FIRApp firebaseUserAgent]);
NSString *heartBeatCode = request.allHTTPHeaderFields[kFIRInstanceIDFirebaseHeartbeatKey];
XCTAssertEqualObjects(heartBeatCode, @"3");

// Return a response with Error=RST
NSData *responseBody = [self dataForFetchRequest:request returnValidToken:NO];
Expand Down
2 changes: 2 additions & 0 deletions Firebase/InstanceID/FIRInstanceIDTokenFetchOperation.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ NS_ASSUME_NONNULL_BEGIN

FOUNDATION_EXPORT NSString *const kFIRInstanceIDFirebaseUserAgentKey;

FOUNDATION_EXPORT NSString *const kFIRInstanceIDFirebaseHeartbeatKey;

@interface FIRInstanceIDTokenFetchOperation : FIRInstanceIDTokenOperation

- (instancetype)initWithAuthorizedEntity:(NSString *)authorizedEntity
Expand Down
5 changes: 5 additions & 0 deletions Firebase/InstanceID/FIRInstanceIDTokenFetchOperation.m
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@
#import "NSError+FIRInstanceID.h"

#import <FirebaseCore/FIRAppInternal.h>
#import <FirebaseCore/FIRHeartbeatInfo.h>

// We can have a static int since this error should theoretically only
// happen once (for the first time). If it repeats there is something
// else that is wrong.
static int phoneRegistrationErrorRetryCount = 0;
static const int kMaxPhoneRegistrationErrorRetryCount = 10;
NSString *const kFIRInstanceIDFirebaseUserAgentKey = @"X-firebase-client";
NSString *const kFIRInstanceIDFirebaseHeartbeatKey = @"X-firebase-client-log-type";
NSString *const kFIRInstanceIDHeartbeatTag = @"fire-iid";

@implementation FIRInstanceIDTokenFetchOperation

Expand Down Expand Up @@ -60,6 +63,8 @@ - (void)performTokenOperation {
[request setValue:checkinVersionInfo forHTTPHeaderField:@"info"];
[request setValue:[FIRApp firebaseUserAgent]
forHTTPHeaderField:kFIRInstanceIDFirebaseUserAgentKey];
[request setValue:@([FIRHeartbeatInfo heartbeatCodeForTag:kFIRInstanceIDHeartbeatTag]).stringValue
forHTTPHeaderField:kFIRInstanceIDFirebaseHeartbeatKey];

// Build form-encoded body
NSString *deviceAuthID = self.checkinPreferences.deviceID;
Expand Down