Merge pull request #198 from umbraco/bugfix/fix-forms-list-null-reference

Fix NULL reference

Author: acoumb

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;
 

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);
         }

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>