@@ -56,7 +56,7 @@ private IAzureContext DefaultContext
56
56
public RMProfileClient ( IProfileOperations profile )
57
57
{
58
58
_profile = profile ;
59
- var context = DefaultContext ;
59
+ var context = _profile . DefaultContext ;
60
60
_cache = AzureSession . Instance . TokenCache ;
61
61
if ( _profile != null && context != null &&
62
62
context . TokenCache != null )
@@ -264,7 +264,7 @@ public AzureRmProfile Login(
264
264
}
265
265
}
266
266
267
- shouldPopulateContextList &= DefaultContext ? . Account == null ;
267
+ shouldPopulateContextList &= _profile . DefaultContext ? . Account == null ;
268
268
if ( newSubscription == null )
269
269
{
270
270
if ( subscriptionId != null )
@@ -298,10 +298,10 @@ public AzureRmProfile Login(
298
298
}
299
299
}
300
300
301
- DefaultContext . TokenCache = _cache ;
301
+ _profile . DefaultContext . TokenCache = _cache ;
302
302
if ( shouldPopulateContextList )
303
303
{
304
- var defaultContext = DefaultContext ;
304
+ var defaultContext = _profile . DefaultContext ;
305
305
var subscriptions = ListSubscriptions ( tenantId ) . Take ( 25 ) ;
306
306
foreach ( var subscription in subscriptions )
307
307
{
@@ -338,7 +338,7 @@ public IAzureContext SetCurrentContext(string subscriptionNameOrId, string tenan
338
338
IAzureTenant tenant = null ;
339
339
Guid subscriptionId ;
340
340
IAzureContext context = new AzureContext ( ) ;
341
- context . CopyFrom ( DefaultContext ) ;
341
+ context . CopyFrom ( _profile . DefaultContext ) ;
342
342
if ( ! string . IsNullOrWhiteSpace ( subscriptionNameOrId ) )
343
343
{
344
344
if ( Guid . TryParse ( subscriptionNameOrId , out subscriptionId ) )
@@ -369,7 +369,7 @@ public IAzureContext SetCurrentContext(string subscriptionNameOrId, string tenan
369
369
370
370
context . WithTenant ( tenant ) . WithSubscription ( subscription ) ;
371
371
_profile . TrySetDefaultContext ( name , context ) ;
372
- DefaultContext . ExtendedProperties . Clear ( ) ;
372
+ _profile . DefaultContext . ExtendedProperties . Clear ( ) ;
373
373
return context ;
374
374
}
375
375
@@ -472,8 +472,8 @@ public IAzureEnvironment RemoveEnvironment(string name)
472
472
public IAccessToken AcquireAccessToken ( string tenantId , Action < string > promptAction = null )
473
473
{
474
474
return AcquireAccessToken (
475
- DefaultContext . Account ,
476
- DefaultContext . Environment ,
475
+ _profile . DefaultContext . Account ,
476
+ _profile . DefaultContext . Environment ,
477
477
tenantId , null ,
478
478
ShowDialog . Auto ,
479
479
promptAction ) ;
@@ -495,7 +495,7 @@ public IEnumerable<IAzureSubscription> ListSubscriptions(string tenantIdOrDomain
495
495
{
496
496
WriteWarningMessage ( string . Format (
497
497
ProfileMessages . UnableToLogin ,
498
- DefaultContext . Account ,
498
+ _profile . DefaultContext . Account ,
499
499
tenant ) ) ;
500
500
}
501
501
@@ -723,8 +723,8 @@ private List<AzureTenant> ListAccountTenants(
723
723
private IEnumerable < AzureSubscription > ListAllSubscriptionsForTenant (
724
724
string tenantId )
725
725
{
726
- IAzureAccount account = DefaultContext . Account ;
727
- IAzureEnvironment environment = DefaultContext . Environment ;
726
+ IAzureAccount account = _profile . DefaultContext . Account ;
727
+ IAzureEnvironment environment = _profile . DefaultContext . Environment ;
728
728
SecureString password = null ;
729
729
string promptBehavior = ShowDialog . Never ;
730
730
IAccessToken accessToken = null ;
@@ -744,7 +744,7 @@ private IEnumerable<AzureSubscription> ListAllSubscriptionsForTenant(
744
744
new TokenCredentials ( accessToken . AccessToken ) as ServiceClientCredentials ,
745
745
AzureSession . Instance . ClientFactory . GetCustomHandlers ( ) ) ;
746
746
747
- AzureContext context = new AzureContext ( DefaultContext . Subscription , account , environment ,
747
+ AzureContext context = new AzureContext ( _profile . DefaultContext . Subscription , account , environment ,
748
748
CreateTenantFromString ( tenantId , accessToken . TenantId ) ) ;
749
749
750
750
return subscriptionClient . ListAllSubscriptions ( ) . Select ( s => s . ToAzureSubscription ( context ) ) ;
0 commit comments