[MERGE] forward port branch 12.0 up to e11bacfe512

1 files changed, 6 insertions, 2 deletions

diff --git a/addons/google_account/models/google_service.py b/addons/google_account/models/google_service.py
index 1797dd66bea..5292a490515 100644
--- a/addons/google_account/models/google_service.py
+++ b/addons/google_account/models/google_service.py
@@ -2,6 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from datetime import datetime
+from pprint import pformat
 import json
 import logging
 
@@ -183,13 +184,16 @@ class GoogleService(models.TransientModel):
             except:
                 pass
         except requests.HTTPError as error:
+            # https://developers.google.com/calendar/v3/errors
             if error.response.status_code in (204, 404):
                 status = error.response.status_code
                 response = ""
             else:
-                _logger.exception("Bad google request : %s !", error.response.content)
+                req = json.loads(error.request.body)
+                res = error.response.json()
+                _logger.exception("Error while requesting Google Services\nRequest:\n%s\nResponse:\n%s", pformat(req), pformat(res))
                 if error.response.status_code in (400, 401, 410):
-                    raise error
+                    raise UserError(_("Error while requesting Google Services: %s" % res['error']['message']))
                 raise self.env['res.config.settings'].get_config_warning(_("Something went wrong with your request to google"))
         return (status, response, ask_time)