Update CredentialCommands.cs

PowerShell · lzybkr · Sep 16, 2016 · lzybkr · Sep 16, 2016 · McAndersDK
diff --git a/src/Microsoft.PowerShell.Security/security/CredentialCommands.cs b/src/Microsoft.PowerShell.Security/security/CredentialCommands.cs
+                caption = UtilsStrings.PromptForCredential_DefaultCaption;
+            }
+
+            if (!string.IsNullOrEmpty(this.Message) || !string.IsNullOrEmpty(this.UserName))
diff --git a/src/Microsoft.PowerShell.Security/security/CredentialCommands.cs b/src/Microsoft.PowerShell.Security/security/CredentialCommands.cs
@@ -86,14 +112,22 @@ public GetCredentialCommand() : base()
        /// </summary>
        protected override void BeginProcessing()
        {
-            if (!string.IsNullOrEmpty(this.Message))
+           string caption;
diff --git a/src/Microsoft.PowerShell.Security/security/CredentialCommands.cs b/src/Microsoft.PowerShell.Security/security/CredentialCommands.cs
@@ -16,7 +16,7 @@ namespace Microsoft.PowerShell.Commands
    /// operations involving security.
    /// </summary>
    [Cmdlet(VerbsCommon.Get, "Credential", DefaultParameterSetName = GetCredentialCommand.credentialSet, HelpUri = "http://go.microsoft.com/fwlink/?LinkID=113311")]
-    [OutputType(typeof(PSCredential), ParameterSetName = new string[] { GetCredentialCommand.credentialSet, GetCredentialCommand.messageSet })]
+    [OutputType(typeof(PSCredential), ParameterSetName = new string[] { GetCredentialCommand.credentialSet, GetCredentialCommand.messageSet, GetCredentialCommand.titleSet, GetCredentialCommand.usernameSet })]
diff --git a/src/Microsoft.PowerShell.Security/security/CredentialCommands.cs b/src/Microsoft.PowerShell.Security/security/CredentialCommands.cs
+            }
+            else {
+                caption = UtilsStrings.PromptForCredential_DefaultCaption;
+            }
diff --git a/src/Microsoft.PowerShell.Security/security/CredentialCommands.cs b/src/Microsoft.PowerShell.Security/security/CredentialCommands.cs
@@ -86,14 +112,22 @@ public GetCredentialCommand() : base()
        /// </summary>
        protected override void BeginProcessing()
        {
-            if (!string.IsNullOrEmpty(this.Message))
+           string caption;
+            if(!string.IsNullOrEmpty(this.Title)) {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/GetCredential.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/GetCredential.Tests.ps1
        $cred.gettype().FullName | Should Be "System.Management.Automation.PSCredential"
        $netcred = $cred.GetNetworkCredential()
        $netcred.UserName | Should be "Joe"
        $netcred.Password | Should be "this is a test"
+        # Resx file only include english language, this should be changed to reflect Current Culture if title change by language.
+        $th.ui.Streams.Prompt[-1] | should be "Credential:Windows PowerShell credential request.:Foo" 
+    }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/GetCredential.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/GetCredential.Tests.ps1
+        $th.ui.Streams.Prompt[-1] | should be "Credential:CustomTitle:Foo"
+    }
+    It "Get-Credential with empty username, should throw" {
+        $cred = $ps.AddScript("Get-Credential -UserName ''").Invoke() | should throw
    }