Move batch message decoding in to _messaging_utils class BatchMessageResponseDecoder

Author: ZachOrr

firebase_admin/_messaging_utils.py

@@ -776,10 +776,10 @@ def default(self, obj): # pylint: disable=method-hidden
 
 
 class BatchMessageEncoder(object):
-    """A custom encoder for serializing JSON for Messages into batch request data."""
+    """A custom encoder for converting JSON for Messages into batch request data."""
 
     @classmethod
-    def encode(cls, url, headers, boundary, message_data): # pylint: disable=method-hidden
+    def encode(cls, url, headers, boundary, message_data):
         parts = [cls._batch_request_part(url, headers, boundary, md, index) for (index, md) in enumerate(message_data)]
         return '{}--{}--\r\n'.format(''.join(parts), boundary)
 
@@ -805,3 +805,20 @@ def _batch_request_part_data(cls, url, headers, message_data):
         data += '\r\n\r\n'
         data += body
         return data
+
+class BatchMessageResponseDecoder(object):
+    """A custom decoder for decoding batch message responses into JSON."""
+
+    @classmethod
+    def decode(cls, response):
+        # Split our batches responses in to groups
+        response_regex = re.compile('--batch.*?$\n(.*?)(?=--batch)', re.DOTALL | re.MULTILINE)
+        responses = response_regex.findall(response.content)
+
+        # First section is headers related to the batch request
+        # Second section is headers related to the batched request
+        # Third section is data related to the batched request
+        response_sections = [r.split('\r\n\r\n') for r in responses]
+        response_json = [json.loads(r[2]) for r in response_sections]
+
+        return response_json

firebase_admin/messaging.py

@@ -14,7 +14,6 @@
 
 """Firebase Cloud Messaging module."""
 
-import json
 import requests
 import six
 
@@ -253,6 +252,7 @@ class _MessagingService(object):
     IID_HEADERS = {'access_token_auth': 'true'}
     JSON_ENCODER = _messaging_utils.MessageEncoder()
     BATCH_ENCODER = _messaging_utils.BatchMessageEncoder()
+    BATCH_DECODER = _messaging_utils.BatchMessageResponseDecoder()
 
     BATCH_PART_BOUNDARY = '__END_OF_PART__'
 
@@ -329,7 +329,7 @@ def sendAll(self, messages, dry_run=False):
             'Content-Type': 'multipart/mixed; boundary={}'.format(_MessagingService.BATCH_PART_BOUNDARY)
         }
         try:
-            response = self._client.request(
+            resp = self._client.request(
                 'post', url=_MessagingService.FCM_BATCH_URL, headers=headers, data=data, timeout=self._timeout
             )
         except requests.exceptions.RequestException as error:
@@ -339,18 +339,7 @@ def sendAll(self, messages, dry_run=False):
                 msg = 'Failed to call messaging API: {0}'.format(error)
                 raise ApiCallError(self.INTERNAL_ERROR, msg, error)
         else:
-            import re
-            # Split our batches responses in to groups
-            response_regex = re.compile('--batch.*?$\n(.*?)(?=--batch)', re.DOTALL | re.MULTILINE)
-            responses = response_regex.findall(response.content)
-
-            # First section is headers related to the batch request
-            # Second section is headers related to the batched request
-            # Third section is data related to the batched request
-            response_sections = [r.split('\r\n\r\n') for r in responses]
-            response_json = [json.loads(r[2]) for r in response_sections]
-
-            return response_json
+            return _MessagingService.BATCH_DECODER.decode(resp)
 
     def make_topic_management_request(self, tokens, topic, operation):
         """Invokes the IID service for topic management functionality."""