ios and android

Author: bgavrilMS

src/client/Microsoft.Identity.Client/ManagedIdentity/AbstractManagedIdentity.cs

@@ -12,11 +12,7 @@
 using System.Net;
 using Microsoft.Identity.Client.ApiConfig.Parameters;
 using System.Text;
-#if SUPPORTS_SYSTEM_TEXT_JSON
 using System.Text.Json;
-#else
-using Microsoft.Identity.Json;
-#endif
 
 namespace Microsoft.Identity.Client.ManagedIdentity
 {

src/client/Microsoft.Identity.Client/Platforms/Android/Broker/AndroidBrokerInteractiveResponseHelper.cs

@@ -1,18 +1,14 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Text.Json;
 using System.Threading;
-using System.Threading.Tasks;
 using Android.Content;
 using Microsoft.Identity.Client.Core;
 using Microsoft.Identity.Client.Http;
 using Microsoft.Identity.Client.Internal.Broker;
 using Microsoft.Identity.Client.OAuth2;
-using Microsoft.Identity.Json.Linq;
+using Microsoft.Identity.Client.Utils;
 
 namespace Microsoft.Identity.Client.Platforms.Android.Broker
 {
@@ -58,14 +54,15 @@ internal static void SetBrokerResult(Intent data, int resultCode, ILoggerAdapter
                     case (int)BrokerResponseCode.BrowserCodeError:
                         unreliableLogger?.Info("[Android broker] Response received - error. ");
 
-                        dynamic errorResult = JObject.Parse(data.GetStringExtra(BrokerConstants.BrokerResultV2));
+                        var errorResult = JsonHelper.DeserializeFromJson<BrokerErrorResult>
+                            (data.GetStringExtra(BrokerConstants.BrokerResultV2));
 
                         string error;
                         string errorDescription;
                         if (errorResult != null)
                         {
-                            error = errorResult[BrokerResponseConst.BrokerErrorCode]?.ToString();
-                            errorDescription = errorResult[BrokerResponseConst.BrokerErrorMessage]?.ToString();
+                            error = errorResult.BrokerErrorCode;
+                            errorDescription = errorResult.BrokerErrorMessage;
 
                             unreliableLogger?.Error($"[Android broker] error: {error} errorDescription {errorDescription}. ");
                         }
@@ -76,21 +73,22 @@ internal static void SetBrokerResult(Intent data, int resultCode, ILoggerAdapter
                             unreliableLogger?.Error("[Android broker] Error response received, but not error could be extracted. ");
                         }
 
-                        var httpResponse = new HttpResponse();
-                        //TODO: figure out how to get status code properly deserialized from JObject
-                        httpResponse.Body = errorResult[BrokerResponseConst.BrokerHttpBody]?.ToString();
+                        var httpResponse = new HttpResponse
+                        {
+                            Body = errorResult?.BrokerHttpBody
+                        };
 
                         InteractiveBrokerTokenResponse = new MsalTokenResponse
                         {
                             Error = error,
                             ErrorDescription = errorDescription,
-                            SubError = errorResult[BrokerResponseConst.BrokerSubError],
+                            SubError = errorResult?.BrokerSubError,
                             HttpResponse = httpResponse,
                             CorrelationId = InteractiveRequestCorrelationId,
-                            TenantId = errorResult[BrokerResponseConst.TenantId]?.ToString(),
-                            Upn = errorResult[BrokerResponseConst.UserName]?.ToString(),
-                            AccountUserId = errorResult[BrokerResponseConst.LocalAccountId]?.ToString(),
-                            AuthorityUrl = errorResult[BrokerResponseConst.Authority]?.ToString(),
+                            TenantId = errorResult?.TenantId,
+                            Upn = errorResult?.UserName,
+                            AccountUserId = errorResult?.LocalAccountId,
+                            AuthorityUrl = errorResult?.Authority,
                         };
                         break;
                     default:

src/client/Microsoft.Identity.Client/Platforms/Android/Broker/BrokerRequest.cs

@@ -159,4 +159,17 @@ internal class AccountInfo
         [JsonPropertyName("environment")]
         public string Environment { get; set; }
     }
+
+    [Preserve(AllMembers = true)]
+    internal class BrokerErrorResult
+    {
+        public string BrokerErrorCode { get; set; }
+        public string BrokerErrorMessage { get; set; }
+        public string BrokerHttpBody { get; set; }
+        public string BrokerSubError { get; set; }
+        public string TenantId { get; set; }
+        public string UserName { get; set; }
+        public string LocalAccountId { get; set; }
+        public string Authority { get; set; }
+    }
 }

src/client/Microsoft.Identity.Client/Platforms/iOS/IntuneEnrollmentIdHelper.cs

@@ -4,10 +4,10 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.Identity.Client.Core;
-using Microsoft.Identity.Json;
-#if iOS
+using System.Text.Json.Serialization;
+using Microsoft.Identity.Client.Utils;
 using Foundation;
-#endif
+using System.Text.Json;
 
 namespace Microsoft.Identity.Client.Platforms.iOS
 {
@@ -18,13 +18,12 @@ internal class IntuneEnrollmentIdHelper
 
         internal static string GetEnrollmentId(ILoggerAdapter logger)
         {
-#if iOS
             var keychainData = GetRawEnrollmentId();
             if(!string.IsNullOrEmpty(keychainData))
             {
                 try
                 {
-                    var enrollmentIDs = JsonConvert.DeserializeObject<EnrollmentIDs>(keychainData);
+                    var enrollmentIDs = JsonHelper.DeserializeFromJson<EnrollmentIDs>(keychainData);
 
                     if ((enrollmentIDs?.EnrollmentIds?.Count ?? 0) > 0)
                     {
@@ -33,69 +32,62 @@ internal static string GetEnrollmentId(ILoggerAdapter logger)
                 }
                 catch (JsonException jEx)
                 {
-                    logger.ErrorPii($"Failed to parse enrollmentID for KeychainData: {keychainData}", string.Empty);
+                    logger.Error($"Failed to parse enrollmentID for KeychainData");
                     logger.ErrorPii(jEx);
 
                     return string.Empty;
                 }
             }
-#endif
             return string.Empty;
         }
 
         internal static string GetRawEnrollmentId()
         {
-#if iOS
             var keychainData = NSUserDefaults.StandardUserDefaults.StringForKey(EnrollmentIdKey);
             return keychainData;
-#else
-            return string.Empty;
-#endif
         }
 
         internal static string GetRawMamResources()
         {
             var keychainData = NSUserDefaults.StandardUserDefaults.StringForKey(Intune_MamResourceKey);
             return keychainData;
         }
+    }
 
-        /// <summary>
-        /// This class corresponds to the EnrollmentIDs entry in the Keychain
-        /// </summary>
-        internal class EnrollmentIDs
-        {
-            private const string EnrollmentIdsKey = "enrollment_ids";
-
-            private const string HomeAccountIdKey = "home_account_id";
+    /// <summary>
+    /// This class corresponds to the EnrollmentIDs entry in the Keychain
+    /// </summary>
+    internal class EnrollmentIDs
+    {
+        [JsonPropertyName("enrollment_ids")]
+        public List<EnrollmentIdProps> EnrollmentIds { get; set; }
+    }
 
-            private const string TidsKey = "tid";
+    internal class EnrollmentIdProps
+    {
+        private const string HomeAccountIdKey = "home_account_id";
 
-            private const string UserIdKey = "user_id";
+        private const string TidsKey = "tid";
 
-            private const string OidKey = "oid";
+        private const string UserIdKey = "user_id";
 
-            private const string EnrollmentIdKey = "enrollment_id";
+        private const string OidKey = "oid";
 
-            internal class EnrollmentIdProps
-            {
-                [JsonProperty(PropertyName = HomeAccountIdKey)]
-                public string HomeAccountId { get; set; }
+        private const string EnrollmentIdKey = "enrollment_id";
 
-                [JsonProperty(PropertyName = TidsKey)]
-                public string Tid { get; set; }
+        [JsonPropertyName(HomeAccountIdKey)]
+        public string HomeAccountId { get; set; }
 
-                [JsonProperty(PropertyName = UserIdKey)]
-                public string UserId { get; set; }
+        [JsonPropertyName(TidsKey)]
+        public string Tid { get; set; }
 
-                [JsonProperty(PropertyName = OidKey)]
-                public string Oid { get; set; }
+        [JsonPropertyName(UserIdKey)]
+        public string UserId { get; set; }
 
-                [JsonProperty(PropertyName = EnrollmentIdKey)]
-                public string EnrollmentId { get; set; }
-            }
+        [JsonPropertyName(OidKey)]
+        public string Oid { get; set; }
 
-            [JsonProperty(PropertyName = EnrollmentIdsKey)]
-            public List<EnrollmentIdProps> EnrollmentIds { get; set; }
-        }
+        [JsonPropertyName(EnrollmentIdKey)]
+        public string EnrollmentId { get; set; }
     }
 }

src/client/Microsoft.Identity.Client/json/MsalJsonSerializerContext.cs

@@ -16,6 +16,7 @@
 using Microsoft.Identity.Client.Region;
 using Microsoft.Identity.Client.WsTrust;
 
+
 namespace Microsoft.Identity.Client.Platforms.Json
 {
     /// <summary>
@@ -43,6 +44,9 @@ namespace Microsoft.Identity.Client.Platforms.Json
     [JsonSerializable(typeof(Android.Broker.BrokerErrorResponse))]    
     [JsonSerializable(typeof(Android.Broker.BrokerRequest))]
     [JsonSerializable(typeof(List<Android.Broker.AccountData>))]
+#endif
+#if iOS
+    [JsonSerializable(typeof(iOS.EnrollmentIDs))]
 #endif
     [JsonSourceGenerationOptions]
     internal partial class MsalJsonSerializerContext : JsonSerializerContext