jakubro
diff --git a/‎firebase_admin/dynamic_links.py
Lines changed: 23 additions & 3 deletions b/‎firebase_admin/dynamic_links.py
Lines changed: 23 additions & 3 deletions
diff --git a/‎integration/test_dynamic_links.py
Lines changed: 2 additions & 3 deletions b/‎integration/test_dynamic_links.py
Lines changed: 2 additions & 3 deletions
diff --git a/‎tests/test_dynamic_links.py
Lines changed: 7 additions & 1 deletion b/‎tests/test_dynamic_links.py
Lines changed: 7 additions & 1 deletion
@@ -204,12 +204,32 @@ def get_stats(self, short_link, stat_options):
         request_string = self._format_request_string(short_link, stat_options)
         try:
             resp = self._client.body('get', request_string)
-            link_event_stats_dict = resp.get('linkEventStats', [])
         except requests.exceptions.RequestException as error:
+
+            self._handle_error(error)
+        else:
+            link_event_stats_dict = resp.get('linkEventStats', [])
+            event_stats = [EventStats.make_from_strings(**es) for es in link_event_stats_dict]
+            return LinkStats(event_stats)
+
+    def _handle_error(self, error):
+        if error.response is None:
             msg = 'Failed to call dynamic links API: {0}'.format(error)
             raise ApiCallError(self.INTERNAL_ERROR, msg, error)
-        event_stats = [EventStats.make_from_strings(**es) for es in link_event_stats_dict]
-        return LinkStats(event_stats)
+        data = {}
+        try:
+            parsed_body = error.response.json()
+            if isinstance(parsed_body, dict):
+                data = parsed_body
+        except ValueError:
+            pass
+        error_details = data.get('error', {})
+        code = error_details.get('code', 'undefined error code')
+        msg = error_details.get('message')
+        if not msg:
+            msg = 'Unexpected HTTP response with status: {0}; body: {1}'.format(
+                error.response.status_code, error.response.content.decode())
+        raise ApiCallError(code, msg, error)
 
 
 class ApiCallError(Exception):
 
@@ -15,7 +15,6 @@
 """Integration tests for firebase_admin.auth module."""
 import sys
 
-import requests
 import pytest
 
 from firebase_admin import dynamic_links
@@ -53,8 +52,8 @@ def test_get_stats_nonexistant_link(self):
 
 class TestServerErrors(object):
     def test_unauthorized(self):
-        with pytest.raises(requests.exceptions.HTTPError) as excinfo:
+        with pytest.raises(dynamic_links.ApiCallError) as excinfo:
             dynamic_links.get_link_stats(
                 'https://fake1.app.goo.gl/uQWc',
                 dynamic_links.StatOptions(duration_days=4000))
-        assert excinfo.value.response.status_code == 403
+        assert excinfo.value.code == 403
@@ -15,6 +15,7 @@
 
 """Test cases for the firebase_admin.dynamic_links module."""
 
+import json
 import pytest
 import requests
 
@@ -94,12 +95,17 @@ def test_get_stats(self, dynamic_links_test):
             assert returned.count == direct['count']
 
     def test_get_stats_error(self, dynamic_links_test):
-        dynamic_links_test._instrument_dynamic_links(payload=MOCK_GET_STATS_RESPONSE,
+        err_body = json.dumps({'error': {
+            'status': 'INTERNAL_ERROR',
+            'message': 'test_error',
+            'code': 500}})
+        dynamic_links_test._instrument_dynamic_links(payload=err_body,
                                                      status=500)
         options = dynamic_links.StatOptions(duration_days=9)
         with pytest.raises(dynamic_links.ApiCallError) as excinfo:
             dynamic_links.get_link_stats(MOCK_SHORT_URL, options, app=dynamic_links_test.app)
         assert excinfo.value.code == 500
+        assert excinfo.value.message == 'test_error'
 
     @pytest.mark.parametrize('invalid_url', ['google.com'] + INVALID_STRINGS)
     def test_get_stats_invalid_url(self, dynamic_links_test, invalid_url):