Skip to content

Re-enable app check platform logging #7948

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 1 commit into from
Apr 23, 2021
Merged

Re-enable app check platform logging #7948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 5 additions & 12 deletions FirebaseAppCheck/Sources/Core/APIService/FIRAppCheckAPIService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,11 @@ - (instancetype)initWithURLSession:(NSURLSession *)session

[request setValue:self.APIKey forHTTPHeaderField:kAPIKeyHeaderKey];

NSString *versionHeader =
[NSString stringWithFormat:@"fire-app-check/%@", FIRFirebaseVersion()];
[request setValue:versionHeader forHTTPHeaderField:kUserAgentKey];
Comment on lines -114 to -116
Copy link
Member Author

@ncooke3 ncooke3 Apr 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Double checking, this version header is intended to be removed, correct?

Copy link
Contributor

@maksymmalyhin maksymmalyhin Apr 23, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it's correct.

// TODO: Uncomment to re-enable platform logging once approved.
// User agent header.
// [request setValue:[FIRApp firebaseUserAgent]
// forHTTPHeaderField:kUserAgentKey];
// // Heartbeat header.
// [request setValue:@([FIRHeartbeatInfo
// heartbeatCodeForTag:kHeartbeatStorageTag])
// .stringValue
// forHTTPHeaderField:kHeartbeatKey];
[request setValue:[FIRApp firebaseUserAgent] forHTTPHeaderField:kUserAgentKey];

[request setValue:@([FIRHeartbeatInfo heartbeatCodeForTag:kHeartbeatStorageTag])
.stringValue
forHTTPHeaderField:kHeartbeatKey];

[additionalHeaders
enumerateKeysAndObjectsUsingBlock:^(NSString *_Nonnull key, NSString *_Nonnull obj,
Expand Down
5 changes: 1 addition & 4 deletions FirebaseAppCheck/Sources/Core/FIRAppCheck.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,7 @@ @implementation FIRAppCheck
#pragma mark - FIRComponents

+ (void)load {
// TODO: Provide valid lib name and version once platform logging approved.
[FIRApp registerInternalLibrary:(Class<FIRLibrary>)self
withName:@"*" //@"fire-app-check"
withVersion:@"*"];
[FIRApp registerInternalLibrary:(Class<FIRLibrary>)self withName:@"fire-app-check"];
}

+ (NSArray<FIRComponent *> *)componentsToRegister {
Expand Down
11 changes: 3 additions & 8 deletions FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckAPIServiceTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,9 @@ - (void)testDataRequestSuccess {
FIRRequestValidationBlock requestValidation = ^BOOL(NSURLRequest *request) {
XCTAssertEqualObjects(request.URL, URL);

// TODO: Replace the assertions by the commented below once platform logging approved.
NSString *appCheckVersionHeader =
[NSString stringWithFormat:@"fire-app-check/%@", FIRFirebaseVersion()];
XCTAssertEqualObjects(request.allHTTPHeaderFields[@"x-firebase-client"], appCheckVersionHeader);
XCTAssertNil(request.allHTTPHeaderFields[@"X-firebase-client-log-type"]);
// XCTAssertEqualObjects(request.allHTTPHeaderFields[@"x-firebase-client"],
// [FIRApp firebaseUserAgent]);
// XCTAssertEqualObjects(request.allHTTPHeaderFields[@"X-firebase-client-log-type"], @"3");
XCTAssertEqualObjects(request.allHTTPHeaderFields[@"x-firebase-client"],
[FIRApp firebaseUserAgent]);
XCTAssertEqualObjects(request.allHTTPHeaderFields[@"X-firebase-client-log-type"], @"3");

XCTAssertEqualObjects(request.allHTTPHeaderFields[@"X-Goog-Api-Key"], self.APIKey);

Expand Down