Skip to content

229 make admin #235

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 7 commits into from
Nov 23, 2020
Merged

229 make admin #235

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d129a9
feat: update user role #229
Angeluz-07 Nov 12, 2020
bcd2564
feat: testing for update user role #229
magallegos1996 Nov 12, 2020
68f4961
feat: add new fixture user_id testing update user role is being calle…
magallegos1996 Nov 13, 2020
47e21af
feat: response and user input fields now accepts a null value in thei…
magallegos1996 Nov 13, 2020
d6f5ad5
feat: update url #229
Angeluz-07 Nov 16, 2020
da5024f
feat: move extension_role to variable #229
Angeluz-07 Nov 17, 2020
67ce20b
feat: change PUT for POST and DELETE #229
Angeluz-07 Nov 19, 2020
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
Next Next commit
feat: move extension_role to variable #229
  • Loading branch information
@Angeluz-07
Angeluz-07 committed Nov 19, 2020
commit da5024fd56044f92f7ed89cea29a86e857491781
17 changes: 6 additions & 11 deletions utils/azure_users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ def __init__(self, config=MSConfig):
self.config = config
self.access_token = self.get_token()

self.role_field = 'extension_1d76efa96f604499acc0c0ee116a1453_role'

def get_token(self):
response = self.client.acquire_token_for_client(
scopes=self.config.SCOPE
Expand All @@ -67,8 +69,7 @@ def get_token(self):

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='extension_1d76efa96f604499acc0c0ee116a1453_role',
endpoint=self.config.ENDPOINT, role_field=self.role_field,
)
response = requests.get(endpoint, auth=BearerAuth(self.access_token))

Expand All @@ -84,7 +85,7 @@ def update_user_role(self, id, role):
endpoint = "{endpoint}/users/{user_id}?api-version=1.6".format(
endpoint=self.config.ENDPOINT, user_id=id
)
data = {'extension_1d76efa96f604499acc0c0ee116a1453_role': role}
data = {self.role_field: role}
response = requests.patch(
endpoint,
auth=BearerAuth(self.access_token),
Expand All @@ -100,16 +101,10 @@ def update_user_role(self, id, role):

def to_azure_user(self, item) -> AzureUser:
there_is_email = len(item['otherMails']) > 0
there_is_role = (
'extension_1d76efa96f604499acc0c0ee116a1453_role' in item
)
there_is_role = self.role_field in item

id = item['objectId']
name = item['displayName']
email = item['otherMails'][0] if there_is_email else ''
role = (
item['extension_1d76efa96f604499acc0c0ee116a1453_role']
if there_is_role
else None
)
role = item[self.role_field] if there_is_role else None
return AzureUser(id, name, email, role)