Explicitly provide tenantId from configuration if not specified when …

…obtaining token via client_credentials. Streamline argument validation.
AzureAD · Dec 2, 2020 · 9e705ba · 9e705ba
1 parent 76f11e8
commit 9e705ba
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Microsoft.Identity.Web/TokenAcquisition.cs b/src/Microsoft.Identity.Web/TokenAcquisition.cs
@@ -271,14 +271,14 @@ public async Task<string> GetAccessTokenForAppAsync(
                 throw new ArgumentException(IDWebErrorMessage.ClientCredentialScopeParameterShouldEndInDotDefault, nameof(scope));
             }
 
-            if (!string.IsNullOrEmpty(tenant) && _metaTenantIdentifiers.Contains(tenant))
+            if (string.IsNullOrEmpty(tenant))
             {
-                throw new ArgumentException(IDWebErrorMessage.ClientCredentialTenantShouldBeTenanted, nameof(tenant));
+                tenant = _applicationOptions.TenantId ?? _microsoftIdentityOptions.TenantId;
             }
 
-            if (!string.IsNullOrEmpty(_microsoftIdentityOptions.TenantId) && _metaTenantIdentifiers.Contains(_microsoftIdentityOptions.TenantId))
+            if (!string.IsNullOrEmpty(tenant) && _metaTenantIdentifiers.Contains(tenant))
             {
-                throw new ArgumentException(IDWebErrorMessage.ClientCredentialTenantShouldBeTenanted, nameof(_microsoftIdentityOptions.TenantId));
+                throw new ArgumentException(IDWebErrorMessage.ClientCredentialTenantShouldBeTenanted, nameof(tenant));
             }
 
             // Use MSAL to get the right token to call the API