Handling FCM canonical error codes (firebase#148)

hiranya911 · web-flow · commit be0346072d3f · 2018-02-28T11:29:39.000-08:00
* Handling FCM canonical error codes

* Added PERMISSION_DENIED error code
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,10 @@
 # Unreleased
 
--
+- [fixed] Improved error handling in FCM by mapping more server-side
+  errors to client-side error codes.
 
 # v5.9.0
 
-
 ### Cloud Messaging
 
 - [feature] Added the `FirebaseCloudMessaging` API for sending
diff --git a/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java b/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
@@ -63,13 +63,20 @@ public class FirebaseMessaging {
   private static final String UNKNOWN_ERROR = "unknown-error";
   private static final Map<String, String> FCM_ERROR_CODES =
       ImmutableMap.<String, String>builder()
-        .put("APNS_AUTH_ERROR", "authentication-error")
+        // FCM v1 canonical error codes
+        .put("NOT_FOUND", "registration-token-not-registered")
+        .put("PERMISSION_DENIED", "mismatched-credential")
+        .put("RESOURCE_EXHAUSTED", "message-rate-exceeded")
+        .put("UNAUTHENTICATED", "invalid-apns-credentials")
+
+        // FCM v1 new error codes
+        .put("APNS_AUTH_ERROR", "invalid-apns-credentials")
         .put("INTERNAL", INTERNAL_ERROR)
         .put("INVALID_ARGUMENT", "invalid-argument")
-        .put("UNREGISTERED", "registration-token-not-registered")
         .put("QUOTA_EXCEEDED", "message-rate-exceeded")
-        .put("SENDER_ID_MISMATCH", "authentication-error")
+        .put("SENDER_ID_MISMATCH", "mismatched-credential")
         .put("UNAVAILABLE", "server-unavailable")
+        .put("UNREGISTERED", "registration-token-not-registered")
         .build();
   static final Map<Integer, String> IID_ERROR_CODES =
       ImmutableMap.<Integer, String>builder()
diff --git a/src/test/java/com/google/firebase/messaging/FirebaseMessagingTest.java b/src/test/java/com/google/firebase/messaging/FirebaseMessagingTest.java
@@ -195,6 +195,29 @@ public void testSendErrorWithDetails() throws Exception {
     }
   }
 
+  @Test
+  public void testSendErrorWithCanonicalCode() throws Exception {
+    MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
+    FirebaseMessaging messaging = initMessaging(response);
+    for (int code : HTTP_ERRORS) {
+      response.setStatusCode(code).setContent(
+          "{\"error\": {\"status\": \"NOT_FOUND\", \"message\": \"test error\"}}");
+      TestResponseInterceptor interceptor = new TestResponseInterceptor();
+      messaging.setInterceptor(interceptor);
+      try {
+        messaging.sendAsync(Message.builder().setTopic("test-topic").build()).get();
+        fail("No error thrown for HTTP error");
+      } catch (ExecutionException e) {
+        assertTrue(e.getCause() instanceof FirebaseMessagingException);
+        FirebaseMessagingException error = (FirebaseMessagingException) e.getCause();
+        assertEquals("registration-token-not-registered", error.getErrorCode());
+        assertEquals("test error", error.getMessage());
+        assertTrue(error.getCause() instanceof HttpResponseException);
+      }
+      checkRequestHeader(interceptor);
+    }
+  }
+
   @Test
   public void testInvalidSubscribe() {
     FirebaseMessaging messaging = initDefaultMessaging();
