Fix login issues, serialization issues with profile, and issues with default datastore

Author: markcowl

src/Common/Commands.Common/AzureRmProfileProvider.cs

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Common.Authentication;
 using Microsoft.Azure.Common.Authentication.Models;
 
 namespace Microsoft.WindowsAzure.Commands.Common

src/Common/Commands.Common/PSAzureAccount.cs

@@ -23,5 +23,7 @@ public class PSAzureAccount
         public string Subscriptions { get; set; }
 
         public string Tenants { get; set; }
+
+        internal string AccessToken { get; set; }
     }
 }

src/ResourceManager/Common/Commands.ResourceManager.Common/AzureRMCmdlet.cs

@@ -37,10 +37,10 @@ public abstract class AzureRMCmdlet : AzurePSCmdlet
         /// </summary>
         static AzureRMCmdlet()
         {
-            if (AzureSession.DataStore == null)
+            if (!TestMockSupport.RunningMocked)
             {
                 AzureSession.DataStore = new DiskDataStore();
-            }
+           }
         }
 
         public AzureRMCmdlet()

src/ResourceManager/Profile/Commands.Profile/Account/AddAzureRmAccount.cs

@@ -55,11 +55,15 @@ public class AddAzureRMAccountCommand : AzureRMCmdlet , IModuleAssemblyInitializ
         [ValidateNotNullOrEmpty]
         public string AccessToken { get; set; }
 
-        [Parameter(Mandatory = false, HelpMessage = "Subscription")]
+        [Parameter(ParameterSetName = "AccessToken", Mandatory = true, HelpMessage = "Account Id for access token")]
+        [ValidateNotNullOrEmpty]
+        public string AccountId { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = "Subscription Id")]
         [ValidateNotNullOrEmpty]
         public string SubscriptionId { get; set; }
 
-        [Parameter(Mandatory = false, HelpMessage = "Subscription")]
+        [Parameter(Mandatory = false, HelpMessage = "Subscription name")]
         [ValidateNotNullOrEmpty]
         public string SubscriptionName { get; set; }
 
@@ -97,7 +101,14 @@ protected override void ProcessRecord()
 
             if (!string.IsNullOrEmpty(AccessToken))
             {
+                if (string.IsNullOrWhiteSpace(AccountId) )
+                {
+                    throw new PSInvalidOperationException("Access token credentials must contain AccountId parameter.");
+                }
+
                 azureAccount.Type = AzureAccount.AccountType.AccessToken;
+                azureAccount.Id = AccountId;
+                azureAccount.SetProperty(AzureAccount.Property.AccessToken, AccessToken);
             }
             else if (ServicePrincipal.IsPresent)
             {

src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj

@@ -146,6 +146,7 @@
     <Compile Include="Models\PSAzureSubscription.cs" />
     <Compile Include="Models\PSAzureTenant.cs" />
     <Compile Include="Models\RMProfileClient.cs" />
+    <Compile Include="Models\SimpleAccessToken.cs" />
     <Compile Include="Subscription\GetAzureRMSubscription.cs" />
     <Compile Include="Account\AddAzureRmAccount.cs" />
     <Compile Include="Context\GetAzureRMContext.cs" />

src/ResourceManager/Profile/Commands.Profile/Models/PSAzureProfile.cs

@@ -34,7 +34,7 @@ public static implicit operator PSAzureProfile(AzureRMProfile profile)
             };
 
             profile.Environments
-                .ForEach((e) => result.Environments.Add(e.Key, (PSAzureEnvironment)e.Value));
+                .ForEach((e) => result.Environments[e.Key] = (PSAzureEnvironment)e.Value);
             return result;
         }
 
@@ -54,8 +54,7 @@ public static implicit operator AzureRMProfile(PSAzureProfile profile)
             {
                 Context = profile.Context
             };
-            profile.Environments
-                    .ForEach((e) => result.Environments.Add(e.Key, (AzureEnvironment)e.Value));
+            profile.Environments.ForEach((e) => result.Environments[e.Key] = (AzureEnvironment) e.Value);
             return result;
         }
 

src/ResourceManager/Profile/Commands.Profile/Models/PSAzureRmAccount.cs

@@ -36,11 +36,23 @@ public static implicit operator PSAzureRmAccount(AzureAccount account)
                 return null;
             }
 
-            return new PSAzureRmAccount
+            var result = new PSAzureRmAccount
             {
                 Id = account.Id,
                 AccountType = account.Type.ToString()
             };
