Skip to content

Commit e45e25c

Browse files
committed
Remove Newtonsoft.Json references
1 parent 58d726a commit e45e25c

15 files changed

+112
-118
lines changed

src/Umbraco.Cms.Integrations.Crm.Dynamics/DynamicsComposer.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
using Microsoft.Extensions.DependencyInjection;
1+
global using System.Text.Json;
2+
global using System.Text.Json.Serialization;
3+
4+
using Microsoft.Extensions.DependencyInjection;
25
using Umbraco.Cms.Core.Composing;
36
using Umbraco.Cms.Core.DependencyInjection;
47
using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
@@ -34,9 +37,9 @@ public void Compose(IUmbracoBuilder builder)
3437
};
3538
});
3639

37-
builder.Services.AddSingleton<DynamicsService>();
40+
builder.Services.AddSingleton<IDynamicsConfigurationStorage, DynamicsConfigurationStorage>();
3841

39-
builder.Services.AddSingleton<DynamicsConfigurationService>();
42+
builder.Services.AddSingleton<IDynamicsService, DynamicsService>();
4043

4144
// Generate Swagger documentation for Zapier API
4245
builder.Services.Configure<SwaggerGenOptions>(options =>

src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerValueConverter.cs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Newtonsoft.Json.Linq;
1+
using Json.More;
2+
using System.Text.Json.Nodes;
23
using Umbraco.Cms.Core.Models.PublishedContent;
34
using Umbraco.Cms.Core.PropertyEditors;
45
using Umbraco.Cms.Integrations.Crm.Dynamics.Helpers;
@@ -10,9 +11,9 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Editors
1011
{
1112
public class DynamicsFormPickerValueConverter : PropertyValueConverterBase
1213
{
13-
private readonly DynamicsService _dynamicsService;
14+
private readonly IDynamicsService _dynamicsService;
1415

15-
public DynamicsFormPickerValueConverter(DynamicsService dynamicsService)
16+
public DynamicsFormPickerValueConverter(IDynamicsService dynamicsService)
1617
{
1718
_dynamicsService = dynamicsService;
1819
}
@@ -27,21 +28,23 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub
2728
{
2829
if (source == null) return null;
2930

30-
var jObject = JObject.Parse(source.ToString());
31+
var jsonObj = JsonSerializer.Deserialize<JsonObject>(source.ToString());
32+
33+
if (jsonObj is null) return null;
3134

3235
var vm = new FormViewModel
3336
{
34-
IframeEmbedded = (bool)jObject["iframeEmbedded"]
37+
IframeEmbedded = jsonObj.TryGetValue("iframeEmbedded", out var _, out var _) ? (bool)jsonObj["iframeEmbedded"] : false
3538
};
3639

37-
var module = (DynamicsModule)Enum.Parse(typeof(DynamicsModule), jObject["module"].ToString());
40+
var module = (DynamicsModule)Enum.Parse(typeof(DynamicsModule), jsonObj["module"].ToString());
3841

3942
vm.Module = module;
4043

4144
if (module.HasFlag(DynamicsModule.Outbound))
4245
{
4346

44-
var embedCode = jObject["embedCode"].ToString();
47+
var embedCode = jsonObj["embedCode"].ToString();
4548

4649
vm.FormBlockId = embedCode.ParseDynamicsEmbedCodeAttributeValue(Constants.EmbedAttribute.DataFormBlockId);
4750
vm.ContainerId = embedCode.ParseDynamicsEmbedCodeAttributeValue(Constants.EmbedAttribute.ContainerId);
@@ -51,7 +54,7 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub
5154
}
5255
else
5356
{
54-
var form = _dynamicsService.GetRealTimeForm(jObject["id"].ToString()).ConfigureAwait(false).GetAwaiter().GetResult();
57+
var form = _dynamicsService.GetRealTimeForm(jsonObj["id"].ToString()).ConfigureAwait(false).GetAwaiter().GetResult();
5558
if (form != null)
5659
{
5760
vm.Html = form.StandaloneHtml;
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
using Newtonsoft.Json;
2-
1+

32
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos
43
{
54
public class ErrorDto
65
{
7-
[JsonProperty("status")]
6+
[JsonPropertyName("status")]
87
public string Status { get; set; }
98

10-
[JsonProperty("code")]
9+
[JsonPropertyName("code")]
1110
public string Code { get; set; }
1211

13-
[JsonProperty("message")]
12+
[JsonPropertyName("message")]
1413
public string Message { get; set; }
1514

16-
[JsonProperty("error_description")]
15+
[JsonPropertyName("error_description")]
1716
public string ErrorDescription { get; set; }
1817
}
1918
}
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
using Newtonsoft.Json;
2-
1+

32
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos
43
{
54
public class FormDto
65
{
7-
[JsonProperty("id")]
6+
[JsonPropertyName("id")]
87
public string Id { get; set; }
98

10-
[JsonProperty("name")]
9+
[JsonPropertyName("name")]
1110
public string Name { get; set; }
1211

13-
[JsonProperty("rawHtml")]
12+
[JsonPropertyName("rawHtml")]
1413
public string RawHtml { get; set; }
1514

16-
[JsonProperty("standaloneHtml")]
15+
[JsonPropertyName("standaloneHtml")]
1716
public string StandaloneHtml { get; set; }
1817

19-
[JsonProperty("module")]
18+
[JsonPropertyName("module")]
2019
public DynamicsModule Module { get; set; }
2120
}
2221
}

src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/Dtos/IdentityDto.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
using Newtonsoft.Json;
2-
1+

32
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos
43
{
54
public class IdentityDto
65
{
76
public bool IsAuthorized { get; set; }
87

9-
[JsonProperty("systemuserid")]
8+
[JsonPropertyName("systemuserid")]
109
public string UserId { get; set; }
1110

12-
[JsonProperty("fullname")]
11+
[JsonPropertyName("fullname")]
1312
public string FullName { get; set; }
1413

1514
public ErrorDto Error { get; set; }
Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11

2-
using Newtonsoft.Json;
3-
42
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos
53
{
64
public class OAuthConfigurationDto
75
{
8-
[JsonProperty("id")]
6+
[JsonPropertyName("id")]
97
public int Id { get; set; }
108

11-
[JsonProperty("accessToken")]
9+
[JsonPropertyName("accessToken")]
1210
public string AccessToken { get; set; }
1311

14-
[JsonProperty("userId")]
12+
[JsonPropertyName("userId")]
1513
public string UserId { get; set; }
1614

17-
[JsonProperty("fullName")]
15+
[JsonPropertyName("fullName")]
1816
public string FullName { get; set; }
1917

20-
[JsonProperty("isAuthorized")]
18+
[JsonPropertyName("isAuthorized")]
2119
public bool IsAuthorized { get; set; }
2220

23-
[JsonProperty("message")]
21+
[JsonPropertyName("message")]
2422
public string Message { get; set; }
2523
}
2624
}
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
using Newtonsoft.Json;
2-
1+

32
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos
43
{
54
public class OAuthRequestDto
65
{
7-
[JsonProperty("code")]
6+
[JsonPropertyName("code")]
87
public string Code { get; set; }
98
}
109
}
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
using Newtonsoft.Json;
2-
1+

32
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos
43
{
54
public class OutboundFormDto
65
{
7-
[JsonProperty("msdyncrm_marketingformid")]
6+
[JsonPropertyName("msdyncrm_marketingformid")]
87
public string Id { get; set; }
98

10-
[JsonProperty("msdyncrm_name")]
9+
[JsonPropertyName("msdyncrm_name")]
1110
public string Name { get; set; }
1211

13-
[JsonProperty("msdyncrm_formdefinition")]
12+
[JsonPropertyName("msdyncrm_formdefinition")]
1413
public string Definition { get; set; }
1514

16-
[JsonProperty("msdyncrm_javascriptcode")]
15+
[JsonPropertyName("msdyncrm_javascriptcode")]
1716
public string EmbedCode { get; set; }
1817
}
1918
}
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
using Newtonsoft.Json;
2-
1+

32
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos
43
{
54
public class RealTimeFormDto
65
{
7-
[JsonProperty("msdynmkt_marketingformid")]
6+
[JsonPropertyName("msdynmkt_marketingformid")]
87
public string Id { get; set; }
98

10-
[JsonProperty("msdynmkt_name")]
9+
[JsonPropertyName("msdynmkt_name")]
1110
public string Name { get; set; }
1211

13-
[JsonProperty("msdynmkt_formhtml")]
12+
[JsonPropertyName("msdynmkt_formhtml")]
1413
public string FormHtml { get; set; }
1514

16-
[JsonProperty("msdynmkt_standalonehtml")]
15+
[JsonPropertyName("msdynmkt_standalonehtml")]
1716
public string StandaloneHtml { get; set; }
1817
}
1918
}
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
using Newtonsoft.Json;
2-
1+

32
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos
43
{
54
public class ResponseDto<T>
65
where T : class
76
{
8-
[JsonProperty("value")]
7+
[JsonPropertyName("value")]
98
public List<T> Value { get; set; }
109
}
1110
}

0 commit comments

Comments
 (0)