[#927] Log exception with recovery code

with @tayanefernandes

5 files changed, 18 insertions, 17 deletions

diff --git a/service/pixelated/account_recovery.py b/service/pixelated/account_recovery.py
index fa1bf4f9..c0a18792 100644
--- a/service/pixelated/account_recovery.py
+++ b/service/pixelated/account_recovery.py
@@ -41,8 +41,9 @@ class AccountRecovery(object):
             returnValue(response)
 
         except Exception as e:
-            log.warn('Something went wrong when trying to save the recovery code')
-            raise
+            log.error('Something went wrong when trying to save the recovery code')
+            log.error(e)
+            raise e
 
     @inlineCallbacks
     def _send_mail(self, code, backup_email):
@@ -59,5 +60,5 @@ class AccountRecovery(object):
                 msg.as_string())
             returnValue(send_mail_result)
         except Exception as e:
-            log.warn('Failed trying to send the email with the recovery code')
-            raise
+            log.error('Failed trying to send the email with the recovery code')
+            raise e
diff --git a/service/pixelated/resources/__init__.py b/service/pixelated/resources/__init__.py
index 3b2a7118..61e60720 100644
--- a/service/pixelated/resources/__init__.py
+++ b/service/pixelated/resources/__init__.py
@@ -122,9 +122,6 @@ class BaseResource(Resource):
     def soledad(self, request):
         return self._service(request, '_leap_session').soledad
 
-    def get_backup_email(self, request):
-        return json.loads(request.content.getvalue()).get('backupEmail')
-
 
 class UnAuthorizedResource(Resource):
 
diff --git a/service/pixelated/resources/backup_account_resource.py b/service/pixelated/resources/backup_account_resource.py
index 677e9e75..f51ac2ec 100644
--- a/service/pixelated/resources/backup_account_resource.py
+++ b/service/pixelated/resources/backup_account_resource.py
@@ -15,6 +15,8 @@
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import json
+
 from xml.sax import SAXParseException
 
 from pixelated.resources import BaseResource
@@ -53,7 +55,7 @@ class BackupAccountResource(BaseResource):
             self._authenticator.bonafide_session,
             self.soledad(request),
             self._service(request, '_leap_session').smtp_config,
-            self.get_backup_email(request))
+            self._get_backup_email(request))
 
         def update_response(response):
             request.setResponseCode(NO_CONTENT)
@@ -66,3 +68,6 @@ class BackupAccountResource(BaseResource):
         d = account_recovery.update_recovery_code()
         d.addCallbacks(update_response, error_response)
         return NOT_DONE_YET
+
+    def _get_backup_email(self, request):
+        return json.loads(request.content.getvalue()).get('backupEmail')
diff --git a/service/test/unit/resources/test_backup_account_resource.py b/service/test/unit/resources/test_backup_account_resource.py
index b8654203..e5e2793a 100644
--- a/service/test/unit/resources/test_backup_account_resource.py
+++ b/service/test/unit/resources/test_backup_account_resource.py
@@ -59,7 +59,7 @@ class TestBackupAccountResource(unittest.TestCase):
                 self.resource._authenticator.bonafide_session,
                 self.resource.soledad(request),
                 self.resource._service(request, '_leap_session').smtp_config,
-                self.resource.get_backup_email(request))
+                self.resource._get_backup_email(request))
             mock_account_recovery.update_recovery_code.assert_called()
 
         d.addCallback(assert_update_recovery_code_called)
@@ -94,3 +94,9 @@ class TestBackupAccountResource(unittest.TestCase):
 
         d.addCallback(assert_successful_response)
         return d
+
+    def test_get_backup_email_from_request(self):
+        request = MagicMock()
+        request.content.getvalue.return_value = '{"backupEmail": "test@test.com"}'
+
+        self.assertEqual(self.resource._get_backup_email(request), 'test@test.com')
diff --git a/service/test/unit/resources/test_base_resource.py b/service/test/unit/resources/test_base_resource.py
index d7110917..35ae67c7 100644
--- a/service/test/unit/resources/test_base_resource.py
+++ b/service/test/unit/resources/test_base_resource.py
@@ -25,11 +25,3 @@ class TestBaseResource(unittest.TestCase):
         base_resource = BaseResource(mock_services_factory)
 
         self.assertEqual(base_resource.soledad('request'), mock_services_factory.services()._leap_session.soledad)
-
-    def test_get_backup_email_from_request(self):
-        mock_services_factory = MagicMock()
-        request = MagicMock()
-        request.content.getvalue.return_value = '{"backupEmail": "test@test.com"}'
-        base_resource = BaseResource(mock_services_factory)
-
-        self.assertEqual(base_resource.get_backup_email(request), 'test@test.com')