Remove jsonObject

bgavrilMS · bgavrilMS · commit 90075245ff84 · 2025-01-07T14:12:24.000Z
diff --git a/src/client/Microsoft.Identity.Client/Cache/Adal/AdalResult.cs b/src/client/Microsoft.Identity.Client/Cache/Adal/AdalResult.cs
@@ -10,7 +10,6 @@ namespace Microsoft.Identity.Client.Cache
     /// 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
     {
diff --git a/src/client/Microsoft.Identity.Client/Cache/Adal/AdalResultWrapper.cs b/src/client/Microsoft.Identity.Client/Cache/Adal/AdalResultWrapper.cs
@@ -6,7 +6,6 @@
 
 namespace Microsoft.Identity.Client.Cache
 {
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal class AdalResultWrapper
     {
diff --git a/src/client/Microsoft.Identity.Client/Cache/Adal/AdalUserInfo.cs b/src/client/Microsoft.Identity.Client/Cache/Adal/AdalUserInfo.cs
@@ -10,7 +10,6 @@ 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
     {
diff --git a/src/client/Microsoft.Identity.Client/Instance/Discovery/InstanceDiscoveryMetadataEntry.cs b/src/client/Microsoft.Identity.Client/Instance/Discovery/InstanceDiscoveryMetadataEntry.cs
@@ -6,7 +6,6 @@
 
 namespace Microsoft.Identity.Client.Instance.Discovery
 {
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal sealed class InstanceDiscoveryMetadataEntry
     {
diff --git a/src/client/Microsoft.Identity.Client/Instance/Discovery/InstanceDiscoveryResponse.cs b/src/client/Microsoft.Identity.Client/Instance/Discovery/InstanceDiscoveryResponse.cs
@@ -7,7 +7,6 @@
 
 namespace Microsoft.Identity.Client.Instance.Discovery
 {
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal sealed class InstanceDiscoveryResponse : OAuth2ResponseBase
     {
diff --git a/src/client/Microsoft.Identity.Client/Instance/Oidc/OidcMetadata.cs b/src/client/Microsoft.Identity.Client/Instance/Oidc/OidcMetadata.cs
@@ -1,17 +1,10 @@
 ﻿// 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.Threading.Tasks;
-using Microsoft.Identity.Client.Platforms.net;
 using JsonProperty = System.Text.Json.Serialization.JsonPropertyNameAttribute;
 
 namespace Microsoft.Identity.Client.Instance.Oidc
 {
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal class OidcMetadata
     {
diff --git a/src/client/Microsoft.Identity.Client/Instance/Region/LocalImdsErrorResponse.cs b/src/client/Microsoft.Identity.Client/Instance/Region/LocalImdsErrorResponse.cs
@@ -7,7 +7,6 @@
 
 namespace Microsoft.Identity.Client.Region
 {
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal sealed class LocalImdsErrorResponse
     {
diff --git a/src/client/Microsoft.Identity.Client/Instance/Validation/AdfsWebFingerResponse.cs b/src/client/Microsoft.Identity.Client/Instance/Validation/AdfsWebFingerResponse.cs
@@ -16,8 +16,7 @@ internal class AdfsWebFingerResponseClaim : OAuth2ResponseBaseClaim
         public const string Rel = "rel";
         public const string Href = "href";
     }
-
-    [JsonObject(Title = AdfsWebFingerResponseClaim.Links)]
+    
     [Preserve(AllMembers = true)]
     internal class LinksList
     {
@@ -27,8 +26,7 @@ internal class LinksList
         [JsonProperty(AdfsWebFingerResponseClaim.Href)]
         public string Href { get; set; }
     }
-
-    [JsonObject]
+    
     [Preserve(AllMembers = true)]
     internal class AdfsWebFingerResponse : OAuth2ResponseBase
     {
diff --git a/src/client/Microsoft.Identity.Client/Internal/ClientInfo.cs b/src/client/Microsoft.Identity.Client/Internal/ClientInfo.cs
@@ -9,8 +9,7 @@
 
 namespace Microsoft.Identity.Client.Internal
 {
-
-    [JsonObject]
+    
     [Preserve(AllMembers = true)]
     internal class ClientInfo
     {
diff --git a/src/client/Microsoft.Identity.Client/Internal/DeviceCodeResponse.cs b/src/client/Microsoft.Identity.Client/Internal/DeviceCodeResponse.cs
@@ -10,7 +10,6 @@
 
 namespace Microsoft.Identity.Client.Internal
 {
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal class DeviceCodeResponse : OAuth2ResponseBase
     {
diff --git a/src/client/Microsoft.Identity.Client/ManagedIdentity/ManagedIdentityErrorResponse.cs b/src/client/Microsoft.Identity.Client/ManagedIdentity/ManagedIdentityErrorResponse.cs
@@ -8,7 +8,6 @@
 
 namespace Microsoft.Identity.Client.ManagedIdentity
 {
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal class ManagedIdentityErrorResponse
     {
diff --git a/src/client/Microsoft.Identity.Client/ManagedIdentity/ManagedIdentityResponse.cs b/src/client/Microsoft.Identity.Client/ManagedIdentity/ManagedIdentityResponse.cs
@@ -8,7 +8,6 @@
 
 namespace Microsoft.Identity.Client.ManagedIdentity
 {
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal class ManagedIdentityResponse
     {
diff --git a/src/client/Microsoft.Identity.Client/OAuth2/DeviceAuthJWTResponse.cs b/src/client/Microsoft.Identity.Client/OAuth2/DeviceAuthJWTResponse.cs
@@ -12,7 +12,6 @@
 
 namespace Microsoft.Identity.Client.OAuth2
 {
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal class DeviceAuthHeader
     {
@@ -34,7 +33,6 @@ public DeviceAuthHeader(string base64EncodedCertificate)
         public string Alg { get; private set; }
     }
 
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal class DeviceAuthPayload
     {
diff --git a/src/client/Microsoft.Identity.Client/OAuth2/MsalTokenResponse.cs b/src/client/Microsoft.Identity.Client/OAuth2/MsalTokenResponse.cs
@@ -46,7 +46,6 @@ internal class TokenResponseClaim : OAuth2ResponseBaseClaim
         public const string SpaCode = "spa_code";
     }
 
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal class MsalTokenResponse : OAuth2ResponseBase
     {
diff --git a/src/client/Microsoft.Identity.Client/OAuth2/OAuth2ResponseBase.cs b/src/client/Microsoft.Identity.Client/OAuth2/OAuth2ResponseBase.cs
@@ -16,7 +16,6 @@ internal class OAuth2ResponseBaseClaim
         public const string CorrelationId = "correlation_id";
     }
 
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal class OAuth2ResponseBase
     {
diff --git a/src/client/Microsoft.Identity.Client/Platforms/Android/Broker/AndroidContentProviderBroker.cs b/src/client/Microsoft.Identity.Client/Platforms/Android/Broker/AndroidContentProviderBroker.cs
@@ -17,7 +17,6 @@
 using Microsoft.Identity.Client.OAuth2;
 using Microsoft.Identity.Client.UI;
 using Microsoft.Identity.Client.Utils;
-using Microsoft.Identity.Json.Linq;
 using AndroidNative = Android;
 using AndroidUri = Android.Net.Uri;
 
@@ -73,6 +72,8 @@ public string GetProtocolKeyFromHandShakeResult(Bundle bundleResult)
                 return negotiatedBrokerProtocalKey;
             }
 
+            // json response: {"broker_error_code":"500","broker_error_message":"Broker is not installed on the device."}
+            
             dynamic errorResult = JObject.Parse(bundleResult?.GetString(BrokerConstants.BrokerResultV2));
             string errorCode = null;
             string errorDescription = null;
diff --git a/src/client/Microsoft.Identity.Client/Platforms/Android/Broker/BrokerRequest.cs b/src/client/Microsoft.Identity.Client/Platforms/Android/Broker/BrokerRequest.cs
@@ -8,8 +8,8 @@
 using Microsoft.Identity.Client.ApiConfig.Parameters;
 using Microsoft.Identity.Client.Internal;
 using Microsoft.Identity.Client.Internal.Requests;
+using Microsoft.Identity.Client.Platforms.net;
 using Microsoft.Identity.Client.Utils;
-using Microsoft.Identity.Json;
 
 namespace Microsoft.Identity.Client.Platforms.Android.Broker
 {
diff --git a/src/client/Microsoft.Identity.Client/UI/AuthorizationResult.cs b/src/client/Microsoft.Identity.Client/UI/AuthorizationResult.cs
@@ -18,7 +18,6 @@ internal enum AuthorizationStatus
         UnknownError
     }
 
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal class AuthorizationResult
     {
diff --git a/src/client/Microsoft.Identity.Client/WsTrust/UserRealmDiscoveryResponse.cs b/src/client/Microsoft.Identity.Client/WsTrust/UserRealmDiscoveryResponse.cs
@@ -7,7 +7,6 @@
 
 namespace Microsoft.Identity.Client.WsTrust
 {
-    [JsonObject]
     [Preserve(AllMembers = true)]
     internal sealed class UserRealmDiscoveryResponse
     {
diff --git a/src/client/Microsoft.Identity.Client/json/JsonObjectAttribute.cs b/src/client/Microsoft.Identity.Client/json/JsonObjectAttribute.cs
diff --git a/tests/Microsoft.Identity.Test.Unit/UtilTests/JsonHelperTests.cs b/tests/Microsoft.Identity.Test.Unit/UtilTests/JsonHelperTests.cs
@@ -167,9 +167,7 @@ public void Deserialize_TokenResponse()
         }
 
         [DataTestMethod]
-        [DataRow("{\"name\":\"John\", \"age\":30}", "{\"age\":40, \"city\":\"New York\"}", "{\"name\":\"John\", \"age\":40, \"city\":\"New York\"}")]
-        [DataRow("[1, 2, 3]", "[4, 5, 6]", "[1, 2, 3, 4, 5, 6]")]
-        [DataRow("[1, 2, 5]", "[3, 5, 6]", "[1, 2, 5, 3, 5, 6]")]
+        [DataRow("{\"name\":\"John\", \"age\":30}", "{\"age\":40, \"city\":\"New York\"}", "{\"name\":\"John\", \"age\":40, \"city\":\"New York\"}")]        
         [DataRow("{\"numbers\":[1, 2, 3]}", "{\"numbers\":[4, 5, 6]}", "{\"numbers\":[1, 2, 3, 4, 5, 6]}")]
         [DataRow("{\"value\":10}", "{\"value\":20}", "{\"value\":20}")]
         [DataRow("{}", "{\"name\":\"John\", \"age\":30}", "{\"name\":\"John\", \"age\":30}")]

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ namespace Microsoft.Identity.Client.Cache`
`10`	`10`	`/// Contains the results of an ADAL token acquisition. Access Tokens from ADAL are not compatible`
`11`	`11`	`/// with MSAL, only Refresh Tokens are.`
`12`	`12`	`/// </summary>`
`13`		`- [JsonObject]`
`14`	`13`	`[Preserve(AllMembers = true)]`
`15`	`14`	`internal sealed class AdalResult`
`16`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`namespace Microsoft.Identity.Client.Cache`
`8`	`8`	`{`
`9`		`- [JsonObject]`
`10`	`9`	`[Preserve(AllMembers = true)]`
`11`	`10`	`internal class AdalResultWrapper`
`12`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`namespace Microsoft.Identity.Client.Instance.Discovery`
`8`	`8`	`{`
`9`		`- [JsonObject]`
`10`	`9`	`[Preserve(AllMembers = true)]`
`11`	`10`	`internal sealed class InstanceDiscoveryMetadataEntry`
`12`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`namespace Microsoft.Identity.Client.Instance.Discovery`
`9`	`9`	`{`
`10`		`- [JsonObject]`
`11`	`10`	`[Preserve(AllMembers = true)]`
`12`	`11`	`internal sealed class InstanceDiscoveryResponse : OAuth2ResponseBase`
`13`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`
`8`	`8`	`namespace Microsoft.Identity.Client.Region`
`9`	`9`	`{`
`10`		`- [JsonObject]`
`11`	`10`	`[Preserve(AllMembers = true)]`
`12`	`11`	`internal sealed class LocalImdsErrorResponse`
`13`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@ internal class AdfsWebFingerResponseClaim : OAuth2ResponseBaseClaim`
`16`	`16`	`public const string Rel = "rel";`
`17`	`17`	`public const string Href = "href";`
`18`	`18`	`}`
`19`		`-`
`20`		`- [JsonObject(Title = AdfsWebFingerResponseClaim.Links)]`
	`19`	`+`
`21`	`20`	`[Preserve(AllMembers = true)]`
`22`	`21`	`internal class LinksList`
`23`	`22`	`{`
`@@ -27,8 +26,7 @@ internal class LinksList`
`27`	`26`	`[JsonProperty(AdfsWebFingerResponseClaim.Href)]`
`28`	`27`	`public string Href { get; set; }`
`29`	`28`	`}`
`30`		`-`
`31`		`- [JsonObject]`
	`29`	`+`
`32`	`30`	`[Preserve(AllMembers = true)]`
`33`	`31`	`internal class AdfsWebFingerResponse : OAuth2ResponseBase`
`34`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace Microsoft.Identity.Client.Internal`
`11`	`11`	`{`
`12`		`-`
`13`		`- [JsonObject]`
	`12`	`+`
`14`	`13`	`[Preserve(AllMembers = true)]`
`15`	`14`	`internal class ClientInfo`
`16`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`
`11`	`11`	`namespace Microsoft.Identity.Client.Internal`
`12`	`12`	`{`
`13`		`- [JsonObject]`
`14`	`13`	`[Preserve(AllMembers = true)]`
`15`	`14`	`internal class DeviceCodeResponse : OAuth2ResponseBase`
`16`	`15`	`{`