Skip to content

FIS - make server error logs more readable #5654

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 2 commits into from
May 20, 2020
Merged

FIS - make server error logs more readable #5654

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f66c8c9
FIS - make server error logs more readable
maksymmalyhin May 20, 2020
c6ca256
Changelog
maksymmalyhin May 20, 2020
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
7 changes: 4 additions & 3 deletions FirebaseInstallations/Source/Library/Errors/FIRInstallationsHTTPError.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,10 @@ + (FIRInstallationsErrorCode)errorCodeWithHTTPCode:(NSInteger)HTTPCode {
+ (NSDictionary *)userInfoWithHTTPResponse:(NSHTTPURLResponse *)HTTPResponse
data:(nullable NSData *)data {
NSString *responseString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
NSString *failureReason = [NSString
stringWithFormat:@"The server responded with an error. HTTP response: %@\nResponse body: %@",
HTTPResponse, responseString];
NSString *failureReason =
[NSString stringWithFormat:@"The server responded with an error: \n - URL: %@ \n - HTTP "
@"status code: %ld \n - Response body: %@",
HTTPResponse.URL, (long)HTTPResponse.statusCode, responseString];
return @{NSLocalizedFailureReasonErrorKey : failureReason};
}

Expand Down
4 changes: 2 additions & 2 deletions ...baseInstallations/Source/Library/InstallationsIDController/FIRInstallationsIDController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,9 @@ - (FIRInstallationsItem *)createInstallationWithFID:(NSString *)FID
if ([self doesRegistrationErrorRequireConfigChange:error]) {
FIRLogError(kFIRLoggerInstallations,
kFIRInstallationsMessageCodeInvalidFirebaseConfiguration,
@"Firebase Installation registration failed for app with name: %@, error: "
@"Firebase Installation registration failed for app with name: %@, error:\n"
@"%@\nPlease make sure you use valid GoogleService-Info.plist",
self.appName, error);
self.appName, error.userInfo[NSLocalizedFailureReasonErrorKey]);
}
})
.then(^id(FIRInstallationsItem *registeredInstallation) {
Expand Down
2 changes: 0 additions & 2 deletions FirebaseInstallations/Source/Tests/Unit/FIRInstallationsHTTPErrorTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ - (void)testUserInfoContainsResponseData {
XCTAssertTrue([failureReason containsString:HTTPResponse.URL.absoluteString]);
XCTAssertTrue([failureReason containsString:@(HTTPResponse.statusCode).stringValue]);
XCTAssertTrue([failureReason containsString:@(HTTPResponse.statusCode).stringValue]);
XCTAssertTrue([failureReason containsString:@"header1"]);
XCTAssertTrue([failureReason containsString:@"value1"]);

// Validate response data content.
XCTAssertTrue([failureReason containsString:@"invalid request"]);
Expand Down