Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions tests/time_tracker_api/users/users_namespace_test.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,33 @@
from unittest.mock import Mock, patch
from flask import json
from faker import Faker
from flask.testing import FlaskClient
from flask_restplus._http import HTTPStatus
from pytest import mark


@patch('utils.azure_users.AzureConnection.get_msal_client', Mock())
@patch('utils.azure_users.AzureConnection.get_token', Mock())
@patch('utils.azure_users.AzureConnection.get_user')
def test_get_user_response_contains_expected_props(
get_user_mock, client: FlaskClient, valid_header: dict,
):
get_user_mock.return_value = {
'name': 'dummy',
'email': 'dummy',
'roles': ['dummy-role'],
}
user_id = (Faker().uuid4(),)
response = client.get(f'/users/{user_id}', headers=valid_header)

get_user_mock.assert_called()
assert HTTPStatus.OK == response.status_code
assert 'name' in json.loads(response.data)
assert 'email' in json.loads(response.data)
assert 'roles' in json.loads(response.data)
assert ['dummy-role'] == json.loads(response.data)['roles']


@patch('utils.azure_users.AzureConnection.get_msal_client', Mock())
@patch('utils.azure_users.AzureConnection.get_token', Mock())
@patch(
Expand Down
10 changes: 10 additions & 0 deletions time_tracker_api/users/users_namespace.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@
user_response_fields.update(common_fields)


@ns.route('/<string:id>')
@ns.param('id', 'The unique identifier of the user')
class User(Resource):
@ns.doc('get_user')
@ns.marshal_list_with(user_response_fields)
def get(self, id):
"""Get an user"""
return AzureConnection().get_user(id)


@ns.route('')
class Users(Resource):
@ns.doc('list_users')
Expand Down
8 changes: 8 additions & 0 deletions utils/azure_users.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ def get_token(self):
error_info = f"{response['error']} {response['error_description']}"
raise ValueError(error_info)

def get_user(self, user_id) -> AzureUser:
endpoint = "{endpoint}/users/{user_id}?api-version=1.6".format(
endpoint=self.config.ENDPOINT, user_id=user_id
)
response = requests.get(endpoint, auth=BearerAuth(self.access_token))
assert 200 == response.status_code
return self.to_azure_user(response.json())

def users(self) -> List[AzureUser]:
role_fields_params = ','.join(
[field_name for field_name, _ in ROLE_FIELD_VALUES.values()]
Expand Down