Remove Newtonsoft.Json references; remove unused app settings keys.

acoumb · acoumb · commit d345253e0114 · 2024-07-26T11:23:00.000+03:00
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Client/src/property-editor/shopify-product-picker-property-editor.element.ts b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Client/src/property-editor/shopify-product-picker-property-editor.element.ts
@@ -121,9 +121,9 @@ export class ShopifyProductPickerPropertyEditor extends UmbLitElement implements
         });
     }
 
-    deleteForm(id: number){
+    deleteProduct(id: number) {
         var index = this.products.map(p => p.id).indexOf(id);
-        this.products.splice(index, 1);
+        this.products.splice(index);
         this.value = JSON.stringify(this.products.map(product => product.id));
         this.dispatchEvent(new CustomEvent('property-value-change'));
     }
@@ -144,7 +144,7 @@ export class ShopifyProductPickerPropertyEditor extends UmbLitElement implements
                             html`
                                 <uui-ref-node-form name=${product.title} detail=${product.vendor}>
                                     <uui-action-bar slot="actions">
-                                        <uui-button label="Remove" @click=${() => this.deleteForm(product.id)}>Remove</uui-button>
+                                        <uui-button label="Remove" @click=${() => this.deleteProduct(product.id)}>Remove</uui-button>
                                     </uui-action-bar>
                                 </uui-ref-node-form>
                             `
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Configuration/ShopifyOAuthSettings.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Configuration/ShopifyOAuthSettings.cs
@@ -1,32 +1,15 @@
-﻿using System.Collections.Specialized;
-
-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Configuration
+﻿namespace Umbraco.Cms.Integrations.Commerce.Shopify.Configuration
 {
     public class ShopifyOAuthSettings
     {
-        public ShopifyOAuthSettings() { }
-
-        public ShopifyOAuthSettings(NameValueCollection appSettings)
-        {
-            ClientId = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyClientIdKey];
-
-            ClientSecret = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyClientSecretKey];
-
-            RedirectUri = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyRedirectUriKey];
-
-            Scopes = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyScopesKey];
-
-            TokenEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyTokenEndpointKey];
-        }
-
-        public string ClientId { get; set; }
+        public string ClientId { get; set; } = string.Empty;
 
-        public string ClientSecret { get; set; }
+        public string ClientSecret { get; set; } = string.Empty;
 
-        public string RedirectUri { get; set; }
+        public string RedirectUri { get; set; } = string.Empty;
 
-        public string Scopes { get; set; }
+        public string Scopes { get; set; } = string.Empty;
 
-        public string TokenEndpoint { get; set; }
+        public string TokenEndpoint { get; set; } = string.Empty;
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Constants.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Constants.cs
@@ -38,27 +38,8 @@ public static class Configuration
 
             public const string OAuthSettings = "Umbraco:Cms:Integrations:Commerce:Shopify:OAuthSettings";
 
-            public const string UmbracoCmsIntegrationsCommerceShopifyApiVersion =
-            "Umbraco.Cms.Integrations.Commerce.Shopify.ApiVersion";
-
-            public const string UmbracoCmsIntegrationsCommerceShopifyShop =
-                "Umbraco.Cms.Integrations.Commerce.Shopify.Shop";
-
             public const string UmbracoCmsIntegrationsCommerceShopifyAccessToken =
                 "Umbraco.Cms.Integrations.Commerce.Shopify.AccessToken";
