Az.StackHCI - Pass GraphAccessToken to Connect-AzAccount (#15193) (#15203)

msJinLei · digot007 · web-flow · commit df0415227631 · 2021-06-08T20:11:05.000+08:00
New-AzRoleAssignment Cmdlet needs graph token, so during Connect-AzAccount pass GraphAccessToken

Co-authored-by: digot007 &lt;digot@microsoft.com&gt;
diff --git a/src/StackHCI/Az.StackHCI.psm1 b/src/StackHCI/Az.StackHCI.psm1
@@ -910,11 +910,11 @@ param(
 
         if([string]::IsNullOrEmpty($TenantId))
         {
-            Connect-AzAccount -Environment $ConnectAzAccountEnvironmentName -SubscriptionId $SubscriptionId -AccessToken $ArmAccessToken -AccountId $AccountId -Scope Process | Out-Null
+            Connect-AzAccount -Environment $ConnectAzAccountEnvironmentName -SubscriptionId $SubscriptionId -AccessToken $ArmAccessToken -AccountId $AccountId -GraphAccessToken $GraphAccessToken -Scope Process | Out-Null
         }
         else
         {
-            Connect-AzAccount -Environment $ConnectAzAccountEnvironmentName -TenantId $TenantId -SubscriptionId $SubscriptionId -AccessToken $ArmAccessToken -AccountId $AccountId -Scope Process | Out-Null
+            Connect-AzAccount -Environment $ConnectAzAccountEnvironmentName -TenantId $TenantId -SubscriptionId $SubscriptionId -AccessToken $ArmAccessToken -AccountId $AccountId -GraphAccessToken $GraphAccessToken -Scope Process | Out-Null
         }
 
         Write-Progress -Id $MainProgressBarId -activity $ProgressActivityName -status $ConnectingToAzureAD -percentcomplete 35

Original file line number	Diff line number	Diff line change
`@@ -910,11 +910,11 @@ param(`
`910`	`910`
`911`	`911`	`if([string]::IsNullOrEmpty($TenantId))`
`912`	`912`	`{`
`913`		`- Connect-AzAccount -Environment $ConnectAzAccountEnvironmentName -SubscriptionId $SubscriptionId -AccessToken $ArmAccessToken -AccountId $AccountId -Scope Process \| Out-Null`
	`913`	`+ Connect-AzAccount -Environment $ConnectAzAccountEnvironmentName -SubscriptionId $SubscriptionId -AccessToken $ArmAccessToken -AccountId $AccountId -GraphAccessToken $GraphAccessToken -Scope Process \| Out-Null`
`914`	`914`	`}`
`915`	`915`	`else`
`916`	`916`	`{`
`917`		`- Connect-AzAccount -Environment $ConnectAzAccountEnvironmentName -TenantId $TenantId -SubscriptionId $SubscriptionId -AccessToken $ArmAccessToken -AccountId $AccountId -Scope Process \| Out-Null`
	`917`	`+ Connect-AzAccount -Environment $ConnectAzAccountEnvironmentName -TenantId $TenantId -SubscriptionId $SubscriptionId -AccessToken $ArmAccessToken -AccountId $AccountId -GraphAccessToken $GraphAccessToken -Scope Process \| Out-Null`
`918`	`918`	`}`
`919`	`919`
`920`	`920`	`Write-Progress -Id $MainProgressBarId -activity $ProgressActivityName -status $ConnectingToAzureAD -percentcomplete 35`