Skip to content

Add FID into real-time RC requests #11485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 29, 2023
Merged

Add FID into real-time RC requests #11485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ed07769
Set FID in realtime request
qdpham13 Jun 26, 2023
56004ca
Merge branch 'master'
qdpham13 Jun 28, 2023
dc5aede
Update request method naming
qdpham13 Jun 28, 2023
4be5938
Update test
qdpham13 Jun 29, 2023
23e42d9
Fix tests
qdpham13 Jun 29, 2023
e75446c
Fix test
qdpham13 Jun 29, 2023
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
14 changes: 7 additions & 7 deletions FirebaseRemoteConfig/Sources/RCNConfigRealtime.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ - (void)refreshInstallationsTokenWithCompletionHandler:
[installations authTokenWithCompletion:installationsTokenHandler];
}

- (void)setRequestBody {
- (NSData *)createRequestBody {
[self refreshInstallationsTokenWithCompletionHandler:^(FIRRemoteConfigFetchStatus status,
NSError *_Nullable error) {
if (status != FIRRemoteConfigFetchStatusSuccess) {
Expand All @@ -315,14 +315,13 @@ - (void)setRequestBody {
NSString *namespace = [_namespace substringToIndex:[_namespace rangeOfString:@":"].location];
NSString *postBody = [NSString
stringWithFormat:@"{project:'%@', namespace:'%@', lastKnownVersionNumber:'%@', appId:'%@', "
@"sdkVersion:'%@'}",
@"sdkVersion:'%@', appInstanceId:'%@'}",
[self->_options GCMSenderID], namespace, _configFetch.templateVersionNumber,
_options.googleAppID, FIRRemoteConfigPodVersion()];
_options.googleAppID, FIRRemoteConfigPodVersion(),
_settings.configInstallationsIdentifier];
NSData *postData = [postBody dataUsingEncoding:NSUTF8StringEncoding];
NSError *compressionError;
NSData *compressedContent = [NSData gul_dataByGzippingData:postData error:&compressionError];

[_request setHTTPBody:compressedContent];
return [NSData gul_dataByGzippingData:postData error:&compressionError];
}

/// Creates request.
Expand Down Expand Up @@ -665,7 +664,8 @@ - (void)beginRealtimeStream {

if (canMakeConnection) {
strongSelf->_isRequestInProgress = true;
[strongSelf setRequestBody];
NSData *compressedContent = [strongSelf createRequestBody];
[strongSelf->_request setHTTPBody:compressedContent];
strongSelf->_dataTask = [strongSelf->_session dataTaskWithRequest:strongSelf->_request];
[strongSelf->_dataTask resume];
}
Expand Down
17 changes: 17 additions & 0 deletions FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ - (void)scheduleFetch:(NSInteger)remainingAttempts targetVersion:(NSInteger)targ
- (void)autoFetch:(NSInteger)remainingAttempts targetVersion:(NSInteger)targetVersion;
- (void)beginRealtimeStream;
- (void)pauseRealtimeStream;
- (NSData *)createRequestBody;

- (FIRConfigUpdateListenerRegistration *_Nonnull)addConfigUpdateListener:
(RCNConfigUpdateCompletion _Nonnull)listener;
Expand Down Expand Up @@ -243,6 +244,7 @@ - (void)setUp {
settings:_settings
namespace:_fullyQualifiedNamespace
options:currentOptions]);
_settings.configInstallationsIdentifier = @"iid";

OCMStubRecorder *mock = OCMStub([_configFetch[i] fetchConfigWithExpirationDuration:0
completionHandler:OCMOCK_ANY]);
Expand Down Expand Up @@ -1765,6 +1767,21 @@ - (void)testRealtimeDisabled {
}
}

- (void)testRealtimeStreamRequestBody {
NSError *error;
NSData *requestBody = [_configRealtime[0] createRequestBody];
NSData *uncompressedRequest = [NSData gul_dataByInflatingGzippedData:requestBody error:&error];
NSString *strData = [[NSString alloc] initWithData:uncompressedRequest
encoding:NSUTF8StringEncoding];

XCTAssertTrue([strData containsString:@"project:'correct_gcm_sender_id'"]);
XCTAssertTrue([strData containsString:@"namespace:'firebase'"]);
XCTAssertTrue([strData containsString:@"lastKnownVersionNumber:'0'"]);
XCTAssertTrue([strData containsString:@"appId:'1:123:ios:123abc'"]);
XCTAssertTrue([strData containsString:@"sdkVersion:"]);
XCTAssertTrue([strData containsString:@"appInstanceId:'iid'"]);
}

#pragma mark - Test Helpers

- (FIROptions *)firstAppOptions {
Expand Down