Merge pull request #734 from whoisj/config-value-comparer

J Wyman · web-flow · commit ffa6d668af24 · 2018-08-16T14:14:43.000-04:00
cli: use the correct string comparer.
diff --git a/Shared/Cli/Functions/Common.cs b/Shared/Cli/Functions/Common.cs
@@ -418,36 +418,36 @@ public static async Task LoadOperationArguments(Program program, OperationArgume
             {
                 program.Trace.WriteLine($"{program.KeyTypeName(KeyType.Authority)} = '{value}'.");
 
-                if (Program.ConfigKeyComparer.Equals(value, "MSA")
-                    || Program.ConfigKeyComparer.Equals(value, "Microsoft")
-                    || Program.ConfigKeyComparer.Equals(value, "MicrosoftAccount")
-                    || Program.ConfigKeyComparer.Equals(value, "Live")
-                    || Program.ConfigKeyComparer.Equals(value, "LiveConnect")
-                    || Program.ConfigKeyComparer.Equals(value, "LiveID"))
+                if (Program.ConfigValueComparer.Equals(value, "MSA")
+                    || Program.ConfigValueComparer.Equals(value, "Microsoft")
+                    || Program.ConfigValueComparer.Equals(value, "MicrosoftAccount")
+                    || Program.ConfigValueComparer.Equals(value, "Live")
+                    || Program.ConfigValueComparer.Equals(value, "LiveConnect")
+                    || Program.ConfigValueComparer.Equals(value, "LiveID"))
                 {
                     operationArguments.Authority = AuthorityType.MicrosoftAccount;
                 }
-                else if (Program.ConfigKeyComparer.Equals(value, "AAD")
-                         || Program.ConfigKeyComparer.Equals(value, "Azure")
-                         || Program.ConfigKeyComparer.Equals(value, "AzureDirectory"))
+                else if (Program.ConfigValueComparer.Equals(value, "AAD")
+                         || Program.ConfigValueComparer.Equals(value, "Azure")
+                         || Program.ConfigValueComparer.Equals(value, "AzureDirectory"))
                 {
                     operationArguments.Authority = AuthorityType.AzureDirectory;
                 }
-                else if (Program.ConfigKeyComparer.Equals(value, "Integrated")
-                         || Program.ConfigKeyComparer.Equals(value, "Windows")
-                         || Program.ConfigKeyComparer.Equals(value, "TFS")
-                         || Program.ConfigKeyComparer.Equals(value, "Kerberos")
-                         || Program.ConfigKeyComparer.Equals(value, "NTLM")
-                         || Program.ConfigKeyComparer.Equals(value, "SSO"))
+                else if (Program.ConfigValueComparer.Equals(value, "Integrated")
+                         || Program.ConfigValueComparer.Equals(value, "Windows")
+                         || Program.ConfigValueComparer.Equals(value, "TFS")
+                         || Program.ConfigValueComparer.Equals(value, "Kerberos")
+                         || Program.ConfigValueComparer.Equals(value, "NTLM")
+                         || Program.ConfigValueComparer.Equals(value, "SSO"))
                 {
                     operationArguments.Authority = AuthorityType.Ntlm;
                 }
-                else if (Program.ConfigKeyComparer.Equals(value, "GitHub"))
+                else if (Program.ConfigValueComparer.Equals(value, "GitHub"))
                 {
                     operationArguments.Authority = AuthorityType.GitHub;
                 }
-                else if (Program.ConfigKeyComparer.Equals(value, "Atlassian")
-                         || Program.ConfigKeyComparer.Equals(value, "Bitbucket"))
+                else if (Program.ConfigValueComparer.Equals(value, "Atlassian")
+                         || Program.ConfigValueComparer.Equals(value, "Bitbucket"))
                 {
                     operationArguments.Authority = AuthorityType.Bitbucket;
                 }
@@ -462,14 +462,14 @@ public static async Task LoadOperationArguments(Program program, OperationArgume
             {
                 program.Trace.WriteLine($"{program.KeyTypeName(KeyType.Interactive)} = '{value}'.");
 
-                if (Program.ConfigKeyComparer.Equals(value, "always")
-                    || Program.ConfigKeyComparer.Equals(value, "true")
-                    || Program.ConfigKeyComparer.Equals(value, "force"))
+                if (Program.ConfigValueComparer.Equals(value, "always")
+                    || Program.ConfigValueComparer.Equals(value, "true")
+                    || Program.ConfigValueComparer.Equals(value, "force"))
                 {
                     operationArguments.Interactivity = Interactivity.Always;
                 }
-                else if (Program.ConfigKeyComparer.Equals(value, "never")
-                         || Program.ConfigKeyComparer.Equals(value, "false"))
+                else if (Program.ConfigValueComparer.Equals(value, "never")
+                         || Program.ConfigValueComparer.Equals(value, "false"))
                 {
                     operationArguments.Interactivity = Interactivity.Never;
                 }

Original file line number	Diff line number	Diff line change
`@@ -418,36 +418,36 @@ public static async Task LoadOperationArguments(Program program, OperationArgume`
`418`	`418`	`{`
`419`	`419`	`program.Trace.WriteLine($"{program.KeyTypeName(KeyType.Authority)} = '{value}'.");`
`420`	`420`
`421`		`- if (Program.ConfigKeyComparer.Equals(value, "MSA")`
`422`		`- \|\| Program.ConfigKeyComparer.Equals(value, "Microsoft")`
`423`		`- \|\| Program.ConfigKeyComparer.Equals(value, "MicrosoftAccount")`
`424`		`- \|\| Program.ConfigKeyComparer.Equals(value, "Live")`
`425`		`- \|\| Program.ConfigKeyComparer.Equals(value, "LiveConnect")`
`426`		`- \|\| Program.ConfigKeyComparer.Equals(value, "LiveID"))`
	`421`	`+ if (Program.ConfigValueComparer.Equals(value, "MSA")`
	`422`	`+ \|\| Program.ConfigValueComparer.Equals(value, "Microsoft")`
	`423`	`+ \|\| Program.ConfigValueComparer.Equals(value, "MicrosoftAccount")`
	`424`	`+ \|\| Program.ConfigValueComparer.Equals(value, "Live")`
	`425`	`+ \|\| Program.ConfigValueComparer.Equals(value, "LiveConnect")`
	`426`	`+ \|\| Program.ConfigValueComparer.Equals(value, "LiveID"))`
`427`	`427`	`{`
`428`	`428`	`operationArguments.Authority = AuthorityType.MicrosoftAccount;`
`429`	`429`	`}`
`430`		`- else if (Program.ConfigKeyComparer.Equals(value, "AAD")`
`431`		`- \|\| Program.ConfigKeyComparer.Equals(value, "Azure")`
`432`		`- \|\| Program.ConfigKeyComparer.Equals(value, "AzureDirectory"))`
	`430`	`+ else if (Program.ConfigValueComparer.Equals(value, "AAD")`
	`431`	`+ \|\| Program.ConfigValueComparer.Equals(value, "Azure")`
	`432`	`+ \|\| Program.ConfigValueComparer.Equals(value, "AzureDirectory"))`
`433`	`433`	`{`
`434`	`434`	`operationArguments.Authority = AuthorityType.AzureDirectory;`
`435`	`435`	`}`
`436`		`- else if (Program.ConfigKeyComparer.Equals(value, "Integrated")`
`437`		`- \|\| Program.ConfigKeyComparer.Equals(value, "Windows")`
`438`		`- \|\| Program.ConfigKeyComparer.Equals(value, "TFS")`
`439`		`- \|\| Program.ConfigKeyComparer.Equals(value, "Kerberos")`
`440`		`- \|\| Program.ConfigKeyComparer.Equals(value, "NTLM")`
`441`		`- \|\| Program.ConfigKeyComparer.Equals(value, "SSO"))`
	`436`	`+ else if (Program.ConfigValueComparer.Equals(value, "Integrated")`
	`437`	`+ \|\| Program.ConfigValueComparer.Equals(value, "Windows")`
	`438`	`+ \|\| Program.ConfigValueComparer.Equals(value, "TFS")`
	`439`	`+ \|\| Program.ConfigValueComparer.Equals(value, "Kerberos")`
	`440`	`+ \|\| Program.ConfigValueComparer.Equals(value, "NTLM")`
	`441`	`+ \|\| Program.ConfigValueComparer.Equals(value, "SSO"))`
`442`	`442`	`{`
`443`	`443`	`operationArguments.Authority = AuthorityType.Ntlm;`
`444`	`444`	`}`
`445`		`- else if (Program.ConfigKeyComparer.Equals(value, "GitHub"))`
	`445`	`+ else if (Program.ConfigValueComparer.Equals(value, "GitHub"))`
`446`	`446`	`{`
`447`	`447`	`operationArguments.Authority = AuthorityType.GitHub;`
`448`	`448`	`}`
`449`		`- else if (Program.ConfigKeyComparer.Equals(value, "Atlassian")`
`450`		`- \|\| Program.ConfigKeyComparer.Equals(value, "Bitbucket"))`
	`449`	`+ else if (Program.ConfigValueComparer.Equals(value, "Atlassian")`
	`450`	`+ \|\| Program.ConfigValueComparer.Equals(value, "Bitbucket"))`
`451`	`451`	`{`
`452`	`452`	`operationArguments.Authority = AuthorityType.Bitbucket;`
`453`	`453`	`}`
`@@ -462,14 +462,14 @@ public static async Task LoadOperationArguments(Program program, OperationArgume`
`462`	`462`	`{`
`463`	`463`	`program.Trace.WriteLine($"{program.KeyTypeName(KeyType.Interactive)} = '{value}'.");`
`464`	`464`
`465`		`- if (Program.ConfigKeyComparer.Equals(value, "always")`
`466`		`- \|\| Program.ConfigKeyComparer.Equals(value, "true")`
`467`		`- \|\| Program.ConfigKeyComparer.Equals(value, "force"))`
	`465`	`+ if (Program.ConfigValueComparer.Equals(value, "always")`
	`466`	`+ \|\| Program.ConfigValueComparer.Equals(value, "true")`
	`467`	`+ \|\| Program.ConfigValueComparer.Equals(value, "force"))`
`468`	`468`	`{`
`469`	`469`	`operationArguments.Interactivity = Interactivity.Always;`
`470`	`470`	`}`
`471`		`- else if (Program.ConfigKeyComparer.Equals(value, "never")`
`472`		`- \|\| Program.ConfigKeyComparer.Equals(value, "false"))`
	`471`	`+ else if (Program.ConfigValueComparer.Equals(value, "never")`
	`472`	`+ \|\| Program.ConfigValueComparer.Equals(value, "false"))`
`473`	`473`	`{`
`474`	`474`	`operationArguments.Interactivity = Interactivity.Never;`
`475`	`475`	`}`