From 5d9d62d3820f1a518358407b3e12e7d35a1fab54 Mon Sep 17 00:00:00 2001 From: Kim Gybels Date: Tue, 27 Mar 2018 00:11:17 +0200 Subject: [PATCH 1/3] Remove special character from test EmailAsUserName --- Cli-CredentialHelper.Test/OperationArgumentsTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cli-CredentialHelper.Test/OperationArgumentsTests.cs b/Cli-CredentialHelper.Test/OperationArgumentsTests.cs index 96aa88325..4ebdae24a 100644 --- a/Cli-CredentialHelper.Test/OperationArgumentsTests.cs +++ b/Cli-CredentialHelper.Test/OperationArgumentsTests.cs @@ -90,7 +90,7 @@ public void EmailAsUserName() var input = new InputArg { Host = "example.visualstudio.com", - Password = "ḭncorrect", + Password = "incorrect", Path = "path", Protocol = Uri.UriSchemeHttps, Username = "userName@domain.com" From 9f1648f8750f617167033cc6b8c13e91afdb11ce Mon Sep 17 00:00:00 2001 From: Kim Gybels Date: Tue, 27 Mar 2018 00:21:38 +0200 Subject: [PATCH 2/3] Handle username with domain Extend solution for #587 to also handle: username=DOMAIN\username --- .../OperationArgumentsTests.cs | 28 +++++++++++++++++++ Cli-Shared/OperationArguments.cs | 1 + 2 files changed, 29 insertions(+) diff --git a/Cli-CredentialHelper.Test/OperationArgumentsTests.cs b/Cli-CredentialHelper.Test/OperationArgumentsTests.cs index 4ebdae24a..4375348b7 100644 --- a/Cli-CredentialHelper.Test/OperationArgumentsTests.cs +++ b/Cli-CredentialHelper.Test/OperationArgumentsTests.cs @@ -121,6 +121,34 @@ public void EmailAsUserName() Assert.Equal(expected, actual, StringComparer.Ordinal); } + [Fact] + public void UsernameWithDomain() + { + var input = new InputArg + { + Host = "example.visualstudio.com", + Password = "incorrect", + Path = "path", + Protocol = Uri.UriSchemeHttps, + Username = @"DOMAIN\username" + }; + + OperationArguments cut; + using (var memory = new MemoryStream()) + using (var writer = new StreamWriter(memory)) + { + writer.Write(input.ToString()); + writer.Flush(); + + memory.Seek(0, SeekOrigin.Begin); + + cut = new OperationArguments(memory); + } + + Assert.Equal(@"https://DOMAIN\username@example.visualstudio.com/path", cut.TargetUri.ToString(), StringComparer.Ordinal); + Assert.Equal(input.ToString(), cut.ToString(), StringComparer.Ordinal); + } + [Fact] public void CreateTargetUriGitHubSimple() { diff --git a/Cli-Shared/OperationArguments.cs b/Cli-Shared/OperationArguments.cs index df886d1af..333597c6b 100644 --- a/Cli-Shared/OperationArguments.cs +++ b/Cli-Shared/OperationArguments.cs @@ -543,6 +543,7 @@ private static bool NeedsToBeEscaped(string value) { case ':': case '/': + case '\\': case '?': case '#': case '[': From 557369f28bcbd4241277947b9917e46ff4cb4541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=20Wyman=20=E2=88=9E?= Date: Fri, 30 Mar 2018 10:53:01 -0400 Subject: [PATCH 3/3] cli: Update Versions. cli-askpass: 1.15.1 -> 1.15.2 cli-helper: 1.15.1 -> 1.15.2 --- Cli-Askpass/Properties/AssemblyInfo.cs | 4 ++-- Cli-CredentialHelper/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cli-Askpass/Properties/AssemblyInfo.cs b/Cli-Askpass/Properties/AssemblyInfo.cs index 4d2d11e53..01affc950 100644 --- a/Cli-Askpass/Properties/AssemblyInfo.cs +++ b/Cli-Askpass/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ [assembly: AssemblyTrademark("Microsoft Corporation")] [assembly: AssemblyCulture("")] [assembly: Guid("62f52119-63d4-40a8-a9df-f1c4b473308a")] -[assembly: AssemblyVersion("1.15.1.0")] -[assembly: AssemblyFileVersion("1.15.1.0")] +[assembly: AssemblyVersion("1.15.2.0")] +[assembly: AssemblyFileVersion("1.15.2.0")] [assembly: NeutralResourcesLanguage("en-US")] [assembly: InternalsVisibleTo("Microsoft.Alm.AskPass.Test")] diff --git a/Cli-CredentialHelper/Properties/AssemblyInfo.cs b/Cli-CredentialHelper/Properties/AssemblyInfo.cs index 4c10dcc1d..1baca7f0c 100644 --- a/Cli-CredentialHelper/Properties/AssemblyInfo.cs +++ b/Cli-CredentialHelper/Properties/AssemblyInfo.cs @@ -12,8 +12,8 @@ [assembly: AssemblyTrademark("Microsoft Corporation")] [assembly: AssemblyCulture("")] [assembly: Guid("62f52119-63d4-40a8-a9df-f1c4b473308a")] -[assembly: AssemblyVersion("1.15.1.0")] -[assembly: AssemblyFileVersion("1.15.1.0")] +[assembly: AssemblyVersion("1.15.2.0")] +[assembly: AssemblyFileVersion("1.15.2.0")] [assembly: NeutralResourcesLanguage("en-US")] [assembly: InternalsVisibleTo("Microsoft.Alm.CredentialHelper.Test")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]