Reading FCM error code from details section (firebase#146)

hiranya911 · web-flow · commit 9239585f16e7 · 2018-03-30T09:36:59.000-07:00
* Reading FCM error code from details section

* Early terminating the loop
diff --git a/firebase_admin/messaging.py b/firebase_admin/messaging.py
@@ -816,10 +816,17 @@ def _handle_fcm_error(self, error):
         except ValueError:
             pass
 
-        error_details = data.get('error', {})
-        code = _MessagingService.FCM_ERROR_CODES.get(
-            error_details.get('status'), _MessagingService.UNKNOWN_ERROR)
-        msg = error_details.get('message')
+        error_dict = data.get('error', {})
+        server_code = None
+        for detail in error_dict.get('details', []):
+            if detail.get('@type') == 'type.googleapis.com/google.firebase.fcm.v1.FcmErrorCode':
+                server_code = detail.get('errorCode')
+                break
+        if not server_code:
+            server_code = error_dict.get('status')
+        code = _MessagingService.FCM_ERROR_CODES.get(server_code, _MessagingService.UNKNOWN_ERROR)
+
+        msg = error_dict.get('message')
         if not msg:
             msg = 'Unexpected HTTP response with status: {0}; body: {1}'.format(
                 error.response.status_code, error.response.content.decode())
diff --git a/tests/test_messaging.py b/tests/test_messaging.py
@@ -914,6 +914,32 @@ def test_send_canonical_error_code(self, status):
         body = {'message': messaging._MessagingService.JSON_ENCODER.default(msg)}
         assert json.loads(recorder[0].body.decode()) == body
 
+    @pytest.mark.parametrize('status', HTTP_ERRORS)
+    def test_send_fcm_error_code(self, status):
+        payload = json.dumps({
+            'error': {
+                'status': 'INVALID_ARGUMENT',
+                'message': 'test error',
+                'details': [
+                    {
+                        '@type': 'type.googleapis.com/google.firebase.fcm.v1.FcmErrorCode',
+                        'errorCode': 'UNREGISTERED',
+                    },
+                ],
+            }
+        })
+        _, recorder = self._instrument_messaging_service(status=status, payload=payload)
+        msg = messaging.Message(topic='foo')
+        with pytest.raises(messaging.ApiCallError) as excinfo:
+            messaging.send(msg)
+        assert str(excinfo.value) == 'test error'
+        assert str(excinfo.value.code) == 'registration-token-not-registered'
+        assert len(recorder) == 1
+        assert recorder[0].method == 'POST'
+        assert recorder[0].url == self._get_url('explicit-project-id')
+        body = {'message': messaging._MessagingService.JSON_ENCODER.default(msg)}
+        assert json.loads(recorder[0].body.decode()) == body
+
 
 class TestTopicManagement(object):
 
