Skip to content

Commit 431708c

Browse files
committed
Add logging when retrieving forms
1 parent 3a94f17 commit 431708c

File tree

2 files changed

+30
-10
lines changed

2 files changed

+30
-10
lines changed

src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsConfigurationService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ public class DynamicsConfigurationService
1616
private readonly IScopeProvider _scopeProvider;
1717

1818
#if NETCOREAPP
19-
private readonly ILogger<DynamicsService> _logger;
19+
private readonly ILogger<DynamicsConfigurationService> _logger;
2020

21-
public DynamicsConfigurationService(IScopeProvider scopeProvider, ILogger<DynamicsService> logger)
21+
public DynamicsConfigurationService(IScopeProvider scopeProvider, ILogger<DynamicsConfigurationService> logger)
2222
{
2323
_scopeProvider = scopeProvider;
2424

src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsService.cs

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Configuration;
43
using System.Linq;
54
using System.Net.Http;
65
using System.Net.Http.Headers;
@@ -13,15 +12,17 @@
1312
using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
1413
using Umbraco.Cms.Integrations.Crm.Dynamics.Models;
1514

16-
1715
#if NETCOREAPP
16+
using Microsoft.Extensions.Logging;
1817
using Microsoft.Extensions.Options;
1918
#else
19+
using System.Configuration;
20+
using Umbraco.Core.Logging;
2021
#endif
2122

2223
namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
2324
{
24-
public class DynamicsService
25+
public class DynamicsService
2526
{
2627
private readonly DynamicsSettings _settings;
2728

@@ -34,18 +35,26 @@ public class DynamicsService
3435
public static Func<HttpClient> ClientFactory = () => s_client;
3536

3637
#if NETCOREAPP
37-
public DynamicsService(IOptions<DynamicsSettings> options, DynamicsConfigurationService dynamicsConfigurationService)
38+
private readonly ILogger<DynamicsService> _logger;
39+
40+
public DynamicsService(IOptions<DynamicsSettings> options, DynamicsConfigurationService dynamicsConfigurationService, ILogger<DynamicsService> logger)
3841
{
3942
_settings = options.Value;
4043

4144
_dynamicsConfigurationService = dynamicsConfigurationService;
45+
46+
_logger = logger;
4247
}
4348
#else
44-
public DynamicsService(DynamicsConfigurationService dynamicsConfigurationService)
49+
private readonly ILogger _logger;
50+
51+
public DynamicsService(DynamicsConfigurationService dynamicsConfigurationService, ILogger logger)
4552
{
4653
_settings = new DynamicsSettings(ConfigurationManager.AppSettings);
4754

4855
_dynamicsConfigurationService = dynamicsConfigurationService;
56+
57+
_logger = logger;
4958
}
5059
#endif
5160

@@ -187,13 +196,24 @@ private async Task<ResponseDto<T>> Get<T>(string accessToken, string modulePath)
187196
RequestUri = new Uri($"{_settings.HostUrl}{_settings.ApiPath}{modulePath}")
188197
};
189198
requestMessage.Headers.Authorization =
190-
new AuthenticationHeaderValue("Bearer", accessToken);
199+
new AuthenticationHeaderValue("Bearer", accessToken + "1");
191200

192201
var response = await ClientFactory().SendAsync(requestMessage);
193202

194-
if (!response.IsSuccessStatusCode) return null;
203+
var result = await response.Content.ReadAsStringAsync();
195204

196-
var result = await response.Content.ReadAsStringAsync();
205+
if (!response.IsSuccessStatusCode)
206+
{
207+
var errorMessage = string.Format("An error has occured while trying to retrieve the Dynamics {0} forms: {1} {2}",
208+
modulePath, response.ReasonPhrase, result);
209+
#if NETCOREAPP
210+
_logger.LogError(errorMessage);
211+
#else
212+
_logger.Error<DynamicsService>(errorMessage);
213+
#endif
214+
215+
return null;
216+
}
197217

198218
return JsonConvert.DeserializeObject<ResponseDto<T>>(result);
199219
}

0 commit comments

Comments
 (0)