Merge pull request #198 from wasade/token_error_on_authrocket_callback

Token error on authrocket callback

microsetta_interface/implementation.py

@@ -516,7 +516,10 @@ def get_rootpath():
     return redirect(HOME_URL)
 
 
-def get_authrocket_callback(token, redirect_uri=None):
+def get_authrocket_callback(token=None, redirect_uri=None):
+    if token is None:
+        return redirect('/home')
+
     session[TOKEN_KEY_NAME] = token
     email, _ = _parse_jwt(token)
     session[LOGIN_INFO_KEY] = {
@@ -1480,7 +1483,7 @@ def post_address_verification(body):
     req_csv_columns = ["Address 1","Address 2","City","State","Postal Code",\
         "Country"]
 
-    csv_contents, upload_err = parse_request_csv(request, 'address_csv', 
+    csv_contents, upload_err = parse_request_csv(request, 'address_csv',
         req_csv_columns)
 
     ar = None

microsetta_interface/tests/test_implementation.py

@@ -1,4 +1,4 @@
-from unittest import TestCase
+from unittest import TestCase, main
 from unittest.mock import patch
 from microsetta_interface.server import app
 
@@ -29,11 +29,13 @@ def setUp(self):
 
         app.app.testing = True
         self.app = app.app.test_client()
+        self.app.__enter__()
 
     def tearDown(self):
         self.patch_for_get.stop()
         self.patch_for_render_template.stop()
         self.patch_for_session.stop()
+        self.app.__exit__(None, None, None)
 
 
 class TestImplementation(TestBase):
@@ -62,3 +64,18 @@ def __init__(self, status_code, text, json_val, headers=None):
         response = impl.get_source(account_id="1", source_id="2")
         self.assertEqual(302, response.status_code)
         self.assertEqual('/home', response.headers['Location'])
+
+    def test_authrocket_callback_noargs_error(self):
+        # We are observing exceptions on /authrocket_callback which occur with
+        # malformed requests. Currently, we are throwing a 500, but instead
+        # we should redirect
+        exp_status = 302
+        exp_location = '/home'
+
+        resp = self.app.get('/authrocket_callback')
+        self.assertEqual(exp_status, resp.status_code)
+        self.assertTrue(resp.headers['Location'].endswith(exp_location))
+
+
+if __name__ == '__main__':
+    main()