Merge pull request Azure#236 from Azure/clu

Clu

Author: huangpf

src/CLU/Commands.Common.Authentication/AuthenticationFactory.cs

@@ -65,6 +65,10 @@ public IAccessToken Authenticate(
             }
             else
             {
+                if (account.IsPropertySet(AzureAccount.Property.ApplicationSecret))
+                {
+                    password = password ?? account.GetProperty(AzureAccount.Property.ApplicationSecret);
+                }
                 token = TokenProvider.GetAccessToken(configuration, behavior, account.Id, password, account.Type);
             }
 

src/CLU/Commands.Common/Models/PSAzureRmAccount.cs

@@ -57,7 +57,12 @@ public static implicit operator PSAzureRmAccount(AzureAccount account)
                 result.CertificateThumbprint = account.GetProperty(AzureAccount.Property.CertificateThumbprint);
             }
 
-           return result;
+            if (account.IsPropertySet(AzureAccount.Property.ApplicationSecret))
+            {
+                result.ApplicationSecret = account.GetProperty(AzureAccount.Property.ApplicationSecret);
+            }
+
+            return result;
         }
 
         /// <summary>
@@ -99,6 +104,11 @@ public static implicit operator AzureAccount(PSAzureRmAccount account)
             {
                 result.SetProperty(AzureAccount.Property.CertificateThumbprint, account.CertificateThumbprint);
             }
+
+            if (!string.IsNullOrWhiteSpace(account.ApplicationSecret))
+            {
+                result.SetProperty(AzureAccount.Property.ApplicationSecret, account.ApplicationSecret);
+            }
             return result;
         }
 
@@ -126,6 +136,8 @@ public static implicit operator AzureAccount(PSAzureRmAccount account)
         /// </summary>
         public string CertificateThumbprint { get; set; }
 
+        public string ApplicationSecret { get; set; }
+
         public override string ToString()
         {
             return this.Id;

src/CLU/Microsoft.Azure.Commands.Profile/Account/AddAzureRmAccount.cs

@@ -201,6 +201,11 @@ protected override void ProcessRecord()
                 azureAccount.SetProperty(AzureAccount.Property.Tenants, new[] { TenantId });
             }
 
+            if (!string.IsNullOrEmpty(Secret))
+            {
+                azureAccount.SetProperty(AzureAccount.Property.ApplicationSecret, Secret);
+            }
+
             if (DefaultProfile == null)
             {
                 DefaultProfile = new AzureRMProfile();