Skip to content

fix(fcm): Updated topic management error format #417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 27, 2020
Merged

fix(fcm): Updated topic management error format #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a0903a
fix(fcm): Updated topic management error format
hiranya911 Feb 26, 2020
52509ed
Better default error messages
hiranya911 Feb 27, 2020
c732512
Removed redundant variable initializer
hiranya911 Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions firebase_admin/messaging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,9 +453,12 @@ def _handle_iid_error(self, error):
except ValueError:
pass

# IID error response format: {"error": "some error message"}
msg = data.get('error')
if not msg:
# IID error response format: {"error": "ErrorCode"}
code = data.get('error')
msg = None
if code:
msg = 'Error while calling the IID service: {0}'.format(code)
else:
msg = 'Unexpected HTTP response with status: {0}; body: {1}'.format(
error.response.status_code, error.response.content.decode())

Expand Down
4 changes: 2 additions & 2 deletions tests/test_messaging.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2286,7 +2286,7 @@ def test_subscribe_to_topic_error(self, status, exc_type):
status=status, payload=self._DEFAULT_ERROR_RESPONSE)
with pytest.raises(exc_type) as excinfo:
messaging.subscribe_to_topic('foo', 'test-topic')
assert str(excinfo.value) == 'error_reason'
assert str(excinfo.value) == 'Error while calling the IID service: error_reason'
assert len(recorder) == 1
assert recorder[0].method == 'POST'
assert recorder[0].url == self._get_url('iid/v1:batchAdd')
Expand Down Expand Up @@ -2318,7 +2318,7 @@ def test_unsubscribe_from_topic_error(self, status, exc_type):
status=status, payload=self._DEFAULT_ERROR_RESPONSE)
with pytest.raises(exc_type) as excinfo:
messaging.unsubscribe_from_topic('foo', 'test-topic')
assert str(excinfo.value) == 'error_reason'
assert str(excinfo.value) == 'Error while calling the IID service: error_reason'
assert len(recorder) == 1
assert recorder[0].method == 'POST'
assert recorder[0].url == self._get_url('iid/v1:batchRemove')
Expand Down