Refactor and fix a bug in the initiate_device_flow()

msal/application.py

@@ -606,11 +606,16 @@ def initiate_device_flow(self, scopes=None, **kwargs):
             - A successful response would contain "user_code" key, among others
             - an error response would contain some other readable key/value pairs.
         """
-        return self.client.initiate_device_flow(
-            # x-client-current-telemetry is not currently required by our telemetry
-            headers={'client-request-id': _get_new_correlation_id()},
+        correlation_id = _get_new_correlation_id()
+        flow = self.client.initiate_device_flow(
             scope=decorate_scope(scopes or [], self.client_id),
+            headers={
+                'client-request-id': correlation_id,
+                # 'x-client-current-telemetry' is not currently required
+                },
             **kwargs)
+        flow["_client_request_id"] = correlation_id
+        return flow
 
     def acquire_token_by_device_flow(self, flow, **kwargs):
         """Obtain token by a device flow object, with customizable polling effect.

msal/oauth2cli/oauth2.py

@@ -220,7 +220,6 @@ def initiate_device_flow(self, scope=None, timeout=None, **kwargs):
         flow["interval"] = int(flow.get("interval", 5))  # Some IdP returns string
         flow["expires_in"] = int(flow.get("expires_in", 1800))
         flow["expires_at"] = time.time() + flow["expires_in"]  # We invent this
-        flow["_client_request_id"] = kwargs.get('client-request-id')  # correlation Id for telemetry
         return flow
 
     def _obtain_token_by_device_flow(self, flow, **kwargs):