fix FcmErrorCode error type (firebase#222)

chemidy · hiranya911 · commit 356742a51a7e · 2018-11-15T10:35:57.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Unreleased
 
--
+- [fixed] Fixing error handling in FCM. The SDK now checks the key
+  type.googleapis.com/google.firebase.fcm.v1.FcmError to set error code.
 
 # v2.13.0
 
diff --git a/firebase_admin/messaging.py b/firebase_admin/messaging.py
@@ -943,7 +943,7 @@ def _handle_fcm_error(self, error):
         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':
+            if detail.get('@type') == 'type.googleapis.com/google.firebase.fcm.v1.FcmError':
                 server_code = detail.get('errorCode')
                 break
         if not server_code:
diff --git a/tests/test_messaging.py b/tests/test_messaging.py
@@ -1120,7 +1120,7 @@ def test_send_fcm_error_code(self, status):
                 'message': 'test error',
                 'details': [
                     {
-                        '@type': 'type.googleapis.com/google.firebase.fcm.v1.FcmErrorCode',
+                        '@type': 'type.googleapis.com/google.firebase.fcm.v1.FcmError',
                         'errorCode': 'UNREGISTERED',
                     },
                 ],

Original file line number	Diff line number	Diff line change
`@@ -1120,7 +1120,7 @@ def test_send_fcm_error_code(self, status):`
`1120`	`1120`	`'message': 'test error',`
`1121`	`1121`	`'details': [`
`1122`	`1122`	`{`
`1123`		`- '@type': 'type.googleapis.com/google.firebase.fcm.v1.FcmErrorCode',`
	`1123`	`+ '@type': 'type.googleapis.com/google.firebase.fcm.v1.FcmError',`
`1124`	`1124`	`'errorCode': 'UNREGISTERED',`
`1125`	`1125`	`},`
`1126`	`1126`	`],`