Merge pull request #40 from onovotny/client-updates

Add a better error message if it's a bad user/pass
dotnet · Jul 1, 2018 · cc2fa75 · cc2fa75
2 parents d608cb7 + fe65b08
commit cc2fa75
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/.vsts.service.ci.yml b/.vsts.service.ci.yml
@@ -19,8 +19,10 @@ steps:
 - task: DotNetCoreCLI@2
   displayName: Copy sdk files locally before build
   inputs:
+    command: custom
     projects: src/SignService/SignService.csproj
-    arguments: '-c $(BuildConfiguration) /t:PrebuildScript'
+    custom: msbuild
+    arguments: '/p:Configuration=$(BuildConfiguration) /t:PrebuildScript'
 
 - task: DotNetCoreCLI@2
   displayName: Build and Publish

diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -1,10 +1,14 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-62925-02" PrivateAssets="All"/>
   </ItemGroup>
 
 </Project>
diff --git a/src/SignClient/SignCommand.cs b/src/SignClient/SignCommand.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
+using System.Security.Authentication;
 using System.Threading.Tasks;
 using Microsoft.Extensions.CommandLineUtils;
 using Microsoft.Extensions.Configuration;
@@ -90,21 +91,28 @@ CommandOption descriptionUrl
                             // 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() },
+                                {"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();
-                                result.EnsureSuccessStatusCode();
-
+                                
                                 var jObj = JObject.Parse(res);
-                                var token = jObj["access_token"].Value<string>();
+
+                                if (!result.IsSuccessStatusCode)
+                                {
+                                    var desc = jObj["error_description"].Value<string>();
+                                    throw new AuthenticationException(desc);
+                                }
+
+                                var token = jObj["access_token"]
+                                    .Value<string>();
                                 return token;
                             }
                         }
@@ -146,6 +154,11 @@ CommandOption descriptionUrl
                     await str.CopyToAsync(fs);
                 }
             }
+            catch (AuthenticationException e)
+            {
+                signCommandLineApplication.Error.WriteLine(e.Message);
+                return EXIT_CODES.FAILED;
+            }
             catch (Exception e)
             {
                 signCommandLineApplication.Error.WriteLine("Exception: " + e);