Skip to content

Handling IID error codes correctly #381

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
hiranya911 merged 1 commit into from
Mar 11, 2020
Merged

Handling IID error codes correctly #381

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
2 changes: 1 addition & 1 deletion src/main/java/com/google/firebase/messaging/InstanceIdClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ private String getCustomMessage(FirebaseException base) {
String response = getResponse(base);
InstanceIdServiceErrorResponse parsed = safeParse(response);
if (!Strings.isNullOrEmpty(parsed.error)) {
return parsed.error;
return "Error while calling the IID service: " + parsed.error;
}

return base.getMessage();
Expand Down
12 changes: 8 additions & 4 deletions src/test/java/com/google/firebase/messaging/InstanceIdClientImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,16 @@ public void testSubscribeError() {
TestResponseInterceptor interceptor = new TestResponseInterceptor();
InstanceIdClient client = initInstanceIdClient(response, interceptor);

String content = "{\"error\": \"ErrorCode\"}";
for (int statusCode : HTTP_ERRORS) {
response.setStatusCode(statusCode).setContent("{\"error\": \"test error\"}");
response.setStatusCode(statusCode).setContent(content);

try {
client.subscribeToTopic("test-topic", ImmutableList.of("id1", "id2"));
fail("No error thrown for HTTP error");
} catch (FirebaseMessagingException error) {
checkExceptionFromHttpResponse(error, statusCode, "test error");
String expectedMessage = "Error while calling the IID service: ErrorCode";
checkExceptionFromHttpResponse(error, statusCode, expectedMessage);
}

checkTopicManagementRequestHeader(interceptor.getLastRequest(), TEST_IID_SUBSCRIBE_URL);
Expand Down Expand Up @@ -247,14 +249,16 @@ public void testUnsubscribeError() {
TestResponseInterceptor interceptor = new TestResponseInterceptor();
InstanceIdClient client = initInstanceIdClient(response, interceptor);

String content = "{\"error\": \"ErrorCode\"}";
for (int statusCode : HTTP_ERRORS) {
response.setStatusCode(statusCode).setContent("{\"error\": \"test error\"}");
response.setStatusCode(statusCode).setContent(content);

try {
client.unsubscribeFromTopic("test-topic", ImmutableList.of("id1", "id2"));
fail("No error thrown for HTTP error");
} catch (FirebaseMessagingException error) {
checkExceptionFromHttpResponse(error, statusCode, "test error");
String expectedMessage = "Error while calling the IID service: ErrorCode";
checkExceptionFromHttpResponse(error, statusCode, expectedMessage);
}

checkTopicManagementRequestHeader(interceptor.getLastRequest(), TEST_IID_UNSUBSCRIBE_URL);
Expand Down