Fixup product code

Author: bgavrilMS

src/client/Microsoft.Identity.Client/ApiConfig/AcquireTokenForClientParameterBuilder.cs

@@ -135,7 +135,8 @@ protected override void Validate()
             {
                 string authorityUri = ServiceBundle.Config.Authority.AuthorityInfo.CanonicalAuthority.AbsoluteUri;
 
-                if (ServiceBundle.Config.Authority.AuthorityInfo.AuthorityType != AuthorityType.Aad)
+                if (ServiceBundle.Config.Authority.AuthorityInfo.AuthorityType != AuthorityType.Aad && 
+                    ServiceBundle.Config.Authority.AuthorityInfo.AuthorityType != AuthorityType.Dsts)
                 {
                     throw new MsalClientException(
                         MsalError.InvalidAuthorityType,
@@ -149,7 +150,9 @@ protected override void Validate()
                         MsalErrorMessage.MtlsNonTenantedAuthorityNotAllowedMessage);
                 }
 
-                if (string.IsNullOrEmpty(ServiceBundle.Config.AzureRegion))
+                // Check for Azure region only if the authority is AAD
+                if (ServiceBundle.Config.Authority.AuthorityInfo.AuthorityType == AuthorityType.Aad &&
+                    string.IsNullOrEmpty(ServiceBundle.Config.AzureRegion))
                 {
                     throw new MsalClientException(
                         MsalError.MtlsPopWithoutRegion,

src/client/Microsoft.Identity.Client/AppConfig/AbstractApplicationBuilder.cs

@@ -13,11 +13,7 @@
 using Microsoft.Identity.Client.PlatformsCommon.Interfaces;
 using Microsoft.Identity.Client.Utils;
 using Microsoft.IdentityModel.Abstractions;
-#if SUPPORTS_SYSTEM_TEXT_JSON
 using System.Text.Json;
-#else
-using Microsoft.Identity.Json;
-#endif
 
 namespace Microsoft.Identity.Client
 {

src/client/Microsoft.Identity.Client/AppConfig/BaseAbstractApplicationBuilder.cs

@@ -14,11 +14,7 @@
 using Microsoft.Identity.Client.Utils;
 using Microsoft.IdentityModel.Abstractions;
 using Microsoft.Identity.Client.Internal;
-#if SUPPORTS_SYSTEM_TEXT_JSON
 using System.Text.Json;
-#else
-using Microsoft.Identity.Json;
-#endif
 
 namespace Microsoft.Identity.Client
 {

src/client/Microsoft.Identity.Client/AppConfig/TraceTelemetryConfig.cs

@@ -6,11 +6,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using Microsoft.Identity.Client.Utils;
-#if SUPPORTS_SYSTEM_TEXT_JSON
 using JObject = System.Text.Json.Nodes.JsonObject;
-#else
-using Microsoft.Identity.Json.Linq;
-#endif
 
 namespace Microsoft.Identity.Client
 {

src/client/Microsoft.Identity.Client/AuthScheme/PoP/PopAuthenticationOperation.cs

@@ -11,13 +11,8 @@
 using Microsoft.Identity.Client.Internal;
 using Microsoft.Identity.Client.OAuth2;
 using Microsoft.Identity.Client.Utils;
-#if SUPPORTS_SYSTEM_TEXT_JSON
 using JObject = System.Text.Json.Nodes.JsonObject;
 using JToken = System.Text.Json.Nodes.JsonNode;
-#else
-using Microsoft.Identity.Json;
-using Microsoft.Identity.Json.Linq;
-#endif
 
 namespace Microsoft.Identity.Client.AuthScheme.PoP
 {

src/client/Microsoft.Identity.Client/Cache/Adal/AdalResult.cs

@@ -1,20 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-#if SUPPORTS_SYSTEM_TEXT_JSON
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JsonProperty = System.Text.Json.Serialization.JsonIncludeAttribute;
-#else
-using Microsoft.Identity.Json;
-#endif
 
 namespace Microsoft.Identity.Client.Cache
 {
     /// <summary>
     /// Contains the results of an ADAL token acquisition. Access Tokens from ADAL are not compatible 
     /// with MSAL, only Refresh Tokens are.
     /// </summary>
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal sealed class AdalResult
     {

src/client/Microsoft.Identity.Client/Cache/Adal/AdalResultWrapper.cs

@@ -2,35 +2,20 @@
 // Licensed under the MIT License.
 
 using Microsoft.Identity.Client.Utils;
-#if SUPPORTS_SYSTEM_TEXT_JSON
-using Microsoft.Identity.Client.Platforms.net;
-#else
-using Microsoft.Identity.Json;
-#endif
+using Microsoft.Identity.Client.Platforms.Json;
 
 namespace Microsoft.Identity.Client.Cache
 {
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal class AdalResultWrapper
     {
-
-#if !SUPPORTS_SYSTEM_TEXT_JSON
-        [JsonProperty]
-#endif
         public AdalResult Result { get; set; }
 
-#if !SUPPORTS_SYSTEM_TEXT_JSON
-        [JsonProperty]
-#endif
         public string RawClientInfo { get; set; }
 
         /// <summary>
         /// Gets the Refresh Token associated with the requested Access Token. Note: not all operations will return a Refresh Token.
         /// </summary>
-#if !SUPPORTS_SYSTEM_TEXT_JSON
-        [JsonProperty]
-#endif
         public string RefreshToken { get; set; }
 
         /// <summary>
@@ -40,9 +25,6 @@ internal class AdalResultWrapper
 
         // This is only needed for AcquireTokenByAuthorizationCode in which parameter resource is optional and we need
         // to get it from the STS response.
-#if !SUPPORTS_SYSTEM_TEXT_JSON
-        [JsonProperty]
-#endif
         internal string ResourceInResponse { get; set; }
 
         /// <summary>
@@ -63,9 +45,6 @@ public string Serialize()
             return JsonHelper.SerializeToJson(this);
         }
 
-#if !SUPPORTS_SYSTEM_TEXT_JSON
-        [JsonProperty]
-#endif
         public string UserAssertionHash { get; set; }
 
         internal AdalResultWrapper Clone()

src/client/Microsoft.Identity.Client/Cache/Adal/AdalUserInfo.cs

@@ -2,19 +2,14 @@
 // Licensed under the MIT License.
 
 using System;
-#if SUPPORTS_SYSTEM_TEXT_JSON
-using Microsoft.Identity.Client.Platforms.net;
+using Microsoft.Identity.Client.Platforms.Json;
 using JsonProperty = System.Text.Json.Serialization.JsonIncludeAttribute;
-#else
-using Microsoft.Identity.Json;
-#endif
 
 namespace Microsoft.Identity.Client.Cache
 {
     /// <summary>
     /// Contains information of a single user. This information is used for token cache lookup. Also if created with userId, userId is sent to the service when login_hint is accepted.
     /// </summary>
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal sealed class AdalUserInfo
     {

src/client/Microsoft.Identity.Client/Cache/ITokenCacheSerializable.cs

@@ -2,11 +2,7 @@
 // Licensed under the MIT License.
 
 using System.Collections.Generic;
-#if SUPPORTS_SYSTEM_TEXT_JSON
 using JToken = System.Text.Json.Nodes.JsonNode;
-#else
-using Microsoft.Identity.Json.Linq;
-#endif
 
 namespace Microsoft.Identity.Client.Cache
 {

src/client/Microsoft.Identity.Client/Cache/Items/CacheSerializationContract.cs

@@ -4,26 +4,19 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-#if SUPPORTS_SYSTEM_TEXT_JSON
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using JObject = System.Text.Json.Nodes.JsonObject;
 using JToken = System.Text.Json.Nodes.JsonNode;
-#else
-using Microsoft.Identity.Json;
-using Microsoft.Identity.Json.Linq;
-#endif
 
 namespace Microsoft.Identity.Client.Cache.Items
 {
     internal class CacheSerializationContract
     {
-#if SUPPORTS_SYSTEM_TEXT_JSON
         private static readonly JsonSerializerOptions NeverIgnoreJsonOptions = new()
         {
             DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.Never
         };
-#endif
 
         private static readonly IEnumerable<string> s_knownPropertyNames = new[] {
                 StorageJsonValues.CredentialTypeAccessToken,
@@ -56,14 +49,11 @@ public CacheSerializationContract(IDictionary<string, JToken> unknownNodes)
 
         internal static CacheSerializationContract FromJsonString(string json)
         {
-#if SUPPORTS_SYSTEM_TEXT_JSON
             var root = JsonNode.Parse(json, documentOptions: new JsonDocumentOptions
             {
                 AllowTrailingCommas = true
             }).AsObject();
-#else
-            var root = JObject.Parse(json);
-#endif
+
             var unknownNodes = ExtractUnknownNodes(root);
 
             var contract = new CacheSerializationContract(unknownNodes);
@@ -136,32 +126,19 @@ internal static CacheSerializationContract FromJsonString(string json)
             return contract;
 
             // private method for enumerating collection
-#if SUPPORTS_SYSTEM_TEXT_JSON
             static IEnumerable<JsonObject> GetElement(JsonObject root, string key)
             {
                 foreach (var token in root[key].AsObject())
                 {
                     yield return token.Value as JObject;
                 }
             }
-#else
-            static IEnumerable<JObject> GetElement(JObject root, string key)
-            {
-                foreach (var token in root[key].Values())
-                {
-                    yield return token as JObject;
-                }
-            }
-#endif
+
         }
 
         private static IDictionary<string, JToken> ExtractUnknownNodes(JObject root)
         {
-#if SUPPORTS_SYSTEM_TEXT_JSON
             return root
-#else
-            return (root as IDictionary<string, JToken>)
-#endif
                 .Where(kvp => !s_knownPropertyNames.Any(p => string.Equals(kvp.Key, p, StringComparison.OrdinalIgnoreCase)))
                 .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
         }
@@ -218,23 +195,10 @@ internal string ToJsonString()
             // Anything else
             foreach (var kvp in UnknownNodes)
             {
-#if SUPPORTS_SYSTEM_TEXT_JSON
                 root[kvp.Key] = kvp.Value != null ? JToken.Parse(kvp.Value.ToJsonString()) : null;
-#else
-                root[kvp.Key] = kvp.Value;
-#endif
             }
-#if SUPPORTS_SYSTEM_TEXT_JSON
+
             return root.ToJsonString(NeverIgnoreJsonOptions);
-#else
-            return JsonConvert.SerializeObject(
-                root,
-                Formatting.None,
-                new JsonSerializerSettings
-                {
-                    NullValueHandling = NullValueHandling.Include
-                });
-#endif
         }
     }
 }