-
-            public const string UmbracoCmsIntegrationsCommerceShopifyUseUmbracoAuthorizationKey =
-                "Umbraco.Cms.Integrations.Commerce.Shopify.UseUmbracoAuthorization";
-
-            public const string UmbracoCmsIntegrationsCommerceShopifyClientIdKey = "Umbraco.Cms.Integrations.Commerce.Shopify.ClientId";
-
-            public const string UmbracoCmsIntegrationsCommerceShopifyClientSecretKey = "Umbraco.Cms.Integrations.Commerce.Shopify.ClientSecret";
-
-            public const string UmbracoCmsIntegrationsCommerceShopifyRedirectUriKey = "Umbraco.Cms.Integrations.Commerce.Shopify.RedirectUri";
-
-            public const string UmbracoCmsIntegrationsCommerceShopifyScopesKey = "Umbraco.Cms.Integrations.Commerce.Shopify.Scopes";
-
-            public const string UmbracoCmsIntegrationsCommerceShopifyTokenEndpointKey = "Umbraco.Cms.Integrations.Commerce.Shopify.TokenEndpoint";
         }
 
         public static class PropertyEditors
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Editors/ShopifyProductPickerValueConverter.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Editors/ShopifyProductPickerValueConverter.cs
@@ -1,4 +1,4 @@
-﻿using Newtonsoft.Json;
+﻿using System.Text.Json;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Integrations.Commerce.Shopify.Models.ViewModels;
@@ -28,7 +28,7 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub
         {
             if (source == null) return null;
 
-            return JsonConvert.DeserializeObject<long[]>(source.ToString());
+            return JsonSerializer.Deserialize<long[]>(source.ToString());
         }
 
         public override object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType,
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/ConfigurationType.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/ConfigurationType.cs
@@ -1,10 +1,8 @@
-﻿using Newtonsoft.Json;
-
-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models
+﻿namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models
 {
     public class ConfigurationType
     {
-        [JsonProperty("value")]
+        [JsonPropertyName("value")]
         public string Value { get; private set; }
 
         private ConfigurationType(string value)
@@ -15,6 +13,7 @@ private ConfigurationType(string value)
         public static ConfigurationType Api => new ConfigurationType("API");
 
         public static ConfigurationType OAuth => new ConfigurationType("OAuth");
+
         public static ConfigurationType OAuthConnected => new ConfigurationType("OAuthConnected");
 
         public static ConfigurationType None => new ConfigurationType("None");
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/ErrorDto.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/ErrorDto.cs
@@ -1,13 +1,11 @@
-﻿using Newtonsoft.Json;
-
-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
+﻿namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
 {
     public class ErrorDto
     {
-        [JsonProperty("status")]
+        [JsonPropertyName("status")]
         public string Status { get; set; }
 
-        [JsonProperty("message")]
+        [JsonPropertyName("message")]
         public string Message { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/OAuthRequestDto.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/OAuthRequestDto.cs
@@ -1,10 +1,8 @@
-﻿using Newtonsoft.Json;
-
-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
+﻿namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
 {
     public class OAuthRequestDto
     {
-        [JsonProperty("code")]
+        [JsonPropertyName("code")]
         public string Code { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/ProductCountDto.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/ProductCountDto.cs
@@ -0,0 +1,8 @@
+﻿namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
+{
+    public class ProductCountDto
+    {
+        [JsonPropertyName("count")]
+        public int Count { get; set; }
+    }
+}
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/ProductDto.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/ProductDto.cs
@@ -1,33 +1,29 @@
-﻿using System.Collections.Generic;
-
-using Newtonsoft.Json;
-
-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
+﻿namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
 {
     public class ProductDto
     {
-        [JsonProperty("id")]
+        [JsonPropertyName("id")]
         public long Id { get; set; }
 
-        [JsonProperty("title")]
+        [JsonPropertyName("title")]
         public string Title { get; set; }
 
-        [JsonProperty("body_html")]
+        [JsonPropertyName("body_html")]
         public string Body { get; set; }
 
-        [JsonProperty("vendor")]
+        [JsonPropertyName("vendor")]
         public string Vendor { get; set; }
 
-        [JsonProperty("status")]
+        [JsonPropertyName("status")]
         public string Status { get; set; }
 
-        [JsonProperty("tags")]
+        [JsonPropertyName("tags")]
         public string Tags { get; set; }
 
-        [JsonProperty("variants")]
+        [JsonPropertyName("variants")]
         public IEnumerable<ProductVariantDto> Variants { get; set; }
 
-        [JsonProperty("image")]
+        [JsonPropertyName("image")]
         public ProductImageDto Image { get; set; }
     }
 
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/ProductImageDto.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/ProductImageDto.cs
@@ -1,10 +1,8 @@
-﻿using Newtonsoft.Json;
-
-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
+﻿namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
 {
     public class ProductImageDto
     {
-        [JsonProperty("src")]
+        [JsonPropertyName("src")]
         public string Src { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/ProductVariantDto.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/ProductVariantDto.cs
@@ -1,22 +1,20 @@
-﻿using Newtonsoft.Json;
-
-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
+﻿namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
 {
     public class ProductVariantDto
     {
-        [JsonProperty("price")]
+        [JsonPropertyName("price")]
         public string Price { get; set; }
 
-        [JsonProperty("sku")]
+        [JsonPropertyName("sku")]
         public string Sku { get; set; }
 
-        [JsonProperty("position")]
+        [JsonPropertyName("position")]
         public int Position { get; set; }
 
-        [JsonProperty("barcode")]
+        [JsonPropertyName("barcode")]
         public string Barcode { get; set; }
 
-        [JsonProperty("inventory_quantity")]
+        [JsonPropertyName("inventory_quantity")]
         public int InventoryQuantity { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/ProductsListDto.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/ProductsListDto.cs
@@ -1,13 +1,11 @@
-﻿using Newtonsoft.Json;
-
-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
+﻿namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
 {
     public class ProductsListDto
     {
-        [JsonProperty("products")]
+        [JsonPropertyName("products")]
         public IEnumerable<ProductDto> Products { get; set; }
 
-        [JsonProperty("totalPages")]
+        [JsonPropertyName("totalPages")]
         public int TotalPages { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/RequestDto.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/RequestDto.cs
@@ -1,10 +1,8 @@
-﻿using Newtonsoft.Json;
-
-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
+﻿namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
 {
     public class RequestDto
     {
-        [JsonProperty("ids")]
+        [JsonPropertyName("ids")]
         public long[] Ids { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/ResponseDto.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/ResponseDto.cs
@@ -1,32 +1,30 @@
-﻿using Newtonsoft.Json;
-
-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
+﻿namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
 {
     public class ResponseDto<T> 
         where T : class
     {
-        [JsonProperty("isValid")]
+        [JsonPropertyName("isValid")]
         public bool IsValid { get; set; }
 
-        [JsonProperty("nextPageInfo")]
+        [JsonPropertyName("nextPageInfo")]
         public string NextPageInfo { get; set; }
 
-        [JsonProperty("previousPageInfo")]
+        [JsonPropertyName("previousPageInfo")]
         public string PreviousPageInfo { get; set; }
 
-        [JsonProperty("isExpired")]
+        [JsonPropertyName("isExpired")]
         public bool IsExpired { get; set; }
 
-        [JsonProperty("result")]
+        [JsonPropertyName("result")]
         public T Result { get; set; }
 
-        [JsonProperty("message")]
+        [JsonPropertyName("message")]
         public string Message { get; set; }
 
-        [JsonProperty("skip")]
+        [JsonPropertyName("skip")]
         public int Skip { get; set; }
 
-        [JsonProperty("take")]
+        [JsonPropertyName("take")]
         public int Take { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/TokenDto.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/Dtos/TokenDto.cs
@@ -1,22 +1,20 @@
-﻿using Newtonsoft.Json;
-
-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
+﻿namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
 {
     public class TokenDto
     {
-        [JsonProperty("access_token")]
+        [JsonPropertyName("access_token")]
         public string AccessToken { get; set; }
 
-        [JsonProperty("token_type")]
+        [JsonPropertyName("token_type")]
         public string TokenType { get; set; }
 
-        [JsonProperty("expires_in")]
+        [JsonPropertyName("expires_in")]
         public int ExpiresIn { get; set; }
 
-        [JsonProperty("refresh_token")]
+        [JsonPropertyName("refresh_token")]
         public string RefreshToken { get; set; }
 
-        [JsonProperty("isAccessTokenAvailable")]
+        [JsonPropertyName("isAccessTokenAvailable")]
         public bool IsAccessTokenAvailable => !string.IsNullOrEmpty(AccessToken);
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/EditorSettings.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/EditorSettings.cs
@@ -1,6 +1,4 @@
-﻿using Newtonsoft.Json;
-
-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models
+﻿namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models
 {
     public class EditorSettings
     {
@@ -9,10 +7,10 @@ public EditorSettings()
             Type = ConfigurationType.None;
         }
 
-        [JsonProperty("isValid")]
+        [JsonPropertyName("isValid")]
         public bool IsValid { get; set; }
 
-        [JsonProperty("type")]
+        [JsonPropertyName("type")]
         public ConfigurationType Type { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/ProductPickerSettings.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/ProductPickerSettings.cs
@@ -1,13 +1,11 @@
-﻿using Newtonsoft.Json;
-
-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models
+﻿namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models
 {
     public class ProductPickerSettings
     {
-        [JsonProperty("name")]
+        [JsonPropertyName("name")]
         public string Name { get; set; }
 
-        [JsonProperty("message")]
+        [JsonPropertyName("message")]
         public string Message { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Resolvers/JsonPropertyRenameContractResolver.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Resolvers/JsonPropertyRenameContractResolver.cs
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/AuthorizationService.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/AuthorizationService.cs
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/CacheHelper.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/CacheHelper.cs
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/ShopifyService.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/ShopifyService.cs
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/UmbracoAuthorizationService.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/UmbracoAuthorizationService.cs
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/ShopifyComposer.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/ShopifyComposer.cs
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/app.config b/src/Umbraco.Cms.Integrations.Commerce.Shopify/app.config

Original file line number	Diff line number	Diff line change
`@@ -121,9 +121,9 @@ export class ShopifyProductPickerPropertyEditor extends UmbLitElement implements`
`121`	`121`	`});`
`122`	`122`	`}`
`123`	`123`
`124`		`- deleteForm(id: number){`
	`124`	`+ deleteProduct(id: number) {`
`125`	`125`	`var index = this.products.map(p => p.id).indexOf(id);`
`126`		`- this.products.splice(index, 1);`
	`126`	`+ this.products.splice(index);`
`127`	`127`	`this.value = JSON.stringify(this.products.map(product => product.id));`
`128`	`128`	`this.dispatchEvent(new CustomEvent('property-value-change'));`
`129`	`129`	`}`
`@@ -144,7 +144,7 @@ export class ShopifyProductPickerPropertyEditor extends UmbLitElement implements`
`144`	`144`	html`
`145`	`145`	`<uui-ref-node-form name=${product.title} detail=${product.vendor}>`
`146`	`146`	`<uui-action-bar slot="actions">`
`147`		`- <uui-button label="Remove" @click=${() => this.deleteForm(product.id)}>Remove</uui-button>`
	`147`	`+ <uui-button label="Remove" @click=${() => this.deleteProduct(product.id)}>Remove</uui-button>`
`148`	`148`	`</uui-action-bar>`
`149`	`149`	`</uui-ref-node-form>`
`150`	`150`	`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Newtonsoft.Json;`
	`1`	`+using System.Text.Json;`
`2`	`2`	`using Umbraco.Cms.Core.Models.PublishedContent;`
`3`	`3`	`using Umbraco.Cms.Core.PropertyEditors;`
`4`	`4`	`using Umbraco.Cms.Integrations.Commerce.Shopify.Models.ViewModels;`
`@@ -28,7 +28,7 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub`
`28`	`28`	`{`
`29`	`29`	`if (source == null) return null;`
`30`	`30`
`31`		`- return JsonConvert.DeserializeObject<long[]>(source.ToString());`
	`31`	`+ return JsonSerializer.Deserialize<long[]>(source.ToString());`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public override object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType,`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,11 @@`
`1`		`-using Newtonsoft.Json;`
`2`		`-`
`3`		`-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos`
	`1`	`+namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos`
`4`	`2`	`{`
`5`	`3`	`public class ErrorDto`
`6`	`4`	`{`
`7`		`- [JsonProperty("status")]`
	`5`	`+ [JsonPropertyName("status")]`
`8`	`6`	`public string Status { get; set; }`
`9`	`7`
`10`		`- [JsonProperty("message")]`
	`8`	`+ [JsonPropertyName("message")]`
`11`	`9`	`public string Message { get; set; }`
`12`	`10`	`}`
`13`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`		`-using Newtonsoft.Json;`
`2`		`-`
`3`		`-namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos`
	`1`	`+namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos`
`4`	`2`	`{`
`5`	`3`	`public class OAuthRequestDto`
`6`	`4`	`{`
`7`		`- [JsonProperty("code")]`
	`5`	`+ [JsonPropertyName("code")]`
`8`	`6`	`public string Code { get; set; }`
`9`	`7`	`}`
`10`	`8`	`}`