Merge branch 'umbraco:main' into main

kasperk81 · web-flow · commit acf3a1002044 · 2024-07-17T02:12:15.000+03:00
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/App_Plugins/UmbracoCms.Integrations/Commerce/Shopify/js/productPickerSettings.controller.js b/src/Umbraco.Cms.Integrations.Commerce.Shopify/App_Plugins/UmbracoCms.Integrations/Commerce/Shopify/js/productPickerSettings.controller.js
@@ -62,11 +62,11 @@
 
     function validateOAuthSetup() {
         umbracoCmsIntegrationsCommerceShopifyResource.validateAccessToken().then(function (response) {
-
             vm.oauthSetup = {
-                isConnected: response.isValid,
+                isValid: response.isValid,
+                isConnected: response.isConnected,
                 isAccessTokenExpired: response.isExpired,
-                isAccessTokenValid: response.isValid
+                isAccessTokenValid: response.isConnected
             }
 
             if (vm.oauthSetup.isConnected === true && vm.oauthSetup.isAccessTokenValid === true) {
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Controllers/ProductsController.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Controllers/ProductsController.cs
@@ -50,7 +50,7 @@ public ProductsController(IShopifyService apiService, AuthorizationImplementatio
         }
 
         [HttpGet]
-        public EditorSettings CheckConfiguration() => _apiService.GetApiConfiguration();
+        public async Task<EditorSettings> CheckConfiguration() => await _apiService.GetApiConfiguration();
 
         [HttpGet]
         public string GetAuthorizationUrl() => _authorizationService.GetAuthorizationUrl();
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Editors/ShopifyProductPickerValueConverter.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Editors/ShopifyProductPickerValueConverter.cs
@@ -38,7 +38,7 @@ public override object ConvertSourceToIntermediate(IPublishedElement owner, IPub
             if (source == null) return null;
 
             return source.ToString()
-                .Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries)
+                .Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
                 .Select(long.Parse)
                 .ToArray();
         }
@@ -60,7 +60,20 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, IPub
                                Id = p.Id,
                                Title = p.Title,
                                Body = p.Body,
-                               Image = p.Image?.Src
+                               Image = p.Image?.Src,
+                               Tags = p.Tags,
+                               ProductType = p.ProductType,
+                               PublishedScope = p.PublishedScope,
+                               Status = p.Status,
+                               Variants = from v in p.Variants
+                                          select new VariantViewModel
+                                          {
+                                              InventoryQuantity = v.InventoryQuantity,
+                                              Position = v.Position,
+                                              Price = v.Price,
+                                              Sku = v.Sku,
+                                              Taxable = v.Taxable
+                                          }
                            };
 
             return products.ToList();
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,6 +1,5 @@
-﻿using System.Collections.Generic;
-
-using Newtonsoft.Json;
+﻿using Newtonsoft.Json;
+using System.Collections.Generic;
 
 namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos
 {
@@ -29,6 +28,12 @@ public class ProductDto
 
         [JsonProperty("image")]
         public ProductImageDto Image { get; set; }
+
+        [JsonProperty("product_type")]
+        public string ProductType { get; set; }
+
+        [JsonProperty("published_scope")]
+        public string PublishedScope { 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
@@ -18,5 +18,9 @@ public class ProductVariantDto
 
         [JsonProperty("inventory_quantity")]
         public int InventoryQuantity { get; set; }
+
+        [JsonProperty("taxable")]
+        public bool Taxable { get; set; }
+
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/EditorSettings.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/EditorSettings.cs
@@ -12,6 +12,9 @@ public EditorSettings()
         [JsonProperty("isValid")]
         public bool IsValid { get; set; }
 
+        [JsonProperty("isConnected")]
+        public bool IsConnected { get; set; }
+
         [JsonProperty("type")]
         public ConfigurationType Type { get; set; }
     }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/ViewModels/ProductViewModel.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/ViewModels/ProductViewModel.cs
@@ -1,14 +1,19 @@
 ﻿
+using System.Collections.Generic;
+
 namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.ViewModels
 {
     public class ProductViewModel
     {
         public long Id { get; set; }
-
         public string Title { get; set; }
-
         public string Body { get; set; }
 
         public string Image { get; set; }
+        public string ProductType { get; set; }
+        public string Tags { get; set; }
+        public string Status { get; set; }
+        public string PublishedScope { get; set; }
+        public IEnumerable<VariantViewModel> Variants { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/ViewModels/VariantViewModel.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/ViewModels/VariantViewModel.cs
@@ -0,0 +1,13 @@
+﻿
+namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.ViewModels
+{
+    public class VariantViewModel
+    {
+        public string Price { get; set; }
+        public string Sku { get; set; }
+        public int Position { get; set; }
+        public int InventoryQuantity { get; set; }
+        public bool Taxable { get; set; }
+
+    }
+}
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/BaseAuthorizationService.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/BaseAuthorizationService.cs
@@ -16,8 +16,7 @@ public class BaseAuthorizationService
         protected const string ShopifyAuthorizationUrl = "https://{0}.myshopify.com/admin/oauth/authorize" +
             "?client_id={1}" +
             "&redirect_uri={2}" +
-            "&scope=read_products" +
-            "&grant_options[]=value";
+            "&scope=read_products";
 
         public BaseAuthorizationService(ITokenService tokenService)
         {
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/IShopifyService.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/IShopifyService.cs
@@ -7,7 +7,7 @@ namespace Umbraco.Cms.Integrations.Commerce.Shopify.Services
 {
     public interface IShopifyService
     {
-        EditorSettings GetApiConfiguration();
+        Task<EditorSettings> GetApiConfiguration();
 
         Task<ResponseDto<ProductsListDto>> ValidateAccessToken();
 
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/ShopifyService.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/ShopifyService.cs
@@ -93,7 +93,7 @@ public ShopifyService(ILogger logger, ITokenService tokenService)
         }
 #endif
 
-        public EditorSettings GetApiConfiguration()
+        public async Task<EditorSettings> GetApiConfiguration()
         {
             if (string.IsNullOrEmpty(_settings.Shop)
                 || string.IsNullOrEmpty(_settings.ApiVersion))
@@ -105,14 +105,27 @@ public EditorSettings GetApiConfiguration()
 
             // validate OAuth configuration if AuthorizationService is used.
             // if authorization is managed through UmbracoAuthorizationService, the properties client ID and proxy URL are set correctly.
+            var accessTokenValidationResponse = await ValidateAccessToken();
             if (_settings.UseUmbracoAuthorization)
-                return new EditorSettings { IsValid = true, Type = ConfigurationType.OAuth };
+            {
+                var editorSettings = new EditorSettings { IsValid = true, Type = ConfigurationType.OAuth };
+
+                editorSettings.IsConnected = accessTokenValidationResponse.IsValid;
+
+                return editorSettings;
+            }
             else
+            {
                 return !string.IsNullOrEmpty(_oauthSettings.ClientId)
                         && !string.IsNullOrEmpty(_oauthSettings.ClientSecret)
                         && !string.IsNullOrEmpty(_oauthSettings.RedirectUri)
-                        ? new EditorSettings { IsValid = true, Type = ConfigurationType.OAuth }
+                        ? new EditorSettings { 
+                            IsValid = true,
+                            IsConnected = accessTokenValidationResponse.IsValid, 
+                            Type = ConfigurationType.OAuth 
+                        }
                         : new EditorSettings();
+            }
         }
 
         public async Task<ResponseDto<ProductsListDto>> ValidateAccessToken()
@@ -146,13 +159,15 @@ public async Task<ResponseDto<ProductsListDto>> ValidateAccessToken()
 
         public void RevokeAccessToken()
         {
-            _tokenService.RemoveParameters(Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyAccessToken);
+            _tokenService.RemoveParameters(Constants.AccessTokenDbKey);
         }
 
         public async Task<ResponseDto<ProductsListDto>> GetResults(string pageInfo)
         {
             string accessToken;
-            if (GetApiConfiguration().Type.Value == ConfigurationType.OAuth.Value)
+
+            var apiConfiguration = await GetApiConfiguration();
+            if (apiConfiguration.Type.Value == ConfigurationType.OAuth.Value)
                 _tokenService.TryGetParameters(Constants.AccessTokenDbKey, out accessToken);
             else
             {
@@ -210,7 +225,8 @@ public async Task<ResponseDto<ProductsListDto>> GetResults(string pageInfo)
         public async Task<ResponseDto<ProductsListDto>> GetProductsByIds(long[] ids)
         {
             string accessToken;
-            if (GetApiConfiguration().Type.Value == ConfigurationType.OAuth.Value)
+            var apiConfiguration = await GetApiConfiguration();
+            if (apiConfiguration.Type.Value == ConfigurationType.OAuth.Value)
                 _tokenService.TryGetParameters(Constants.AccessTokenDbKey, out accessToken);
             else
             {
@@ -260,7 +276,8 @@ public async Task<ResponseDto<ProductsListDto>> GetProductsByIds(long[] ids)
         public async Task<int> GetCount()
         {
             string accessToken;
-            if (GetApiConfiguration().Type.Value == ConfigurationType.OAuth.Value)
+            var apiConfiguration = await GetApiConfiguration();
+            if (apiConfiguration.Type.Value == ConfigurationType.OAuth.Value)
                 _tokenService.TryGetParameters(Constants.AccessTokenDbKey, out accessToken);
             else
             {
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Umbraco.Cms.Integrations.Commerce.Shopify.csproj b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Umbraco.Cms.Integrations.Commerce.Shopify.csproj
@@ -10,7 +10,7 @@
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/blob/main/src/Umbraco.Cms.Integrations.Commerce.Shopify</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
-		<Version>1.2.0</Version>
+		<Version>1.2.1</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsConfigurationService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsConfigurationService.cs
@@ -16,9 +16,9 @@ public class DynamicsConfigurationService
         private readonly IScopeProvider _scopeProvider;
 
 #if NETCOREAPP
-        private readonly ILogger<DynamicsService> _logger;
+        private readonly ILogger<DynamicsConfigurationService> _logger;
 
-        public DynamicsConfigurationService(IScopeProvider scopeProvider, ILogger<DynamicsService> logger)
+        public DynamicsConfigurationService(IScopeProvider scopeProvider, ILogger<DynamicsConfigurationService> logger)
         {
             _scopeProvider = scopeProvider;
 
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsService.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Configuration;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -13,15 +12,17 @@
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models;
 
-
 #if NETCOREAPP
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 #else
+using System.Configuration;
+using Umbraco.Core.Logging;
 #endif
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
 {
-    public class DynamicsService
+	public class DynamicsService
     {
         private readonly DynamicsSettings _settings;
 
@@ -34,18 +35,26 @@ public class DynamicsService
         public static Func<HttpClient> ClientFactory = () => s_client;
 
 #if NETCOREAPP
-        public DynamicsService(IOptions<DynamicsSettings> options, DynamicsConfigurationService dynamicsConfigurationService)
+        private readonly ILogger<DynamicsService> _logger;
+
+        public DynamicsService(IOptions<DynamicsSettings> options, DynamicsConfigurationService dynamicsConfigurationService, ILogger<DynamicsService> logger)
         {
             _settings = options.Value;
 
             _dynamicsConfigurationService = dynamicsConfigurationService;
+
+            _logger = logger;
         }
 #else
-        public DynamicsService(DynamicsConfigurationService dynamicsConfigurationService)
+		private readonly ILogger _logger;
+
+		public DynamicsService(DynamicsConfigurationService dynamicsConfigurationService, ILogger logger)
         {
             _settings = new DynamicsSettings(ConfigurationManager.AppSettings);
 
             _dynamicsConfigurationService = dynamicsConfigurationService;
+
+            _logger = logger;
         }
 #endif
 
@@ -133,23 +142,30 @@ public async Task<IEnumerable<FormDto>> GetForms(DynamicsModule module)
             if (module.HasFlag(DynamicsModule.Outbound))
             {
                 var forms = await Get<OutboundFormDto>(oauthConfiguration.AccessToken, Constants.Modules.OutboundPath);
-                list.AddRange(forms.Value.Select(p => new FormDto
+
+                if (forms != null && forms.Value != null && forms.Value.Any())
                 {
-                    Id = p.Id,
-                    Name = p.Name,
-                    Module = DynamicsModule.Outbound
-                }));
+                    list.AddRange(forms.Value.Select(p => new FormDto
+                    {
+                        Id = p.Id,
+                        Name = p.Name,
+                        Module = DynamicsModule.Outbound
+                    }));
+                }
             }
 
             if (module.HasFlag(DynamicsModule.RealTime))
             {
                 var forms = await Get<RealTimeFormDto>(oauthConfiguration.AccessToken, Constants.Modules.RealTimePath);
-                list.AddRange(forms.Value.Select(p => new FormDto
+                if (forms != null && forms.Value != null && forms.Value.Any())
                 {
-                    Id = p.Id,
-                    Name = p.Name,
-                    Module = DynamicsModule.RealTime
-                }));
+                    list.AddRange(forms.Value.Select(p => new FormDto
+                    {
+                        Id = p.Id,
+                        Name = p.Name,
+                        Module = DynamicsModule.RealTime
+                    }));
+                }
             }
 
             return list;
@@ -184,9 +200,20 @@ private async Task<ResponseDto<T>> Get<T>(string accessToken, string modulePath)
 
             var response = await ClientFactory().SendAsync(requestMessage);
 
-            if (!response.IsSuccessStatusCode) return null;
+			var result = await response.Content.ReadAsStringAsync();
 
-            var result = await response.Content.ReadAsStringAsync();
+            if (!response.IsSuccessStatusCode)
+            {
+                var errorMessage = string.Format("An error has occured while trying to retrieve the Dynamics {0} forms: {1} {2}",
+                    modulePath, response.ReasonPhrase, result);
+#if NETCOREAPP
+                _logger.LogError(errorMessage);
+#else
+                _logger.Error<DynamicsService>(errorMessage);
+#endif
+
+                return null;
+            }
 
             return JsonConvert.DeserializeObject<ResponseDto<T>>(result);
         }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Umbraco.Cms.Integrations.Crm.Dynamics.csproj b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Umbraco.Cms.Integrations.Crm.Dynamics.csproj
@@ -10,7 +10,7 @@
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/blob/main/src/Umbraco.Cms.Integrations.Crm.Dynamics</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
-		<Version>1.3.3</Version>
+		<Version>1.3.4</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/package.xml b/src/Umbraco.Cms.Integrations.Crm.Dynamics/package.xml
@@ -3,7 +3,7 @@
   <info>
     <package>
       <name>Umbraco.Cms.Integrations.Crm.Dynamics</name>
-      <version>1.3.3</version>
+      <version>1.3.4</version>
       <iconUrl></iconUrl>
       <licence url="https://opensource.org/licenses/MIT">MIT</licence>
       <url>https://github.com/umbraco/Umbraco.Cms.Integrations</url>

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public ProductsController(IShopifyService apiService, AuthorizationImplementatio`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`[HttpGet]`
`53`		`- public EditorSettings CheckConfiguration() => _apiService.GetApiConfiguration();`
	`53`	`+ public async Task<EditorSettings> CheckConfiguration() => await _apiService.GetApiConfiguration();`
`54`	`54`
`55`	`55`	`[HttpGet]`
`56`	`56`	`public string GetAuthorizationUrl() => _authorizationService.GetAuthorizationUrl();`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,9 @@ public class ProductVariantDto`
`18`	`18`
`19`	`19`	`[JsonProperty("inventory_quantity")]`
`20`	`20`	`public int InventoryQuantity { get; set; }`
	`21`	`+`
	`22`	`+ [JsonProperty("taxable")]`
	`23`	`+ public bool Taxable { get; set; }`
	`24`	`+`
`21`	`25`	`}`
`22`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,9 @@ public EditorSettings()`
`12`	`12`	`[JsonProperty("isValid")]`
`13`	`13`	`public bool IsValid { get; set; }`
`14`	`14`
	`15`	`+ [JsonProperty("isConnected")]`
	`16`	`+ public bool IsConnected { get; set; }`
	`17`	`+`
`15`	`18`	`[JsonProperty("type")]`
`16`	`19`	`public ConfigurationType Type { get; set; }`
`17`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,19 @@`
`1`	`1`
	`2`	`+using System.Collections.Generic;`
	`3`	`+`
`2`	`4`	`namespace Umbraco.Cms.Integrations.Commerce.Shopify.Models.ViewModels`
`3`	`5`	`{`
`4`	`6`	`public class ProductViewModel`
`5`	`7`	`{`
`6`	`8`	`public long Id { get; set; }`
`7`		`-`
`8`	`9`	`public string Title { get; set; }`
`9`		`-`
`10`	`10`	`public string Body { get; set; }`
`11`	`11`
`12`	`12`	`public string Image { get; set; }`
	`13`	`+ public string ProductType { get; set; }`
	`14`	`+ public string Tags { get; set; }`
	`15`	`+ public string Status { get; set; }`
	`16`	`+ public string PublishedScope { get; set; }`
	`17`	`+ public IEnumerable<VariantViewModel> Variants { get; set; }`
`13`	`18`	`}`
`14`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@ public class BaseAuthorizationService`
`16`	`16`	`protected const string ShopifyAuthorizationUrl = "https://{0}.myshopify.com/admin/oauth/authorize" +`
`17`	`17`	`"?client_id={1}" +`
`18`	`18`	`"&redirect_uri={2}" +`
`19`		`- "&scope=read_products" +`
`20`		`- "&grant_options[]=value";`
	`19`	`+ "&scope=read_products";`
`21`	`20`
`22`	`21`	`public BaseAuthorizationService(ITokenService tokenService)`
`23`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Umbraco.Cms.Integrations.Commerce.Shopify.Services`
`7`	`7`	`{`
`8`	`8`	`public interface IShopifyService`
`9`	`9`	`{`
`10`		`- EditorSettings GetApiConfiguration();`
	`10`	`+ Task<EditorSettings> GetApiConfiguration();`
`11`	`11`
`12`	`12`	`Task<ResponseDto<ProductsListDto>> ValidateAccessToken();`
`13`	`13`