Skip to content

Commit ad73752

Browse files
committed
Passes scopes correctly
1 parent f670061 commit ad73752

File tree

2 files changed

+4
-25
lines changed

2 files changed

+4
-25
lines changed

msgraphcore/graph_session.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,7 @@ def _prepare_and_send_request(self, method: str = '', url: str = '', **kwargs) -
6161
prepared_request = self.prepare_request(request)
6262

6363
if list_of_scopes is not None:
64-
# prepare scopes middleware option
65-
graph_scopes = BASE_URL + '?scopes='
66-
for scope in list_of_scopes:
67-
graph_scopes += scope + '%20'
68-
6964
# Append middleware options to the request object, will be used by MiddlewareController
70-
prepared_request.scopes = graph_scopes
65+
prepared_request.scopes = list_of_scopes
7166

7267
return self.send(prepared_request, **kwargs)

msgraphcore/middleware/authorization.py

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from ._base_auth import AuthProviderBase, TokenCredential
2-
from ..constants import AUTH_MIDDLEWARE_OPTIONS, BASE_URL
2+
from ..constants import AUTH_MIDDLEWARE_OPTIONS
33
from ._middleware import BaseMiddleware
44

55

@@ -29,25 +29,9 @@ def _get_middleware_options(self, request):
2929

3030

3131
class TokenCredentialAuthProvider(AuthProviderBase):
32-
def __init__(self, credential: TokenCredential, scopes: [str] = BASE_URL + '.default'):
32+
def __init__(self, credential: TokenCredential, scopes: [str] = ['user.read']):
3333
self.credential = credential
3434
self.scopes = scopes
3535

36-
@property
37-
def scopes(self):
38-
return self._scopes
39-
40-
@scopes.setter
41-
def scopes(self, list_of_scopes):
42-
if type(list_of_scopes) == list:
43-
graph_scopes = BASE_URL + '?scopes='
44-
45-
for scope in list_of_scopes:
46-
graph_scopes += scope + '%20'
47-
48-
self._scopes = graph_scopes
49-
elif type(list_of_scopes) == str:
50-
self._scopes = list_of_scopes
51-
5236
def get_access_token(self):
53-
return self.credential.get_token(self.scopes)[0]
37+
return self.credential.get_token(*self.scopes)[0]

0 commit comments

Comments
 (0)