fix: TT-131 replace users by users_v2 method

tests/time_tracker_api/users/users_namespace_test.py

@@ -11,16 +11,16 @@
 @patch(
     'utils.azure_users.AzureConnection.is_test_user', Mock(return_value=True)
 )
-@patch('utils.azure_users.AzureConnection.users_v2')
+@patch('utils.azure_users.AzureConnection.users')
 def test_users_response_contains_expected_props(
-    users_v2_mock, client: FlaskClient, valid_header: dict,
+    users_mock, client: FlaskClient, valid_header: dict,
 ):
-    users_v2_mock.return_value = [
+    users_mock.return_value = [
         {'name': 'dummy', 'email': 'dummy', 'roles': ['dummy-role']}
     ]
     response = client.get('/users', headers=valid_header)
 
-    users_v2_mock.assert_called()
+    users_mock.assert_called()
     assert HTTPStatus.OK == response.status_code
     assert 'name' in json.loads(response.data)[0]
     assert 'email' in json.loads(response.data)[0]

tests/utils/azure_users_test.py

@@ -45,13 +45,13 @@ def test_azure_connection_get_test_user_ids(get_mock):
 @patch('msal.ConfidentialClientApplication', Mock())
 @patch('utils.azure_users.AzureConnection.get_token', Mock())
 @patch('utils.azure_users.AzureConnection.get_test_user_ids')
-@patch('utils.azure_users.AzureConnection.users_v2')
+@patch('utils.azure_users.AzureConnection.users')
 def test_azure_connection_get_non_test_users(
-    users_v2_mock, get_test_user_ids_mock
+    users_mock, get_test_user_ids_mock
 ):
     test_user = AzureUser_v2('ID1', None, None, [])
     non_test_user = AzureUser_v2('ID2', None, None, [])
-    users_v2_mock.return_value = [test_user, non_test_user]
+    users_mock.return_value = [test_user, non_test_user]
     get_test_user_ids_mock.return_value = ['ID1']
     non_test_users = [non_test_user]
     az_conn = AzureConnection()

time_tracker_api/users/users_namespace.py

@@ -71,7 +71,7 @@ def get(self):
             current_user_id()
         )
         return (
-            azure_connection.users_v2()
+            azure_connection.users()
             if is_current_user_a_tester
             else azure_connection.get_non_test_users()
         )

utils/azure_users.py

@@ -93,16 +93,6 @@ def get_token(self):
             raise ValueError(error_info)
 
     def users(self) -> List[AzureUser]:
-        endpoint = "{endpoint}/users?api-version=1.6&$select=displayName,otherMails,objectId,{role_field}".format(
-            endpoint=self.config.ENDPOINT, role_field=self.role_field,
-        )
-        response = requests.get(endpoint, auth=BearerAuth(self.access_token))
-
-        assert 200 == response.status_code
-        assert 'value' in response.json()
-        return [self.to_azure_user(item) for item in response.json()['value']]
-
-    def users_v2(self) -> List[AzureUser]:
         role_fields_params = ','.join(
             [field_name for field_name, _ in ROLE_FIELD_VALUES.values()]
         )
@@ -162,9 +152,7 @@ def update_role(self, user_id, role_id, is_grant):
 
     def get_non_test_users(self) -> List[AzureUser]:
         test_user_ids = self.get_test_user_ids()
-        return [
-            user for user in self.users_v2() if user.id not in test_user_ids
-        ]
+        return [user for user in self.users() if user.id not in test_user_ids]
 
     def get_role_data(self, role_id, is_grant=True):
         assert role_id in ROLE_FIELD_VALUES.keys()