Skip to content

Commit 734c78b

Browse files
committed
Pass headers instead of request object when creating a context object
1 parent 68b0993 commit 734c78b

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

msgraphcore/middleware/middleware.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def add_middleware(self, middleware):
2626

2727
def send(self, request, **kwargs):
2828

29-
request.context = RequestContext(request)
29+
request.context = RequestContext(request.headers)
3030

3131
if self._middleware_present():
3232
return self._middleware.send(request, **kwargs)

msgraphcore/middleware/request_context.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66

77
class RequestContext:
8-
def __init__(self, request):
8+
def __init__(self, headers):
99
self.middleware_control = middleware_control
10-
self.client_request_id = request.headers.get('client-request-id', str(uuid.uuid4()))
10+
self.client_request_id = headers.get('client-request-id', str(uuid.uuid4()))
1111
self._feature_usage = FeatureUsageFlag.NONE
1212

1313
@property
@@ -16,4 +16,5 @@ def feature_usage(self):
1616

1717
@feature_usage.setter
1818
def set_feature_usage(self, flag: FeatureUsageFlag):
19-
self._feature_usage = self.feature_usage | flag
19+
print(type(self._feature_usage))
20+
self._feature_usage = self._feature_usage | flag

tests/unit/test_graph_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def test_graph_client_builds_graph_urls():
7171

7272
responses.add(responses.GET, graph_url, status=200)
7373

74-
client.get('/me')
74+
client.get('/me', headers={})
7575
assert graph_url == responses.calls[0].request.url
7676

7777

@@ -85,7 +85,7 @@ def test_does_not_build_graph_urls_for_full_urls():
8585

8686
credential = _CustomTokenCredential()
8787
client = GraphClient(credential=credential)
88-
client.get(other_url)
88+
client.get(other_url, headers={})
8989
request_url = responses.calls[0].request.url
9090
assert other_url == request_url
9191

0 commit comments

Comments
 (0)