Skip to content

fix: 🗑️ TT-131 remove feature toggle for user role field #255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 27, 2021
Merged

fix: 🗑️ TT-131 remove feature toggle for user role field #255

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
233802b
fix: TT-131 remove feature toggle from users endpoint
Angeluz-07 Jan 26, 2021
ee40e3c
fix: TT-131 remove old endpoints for grant admin role
Angeluz-07 Jan 26, 2021
e683c86
fix: TT-131 replace users by users_v2 method
Angeluz-07 Jan 26, 2021
e8a1df4
fix: TT-131 replace to_azure_user_v2 method
Angeluz-07 Jan 26, 2021
2fea9be
fix: TT-131 remove role field
Angeluz-07 Jan 26, 2021
9063e0b
fix: TT-131 extract MSAL client to method
Angeluz-07 Jan 26, 2021
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
Prev Previous commit
fix: TT-131 extract MSAL client to method
  • Loading branch information
@Angeluz-07
Angeluz-07 committed Jan 26, 2021
commit 9063e0bc08dfdb3de93d2cbdbaf6bf1b1ae5739a
6 changes: 5 additions & 1 deletion tests/time_tracker_api/users/users_namespace_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from pytest import mark


@patch('msal.ConfidentialClientApplication', Mock())
@patch('utils.azure_users.AzureConnection.get_msal_client', Mock())
@patch('utils.azure_users.AzureConnection.get_token', Mock())
@patch(
'utils.azure_users.AzureConnection.is_test_user', Mock(return_value=True)
Expand All @@ -27,6 +27,8 @@ def test_users_response_contains_expected_props(
assert ['dummy-role'] == json.loads(response.data)[0]['roles']


@patch('utils.azure_users.AzureConnection.get_msal_client', Mock())
@patch('utils.azure_users.AzureConnection.get_token', Mock())
@patch('utils.azure_users.AzureConnection.update_role')
@mark.parametrize(
'role_id,action', [('test', 'grant'), ('admin', 'revoke')],
Expand All @@ -53,6 +55,8 @@ def test_update_role_response_contains_expected_props(
assert 'roles' in json.loads(response.data)


@patch('utils.azure_users.AzureConnection.get_msal_client', Mock())
@patch('utils.azure_users.AzureConnection.get_token', Mock())
@patch('utils.azure_users.AzureConnection.update_role', new_callable=Mock)
@mark.parametrize(
'role_id,action,is_grant',
Expand Down
6 changes: 3 additions & 3 deletions tests/utils/azure_users_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from pytest import mark


@patch('msal.ConfidentialClientApplication', Mock())
@patch('utils.azure_users.AzureConnection.get_msal_client', Mock())
@patch('utils.azure_users.AzureConnection.get_token', Mock())
@patch('requests.get')
@mark.parametrize(
Expand All @@ -26,7 +26,7 @@ def test_azure_connection_is_test_user(
assert az_conn.is_test_user(test_user_id) == is_test_user_expected_value


@patch('msal.ConfidentialClientApplication', Mock())
@patch('utils.azure_users.AzureConnection.get_msal_client', Mock())
@patch('utils.azure_users.AzureConnection.get_token', Mock())
@patch('requests.get')
def test_azure_connection_get_test_user_ids(get_mock):
Expand All @@ -42,7 +42,7 @@ def test_azure_connection_get_test_user_ids(get_mock):
assert az_conn.get_test_user_ids() == ids


@patch('msal.ConfidentialClientApplication', Mock())
@patch('utils.azure_users.AzureConnection.get_msal_client', Mock())
@patch('utils.azure_users.AzureConnection.get_token', Mock())
@patch('utils.azure_users.AzureConnection.get_test_user_ids')
@patch('utils.azure_users.AzureConnection.users')
Expand Down
14 changes: 9 additions & 5 deletions utils/azure_users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,18 @@ def __init__(self, id, name, email, roles):

class AzureConnection:
def __init__(self, config=MSConfig):
self.client = msal.ConfidentialClientApplication(
config.CLIENT_ID,
authority=config.AUTHORITY,
client_credential=config.SECRET,
)
self.config = config
self.client = self.get_msal_client()
self.access_token = self.get_token()

def get_msal_client(self):
client = msal.ConfidentialClientApplication(
self.config.CLIENT_ID,
authority=self.config.AUTHORITY,
client_credential=self.config.SECRET,
)
return client

def get_token(self):
response = self.client.acquire_token_for_client(
scopes=self.config.SCOPE
Expand Down