MSAL - Authority is added for national clouds (#18222) (#18256)

* - authority is fixed for national clouds
microsoft · May 9, 2023 · b403dcc · b403dcc
1 parent 26acee3
commit b403dcc
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 16 deletions.
diff --git a/Tasks/AzureFileCopyV1/task.json b/Tasks/AzureFileCopyV1/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 1,
         "Minor": 221,
-        "Patch": 102
+        "Patch": 103
     },
     "demands": [
         "azureps"

diff --git a/Tasks/AzureFileCopyV1/task.loc.json b/Tasks/AzureFileCopyV1/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 1,
     "Minor": 221,
-    "Patch": 102
+    "Patch": 103
   },
   "demands": [
     "azureps"

diff --git a/Tasks/AzureFileCopyV2/task.json b/Tasks/AzureFileCopyV2/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 2,
         "Minor": 221,
-        "Patch": 102
+        "Patch": 103
     },
     "demands": [
         "azureps"

diff --git a/Tasks/AzureFileCopyV2/task.loc.json b/Tasks/AzureFileCopyV2/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 2,
     "Minor": 221,
-    "Patch": 102
+    "Patch": 103
   },
   "demands": [
     "azureps"

diff --git a/Tasks/AzureFileCopyV3/task.json b/Tasks/AzureFileCopyV3/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 3,
         "Minor": 221,
-        "Patch": 102
+        "Patch": 103
     },
     "demands": [
         "azureps"

diff --git a/Tasks/AzureFileCopyV3/task.loc.json b/Tasks/AzureFileCopyV3/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 3,
     "Minor": 221,
-    "Patch": 102
+    "Patch": 103
   },
   "demands": [
     "azureps"

diff --git a/Tasks/AzureFileCopyV4/task.json b/Tasks/AzureFileCopyV4/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 4,
         "Minor": 221,
-        "Patch": 102
+        "Patch": 103
     },
     "demands": [
         "azureps"

diff --git a/Tasks/AzureFileCopyV4/task.loc.json b/Tasks/AzureFileCopyV4/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 4,
     "Minor": 221,
-    "Patch": 102
+    "Patch": 103
   },
   "demands": [
     "azureps"

diff --git a/Tasks/AzureFileCopyV5/task.json b/Tasks/AzureFileCopyV5/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 5,
         "Minor": 221,
-        "Patch": 102
+        "Patch": 103
     },
     "demands": [
         "azureps"

diff --git a/Tasks/AzureFileCopyV5/task.loc.json b/Tasks/AzureFileCopyV5/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 5,
     "Minor": 221,
-    "Patch": 102
+    "Patch": 103
   },
   "demands": [
     "azureps"

diff --git a/Tasks/Common/VstsAzureRestHelpers_/VstsAzureRestHelpers_.psm1 b/Tasks/Common/VstsAzureRestHelpers_/VstsAzureRestHelpers_.psm1
@@ -370,28 +370,28 @@ function Build-MSALInstance {
         # load the MSAL library
         Add-Type -Path "$PSScriptRoot\msal\Microsoft.Identity.Client.dll"
 
-        $clientBuilder = [Microsoft.Identity.Client.ConfidentialClientApplicationBuilder]::Create($clientId)
+        $clientBuilder = [Microsoft.Identity.Client.ConfidentialClientApplicationBuilder]::Create($clientId).WithAuthority($envAuthUrl, $tenantId)
 
         if ($Endpoint.Auth.Parameters.AuthenticationType -eq 'SPNCertificate') {
             Write-Verbose "MSAL - ServicePrincipal - certificate is used.";
 
             $pemFileContent = $endpoint.Auth.Parameters.ServicePrincipalCertificate
             $pfxFilePath, $pfxFilePassword = ConvertTo-Pfx -pemFileContent $pemFileContent
             $clientCertificate = Get-PfxCertificate -pfxFilePath $pfxFilePath -pfxFilePassword $pfxFilePassword
-            $msalClientInstance = $clientBuilder.WithTenantId($tenantId).WithCertificate($clientCertificate).Build()
+            $msalClientInstance = $clientBuilder.WithCertificate($clientCertificate).Build()
         }
         elseif ($endpoint.Auth.Scheme -eq $wifConnection) {
             Write-Verbose "MSAL - WorkloadIdentityFederation is used";
 
             $oidc_token = Get-VstsFederatedToken -serviceConnectionId $connectedServiceNameARM -vstsAccessToken $vstsAccessToken
 
-            $msalClientInstance = $clientBuilder.WithTenantId($tenantId).WithClientAssertion($oidc_token).Build()
+            $msalClientInstance = $clientBuilder.WithClientAssertion($oidc_token).Build()
         }
         else {
             Write-Verbose "MSAL - ServicePrincipal - clientSecret is used.";
 
             $clientSecret = $endpoint.Auth.Parameters.ServicePrincipalKey
-            $msalClientInstance = $clientBuilder.WithTenantId($tenantId).WithClientSecret($clientSecret).Build()
+            $msalClientInstance = $clientBuilder.WithClientSecret($clientSecret).Build()
         }
 
         return $msalClientInstance

diff --git a/Tasks/SqlAzureDacpacDeploymentV1/task.json b/Tasks/SqlAzureDacpacDeploymentV1/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 1,
         "Minor": 221,
-        "Patch": 102
+        "Patch": 103
     },
     "demands": [
         "sqlpackage"

diff --git a/Tasks/SqlAzureDacpacDeploymentV1/task.loc.json b/Tasks/SqlAzureDacpacDeploymentV1/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 1,
     "Minor": 221,
-    "Patch": 102
+    "Patch": 103
   },
   "demands": [
     "sqlpackage"