Use MSAL

ufilmn · Jan 18, 2019 · 22a2222 · 22a2222
1 parent 4663b73
commit 22a2222
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 32 deletions.
diff --git a/src/SignClient/SignClient.csproj b/src/SignClient/SignClient.csproj
@@ -12,8 +12,8 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="4.4.1" />
-    <PackageReference Include="Refit" Version="4.6.48" />
+    <PackageReference Include="Microsoft.Identity.Client" Version="2.7.0" />
+    <PackageReference Include="Refit" Version="4.6.58" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SignClient/SignCommand.cs b/src/SignClient/SignCommand.cs
@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
 using System.Net.Http;
+using System.Security;
 using System.Security.Authentication;
 using System.Threading.Tasks;
 using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.Extensions.Configuration;
-using Microsoft.IdentityModel.Clients.ActiveDirectory;
+using Microsoft.Identity.Client;
 using Newtonsoft.Json.Linq;
 using Refit;
 
@@ -88,39 +90,23 @@ CommandOption descriptionUrl
                         if (username.HasValue())
                         {
                             // ROPC flow
-                            // Cannot use ADAL since there's no support for ROPC in .NET Core
-                            var parameters = new Dictionary<string, string>
-                            {
-                                {"resource", resourceId},
-                                {"client_id", clientId},
-                                {"grant_type", "password"},
-                                {"username", username.Value()},
-                                {"password", clientSecret.Value()},
-                            };
-                            using (var adalClient = new HttpClient())
-                            {
-                                var result = await adalClient.PostAsync($"{authority}/oauth2/token", new FormUrlEncodedContent(parameters));
-
-                                var res = await result.Content.ReadAsStringAsync();
-
-                                var jObj = JObject.Parse(res);
-
-                                if (!result.IsSuccessStatusCode)
-                                {
-                                    var desc = jObj["error_description"].Value<string>();
-                                    throw new AuthenticationException(desc);
-                                }
-
-                                var token = jObj["access_token"]
-                                    .Value<string>();
-                                return token;
-                            }
+                            var pca = new PublicClientApplication(clientId, authority);
+
+                            var scope = $"{resourceId}/user_impersonation";
+
+                            var secret = new NetworkCredential("", clientSecret.Value()).SecurePassword;
+                            var tokenResult = await pca.AcquireTokenByUsernamePasswordAsync(new[] { scope }, username.Value(), secret);
+
+                            return tokenResult.AccessToken;
                         }
                         else
                         {
                             // Client credential flow
-                            var context = new AuthenticationContext(authority);
-                            var res = await context.AcquireTokenAsync(resourceId, new ClientCredential(clientId, clientSecret.Value()));
+
+                            var context = new ConfidentialClientApplication(clientId, authority, "urn:ietf:wg:oauth:2.0:oob", new ClientCredential(clientSecret.Value()), new TokenCache(), new TokenCache());
+
+                            var scope = $"{resourceId}/.default";
+                            var res = await context.AcquireTokenForClientAsync(new[] { scope });
                             return res.AccessToken;
                         }
                     }