Update device code request to include device_code (#1359)

* update device code request to include device_code * changelog
AzureAD · Oct 26, 2018 · da27ee5 · da27ee5
1 parent 4a4996f
commit da27ee5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/core/src/OAuth2/OAuthConstants.cs b/core/src/OAuth2/OAuthConstants.cs
@@ -39,6 +39,7 @@ internal class OAuth2Parameter
         public const string RedirectUri = "redirect_uri";
         public const string Resource = "resource";
         public const string Code = "code";
+        public const string DeviceCode = "device_code";
         public const string Scope = "scope";
         public const string Assertion = "assertion";
         public const string RequestedTokenUse = "requested_token_use";

diff --git a/msal/changelog.txt b/msal/changelog.txt
@@ -1,3 +1,8 @@
+2.3.1-preview
+=============
+This release includes:
+- Fix for device code flow where server is now expecting device_code as the body parameter.
+
 2.3.0-preview
 =============
 This release includes:

diff --git a/msal/src/Microsoft.Identity.Client/Features/DeviceCode/DeviceCodeRequest.cs b/msal/src/Microsoft.Identity.Client/Features/DeviceCode/DeviceCodeRequest.cs
@@ -135,6 +135,9 @@ private Dictionary<string, string> GetBodyParameters(DeviceCodeResult deviceCode
             var dict = new Dictionary<string, string>
             {
                 [OAuth2Parameter.GrantType] = OAuth2GrantType.DeviceCode,
+                [OAuth2Parameter.DeviceCode] = deviceCodeResult.DeviceCode,
+                // TODO: this is out of spec and the server is changing but for now to keep compatible
+                // across servers as the changes roll out, we're sending the device code both ways.
                 [OAuth2Parameter.Code] = deviceCodeResult.DeviceCode
             };
             return dict;