Merge pull request #9454 from cormacpayne/fix-endpoint

markcowl · web-flow · commit 0c6982031d67 · 2019-06-19T16:59:03.000-07:00
Fix bug where incorrect endpoint was being used in some cases for data plane calls
diff --git a/src/Accounts/Accounts/ChangeLog.md b/src/Accounts/Accounts/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fix bug where incorrect endpoint was being used in some cases for data plane cmdlets in Windows PowerShell
 
 ## Version 1.5.3
 * Fix bug with incorrect URL being used in some cases for Functions calls
diff --git a/src/Accounts/Authenticators/InteractiveUserAuthenticator.cs b/src/Accounts/Authenticators/InteractiveUserAuthenticator.cs
@@ -30,7 +30,7 @@ public async override Task<IAccessToken> Authenticate(IAzureAccount account, IAz
         {
             var auth = new AuthenticationContext(AuthenticationHelpers.GetAuthority(environment, tenant), environment?.OnPremise ?? true, tokenCache as TokenCache ?? TokenCache.DefaultShared);
             var response = await auth.AcquireTokenAsync(
-                environment.ActiveDirectoryServiceEndpointResourceId, 
+                environment.GetEndpoint(resourceId), 
                 AuthenticationHelpers.PowerShellClientId, 
                 new Uri(AuthenticationHelpers.PowerShellRedirectUri), 
                 new PlatformParameters(AuthenticationHelpers.GetPromptBehavior(promptBehavior), new ConsoleParentWindow()), 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public async override Task<IAccessToken> Authenticate(IAzureAccount account, IAz`
`30`	`30`	`{`
`31`	`31`	`var auth = new AuthenticationContext(AuthenticationHelpers.GetAuthority(environment, tenant), environment?.OnPremise ?? true, tokenCache as TokenCache ?? TokenCache.DefaultShared);`
`32`	`32`	`var response = await auth.AcquireTokenAsync(`
`33`		`- environment.ActiveDirectoryServiceEndpointResourceId,`
	`33`	`+ environment.GetEndpoint(resourceId),`
`34`	`34`	`AuthenticationHelpers.PowerShellClientId,`
`35`	`35`	`new Uri(AuthenticationHelpers.PowerShellRedirectUri),`
`36`	`36`	`new PlatformParameters(AuthenticationHelpers.GetPromptBehavior(promptBehavior), new ConsoleParentWindow()),`