Make login backwards-compatible.

iotile · Jul 16, 2021 · 828116c · 828116c
1 parent 49e9fdf
commit 828116c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/archfx_cloud/api/connection.py b/archfx_cloud/api/connection.py
@@ -15,7 +15,7 @@
 """
 import logging
 import requests
-from .exceptions import (
+from archfx_cloud.api.exceptions import (
     ImproperlyConfigured,
     HttpClientError,
     HttpCouldNotVerifyServerError,
@@ -258,9 +258,11 @@ def login(self, password, email):
 
         if r.status_code == 200:
             content = r.json()
-            if self.token_type in content:
-                if not self._validate_and_set_tokens(content[self.token_type]):
-                    logger.warning("Incompatible %s token received from server", self.token_type)
+            if access_token := content.get('jwt'):
+                if not self._validate_and_set_tokens(access_token):
+                    logger.warning(f"Incompatible JWT token received from server: {access_token}")
+                if refresh_token := content.get('jwt_refresh_token'):
+                    self.refresh_token_data = refresh_token
 
             self.username = content['username']
             logger.debug('Welcome @{0}'.format(self.username))

diff --git a/tests/test_api.py b/tests/test_api.py
@@ -84,16 +84,14 @@ def test_token_refresh(self, m):
         self.assertEqual(api.token, 'new-token')
 
     @requests_mock.Mocker()
-    def test_new_jwt_login(self, m):
+    def test_login_new_jwt(self, m):
         m.post(
             'http://archfx.test/api/v1/auth/login/',
             additional_matcher=lambda request: 'Authorization' not in request.headers,
             json={
                 'username': 'user1',
-                'jwt': {
-                    'access': 'access-token',
-                    'refresh': 'refresh-token',
-                },
+                'jwt': 'access-token',
+                'jwt_refresh_token': 'refresh-token',
             }
         )
         api = Api(domain='http://archfx.test')
@@ -110,10 +108,8 @@ def test_new_jwt_refresh(self, m):
             additional_matcher=lambda request: 'Authorization' not in request.headers,
             json={
                 'username': 'user1',
-                'jwt': {
-                    'access': 'access-token',
-                    'refresh': 'refresh-token',
-                },
+                'jwt': 'access-token',
+                'jwt_refresh_token': 'refresh-token',
             }
         )
         api = Api(domain='http://archfx.test')