@@ -55,6 +55,8 @@ def __init__(self, config=MSConfig):
55
55
self .config = config
56
56
self .access_token = self .get_token ()
57
57
58
+ self .role_field = 'extension_1d76efa96f604499acc0c0ee116a1453_role'
59
+
58
60
def get_token (self ):
59
61
response = self .client .acquire_token_for_client (
60
62
scopes = self .config .SCOPE
@@ -67,8 +69,7 @@ def get_token(self):
67
69
68
70
def users (self ) -> List [AzureUser ]:
69
71
endpoint = "{endpoint}/users?api-version=1.6&$select=displayName,otherMails,objectId,{role_field}" .format (
70
- endpoint = self .config .ENDPOINT ,
71
- role_field = 'extension_1d76efa96f604499acc0c0ee116a1453_role' ,
72
+ endpoint = self .config .ENDPOINT , role_field = self .role_field ,
72
73
)
73
74
response = requests .get (endpoint , auth = BearerAuth (self .access_token ))
74
75
@@ -84,7 +85,7 @@ def update_user_role(self, id, role):
84
85
endpoint = "{endpoint}/users/{user_id}?api-version=1.6" .format (
85
86
endpoint = self .config .ENDPOINT , user_id = id
86
87
)
87
- data = {'extension_1d76efa96f604499acc0c0ee116a1453_role' : role }
88
+ data = {self . role_field : role }
88
89
response = requests .patch (
89
90
endpoint ,
90
91
auth = BearerAuth (self .access_token ),
@@ -100,16 +101,10 @@ def update_user_role(self, id, role):
100
101
101
102
def to_azure_user (self , item ) -> AzureUser :
102
103
there_is_email = len (item ['otherMails' ]) > 0
103
- there_is_role = (
104
- 'extension_1d76efa96f604499acc0c0ee116a1453_role' in item
105
- )
104
+ there_is_role = self .role_field in item
106
105
107
106
id = item ['objectId' ]
108
107
name = item ['displayName' ]
109
108
email = item ['otherMails' ][0 ] if there_is_email else ''
110
- role = (
111
- item ['extension_1d76efa96f604499acc0c0ee116a1453_role' ]
112
- if there_is_role
113
- else None
114
- )
109
+ role = item [self .role_field ] if there_is_role else None
115
110
return AzureUser (id , name , email , role )
0 commit comments