[AFX-5268] Use auth/user-info to get user account information #12

RELEASE.md

@@ -2,6 +2,10 @@
 
 All major changes in each released version of the archfx-cloud plugin are listed here.
 
+## 0.15.0
+
+- Use the endpoint `/auth/user-info/` to get account information in the `BaseMain` class.
+
 ## 0.14.0
 
 - Add optional parameter to BaseMain constructor to give the config file path (.ini)

archfx_cloud/utils/main.py

@@ -128,8 +128,8 @@ def login(self) -> bool:
 
         if self.api.token:
             try:
-                user = self.api.account.get()
-                LOG.info('Using token for {}'.format(user['results'][0]['email']))
+                user = getattr(self.api.auth, 'user-info').get()
+                LOG.info('Using token for {}'.format(user['email']))
                 return True
             except HttpClientError as err:
                 LOG.debug(err)

tests/test_main.py

@@ -56,8 +56,8 @@ def test_main_login_email_password_ok(
     @mock.patch('archfx_cloud.utils.main.argparse.ArgumentParser.parse_args')
     def test_main_login_token_file_ok(self, mock_request, mock_parse_args):
         mock_request.get(
-            'https://test.archfx.io/api/v1/account/',
-            text=json.dumps({'results': [{'email': '[email protected]'}]}),
+            'https://test.archfx.io/api/v1/auth/user-info/',
+            text=json.dumps({'email': '[email protected]'}),
         )
         mock_request.post(
             'https://test.archfx.io/api/v1/auth/logout/', status_code=204
@@ -75,7 +75,7 @@ def test_main_login_token_file_ok(self, mock_request, mock_parse_args):
         self.assertEqual(len(mock_request.request_history), 2)
         self.assertEqual(
             mock_request.request_history[0].url,
-            'https://test.archfx.io/api/v1/account/',
+            'https://test.archfx.io/api/v1/auth/user-info/',
         )
         self.assertEqual(
             mock_request.request_history[0].headers['Authorization'],

version.py

@@ -1 +1 @@
-version = '0.14.0'
+version = '0.15.0'