+
+            if (account.IsPropertySet(AzureAccount.Property.AccessToken))
+            {
+                result.AccessToken = account.GetProperty(AzureAccount.Property.AccessToken);
+            }
+
+            if (account.IsPropertySet(AzureAccount.Property.Tenants))
+            {
+                result.Tenants = account.GetProperty(AzureAccount.Property.Tenants);
+            }
+
+           return result;
         }
 
         /// <summary>
@@ -65,6 +77,16 @@ public static implicit operator AzureAccount(PSAzureRmAccount account)
                 result.Type = accountType;
             }
 
+            if (!string.IsNullOrWhiteSpace(account.AccessToken))
+            {
+                result.SetProperty(AzureAccount.Property.AccessToken, account.AccessToken);
+            }
+
+            if (!string.IsNullOrWhiteSpace(account.Tenants))
+            {
+                result.SetProperty(AzureAccount.Property.Tenants, account.Tenants);
+            }
+
             return result;
         }
 
@@ -77,6 +99,16 @@ public static implicit operator AzureAccount(PSAzureRmAccount account)
         /// </summary>
         public string AccountType { get; set; }
 
+        /// <summary>
+        /// The tenant ids for the account
+        /// </summary>
+        public string Tenants { get; set; }
+
+        /// <summary>
+        /// The access token for the account (if any)
+        /// </summary>
+        public string AccessToken { get; set; }
+
         public override string ToString()
         {
             return this.Id;

src/ResourceManager/Profile/Commands.Profile/Models/RMProfileClient.cs

@@ -25,6 +25,7 @@
 using System.Linq;
 using System.Management.Automation;
 using System.Security;
+using Microsoft.Azure.Commands.Profile.Models;
 
 namespace Microsoft.Azure.Commands.ResourceManager.Common
 {
@@ -48,7 +49,7 @@ public AzureRMProfile Login(AzureAccount account, AzureEnvironment environment,
         {
             AzureSubscription newSubscription = null;
             AzureTenant newTenant = null;
-            ShowDialog promptBehavior = password == null ? ShowDialog.Always : ShowDialog.Never;
+            ShowDialog promptBehavior = (password == null && account.Type != AzureAccount.AccountType.AccessToken) ? ShowDialog.Always : ShowDialog.Never;
 
             // (tenant and subscription are present) OR
             // (tenant is present and subscription is not provided)
@@ -280,6 +281,12 @@ private IAccessToken AcquireAccessToken(AzureAccount account,
             SecureString password,
             ShowDialog promptBehavior)
         {
+            if (account.Type == AzureAccount.AccountType.AccessToken)
+            {
+                tenantId = tenantId ?? "Common";
+                return new SimpleAccessToken(account, tenantId);
+            }
+
             return AzureSession.AuthenticationFactory.Authenticate(
                 account,
                 environment,

src/ResourceManager/Profile/Commands.Profile/Models/SimpleAccessToken.cs

@@ -0,0 +1,66 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+using Microsoft.Azure.Common.Authentication;
+using Microsoft.Azure.Common.Authentication.Models;
+
+namespace Microsoft.Azure.Commands.Profile.Models
+{
+    public class SimpleAccessToken : IAccessToken
+    {
+        public const string _defaultTokenType = "Bearer";
+        private string _tokenType;
+
+        public SimpleAccessToken(AzureAccount account, string tenantId)
+        {
+            if (account == null)
+            {
+                throw new ArgumentNullException("account");
+            }
+            if (string.IsNullOrWhiteSpace(account.Id))
+            {
+                throw new ArgumentOutOfRangeException("account", "AccountId must be provided to use an AccessToken credential.");
+            }
+            if (account.Type != AzureAccount.AccountType.AccessToken ||
+                !account.IsPropertySet(AzureAccount.Property.AccessToken))
+            {
+                throw new ArgumentException("To create an access token credential, you must provide an access token account");
+            }
+            this.UserId = account.Id;
+            this._tokenType = _defaultTokenType;
+            this.AccessToken = account.GetProperty(AzureAccount.Property.AccessToken);
+            this.TenantId = tenantId;
+        }
+        public string AccessToken { get; private set; }
+
+        public void AuthorizeRequest(System.Action<string, string> authTokenSetter)
+        {
+            authTokenSetter(_tokenType, AccessToken);
+        }
+
+        public LoginType LoginType
+        {
+            get { return LoginType.OrgId; }
+        }
+
+        public string TenantId
+        {
+            get; 
+            private set;
+        }
+
+        public string UserId { get; private set; }
+    }
+}