Skip to content

Commit 8c10bd5

Browse files
authored
Reenable platform logging (#7948)
1 parent c197bbd commit 8c10bd5

File tree

3 files changed

+9
-24
lines changed

3 files changed

+9
-24
lines changed

FirebaseAppCheck/Sources/Core/APIService/FIRAppCheckAPIService.m

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,11 @@ - (instancetype)initWithURLSession:(NSURLSession *)session
111111

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

114-
NSString *versionHeader =
115-
[NSString stringWithFormat:@"fire-app-check/%@", FIRFirebaseVersion()];
116-
[request setValue:versionHeader forHTTPHeaderField:kUserAgentKey];
117-
// TODO: Uncomment to re-enable platform logging once approved.
118-
// User agent header.
119-
// [request setValue:[FIRApp firebaseUserAgent]
120-
// forHTTPHeaderField:kUserAgentKey];
121-
// // Heartbeat header.
122-
// [request setValue:@([FIRHeartbeatInfo
123-
// heartbeatCodeForTag:kHeartbeatStorageTag])
124-
// .stringValue
125-
// forHTTPHeaderField:kHeartbeatKey];
114+
[request setValue:[FIRApp firebaseUserAgent] forHTTPHeaderField:kUserAgentKey];
115+
116+
[request setValue:@([FIRHeartbeatInfo heartbeatCodeForTag:kHeartbeatStorageTag])
117+
.stringValue
118+
forHTTPHeaderField:kHeartbeatKey];
126119

127120
[additionalHeaders
128121
enumerateKeysAndObjectsUsingBlock:^(NSString *_Nonnull key, NSString *_Nonnull obj,

FirebaseAppCheck/Sources/Core/FIRAppCheck.m

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,7 @@ @implementation FIRAppCheck
7777
#pragma mark - FIRComponents
7878

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

8683
+ (NSArray<FIRComponent *> *)componentsToRegister {

FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckAPIServiceTests.m

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,9 @@ - (void)testDataRequestSuccess {
8989
FIRRequestValidationBlock requestValidation = ^BOOL(NSURLRequest *request) {
9090
XCTAssertEqualObjects(request.URL, URL);
9191

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

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

0 commit comments

Comments
 (0)