V14: Integrations (Dynamics)

dtng95 · dtng95 · commit 3aa204a19f0c · 2024-08-07T17:30:02.000+07:00
- Remove netcoreapp checking logic
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerValueConverter.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerValueConverter.cs
@@ -5,18 +5,9 @@
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models.ViewModels;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
-
-
-
-#if NETCOREAPP
 using Microsoft.Extensions.Options;
-
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Models.PublishedContent;
-#else
-using Umbraco.Core.Models.PublishedContent;
-using Umbraco.Core.PropertyEditors;
-#endif
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Editors
 {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Helpers/DynamicsHtmlExtensions.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Helpers/DynamicsHtmlExtensions.cs
@@ -1,32 +1,16 @@
 ﻿using Umbraco.Cms.Integrations.Crm.Dynamics.Models.ViewModels;
-
-#if NETCOREAPP
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
-#else
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Mvc.Html;
-#endif
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Helpers
 {
     public static class DynamicsHtmlExtensions
     {
-#if NETCOREAPP
         public static IHtmlContent RenderDynamicsForm(this IHtmlHelper<dynamic> htmlHelper, FormViewModel formVM, string renderingViewPath = "")
         {
             return htmlHelper.Partial(string.IsNullOrEmpty(renderingViewPath) 
                 ? Constants.RenderingComponent.DefaultViewPath : renderingViewPath,
                 formVM);
         }
-#else
-        public static IHtmlString RenderDynamicsForm(this HtmlHelper helper, FormViewModel formVM, string renderingViewPath = "")
-        {
-            return helper.Partial(string.IsNullOrEmpty(renderingViewPath)
-                ? Constants.RenderingComponent.DefaultV8ViewPath : renderingViewPath,
-                formVM);
-        }
-#endif
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Migrations/DynamicsMigration.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Migrations/DynamicsMigration.cs
@@ -1,15 +1,7 @@
 ﻿using NPoco;
-
-#if NETCOREAPP
 using Microsoft.Extensions.Logging;
-
 using Umbraco.Cms.Infrastructure.Migrations;
 using Umbraco.Cms.Infrastructure.Persistence.DatabaseAnnotations;
-#else
-using Umbraco.Core.Logging;
-using Umbraco.Core.Migrations;
-using Umbraco.Core.Persistence.DatabaseAnnotations;
-#endif
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Migrations
 {
@@ -24,30 +16,17 @@ public DynamicsMigration(IMigrationContext context) : base(context)
         {
         }
 
-#if NETCOREAPP
         protected override void Migrate()
-#else
-        public override void Migrate()
-#endif
         {
-#if NETCOREAPP
             Logger.LogDebug(MigrationLoggingMessage);
 
-#else
-            Logger.Debug<DynamicsMigration>(MigrationLoggingMessage);
-#endif
-
             if (TableExists(Constants.DynamicsOAuthConfigurationTable) == false)
             {
                 Create.Table<DynamicsOAuthConfigurationTable>().Do();
             }
             else
             {
-#if NETCOREAPP
                 Logger.LogDebug(DbTableExistsMessage);
-#else
-                Logger.Debug<DynamicsMigration>(DbTableExistsMessage);
-#endif
             }
         }
     }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Migrations/DynamicsMigrationPlan.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Migrations/DynamicsMigrationPlan.cs
@@ -1,8 +1,4 @@
-﻿#if NETCOREAPP
-using Umbraco.Cms.Infrastructure.Migrations;
-#else
-using Umbraco.Core.Migrations;
-#endif
+﻿using Umbraco.Cms.Infrastructure.Migrations;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Migrations
 {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Migrations/EnsureAccessTokenColumnLength.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Migrations/EnsureAccessTokenColumnLength.cs
@@ -1,11 +1,6 @@
-﻿#if NETCOREAPP
-using Microsoft.Extensions.Logging;
+﻿using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Infrastructure.Migrations;
 using Umbraco.Cms.Infrastructure.Persistence;
-#else
-using Umbraco.Core.Logging;
-using Umbraco.Core.Migrations;
-#endif
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Migrations
 {
@@ -15,25 +10,15 @@ public EnsureAccessTokenColumnLength(IMigrationContext context) : base(context)
         {
         }
 
-#if NETCOREAPP
         protected override void Migrate()
-#else
-        public override void Migrate()
-#endif
         {
-#if NETCOREAPP
             Logger.LogDebug("Running migration {0}", nameof(EnsureAccessTokenColumnLength));
 
-#else
-            Logger.Debug<EnsureAccessTokenColumnLength>("Running migration {0}", nameof(EnsureAccessTokenColumnLength));
-#endif
-
             Alter.Table(Constants.DynamicsOAuthConfigurationTable)
                 .AlterColumn(nameof(DynamicsOAuthConfigurationTable.AccessToken))
                 .AsString(Constants.AccessTokenFieldSize)
                 .NotNullable()
                 .Do();
-            
         }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Migrations/UmbracoAppStartingHandler.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Migrations/UmbracoAppStartingHandler.cs
@@ -1,16 +1,10 @@
-﻿#if NETCOREAPP
-using Umbraco.Cms.Core;
+﻿using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Migrations;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Migrations.Upgrade;
-
-#if NET5_0
-using Umbraco.Cms.Core.Scoping;
-#else
 using Umbraco.Cms.Infrastructure.Scoping;
-#endif
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Migrations
 {
@@ -47,5 +41,4 @@ public void Handle(UmbracoApplicationStartingNotification notification)
             upgrader.Execute(_migrationPlanExecutor, _scopeProvider, _keyValueService);
         }
     }
-}
-#endif
+}
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/AuthorizationService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/AuthorizationService.cs
@@ -1,39 +1,25 @@
 ﻿using System.Threading.Tasks;
-
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
 using Newtonsoft.Json;
 using System.Net.Http;
 using System;
 using System.Collections.Generic;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
-
-#if NETCOREAPP
 using Microsoft.Extensions.Options;
-#else
-using System.Configuration;
-#endif
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
 {
     public class AuthorizationService : BaseAuthorizationService, IDynamicsAuthorizationService
     {
         private readonly DynamicsOAuthSettings _oauthSettings;
 
-#if NETCOREAPP
         public AuthorizationService(IOptions<DynamicsOAuthSettings> oauthOptions,
             DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService)
                 : base(dynamicsService, dynamicsConfigurationService)
 
         {
             _oauthSettings = oauthOptions.Value;
         }
-#else
-        public AuthorizationService(DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService)
-            : base(dynamicsService, dynamicsConfigurationService)
-        {
-            _oauthSettings = new DynamicsOAuthSettings(ConfigurationManager.AppSettings);
-        }
-#endif
 
         public string GetAuthorizationUrl() => string.Format(DynamicsAuthorizationUrl,
             _oauthSettings.ClientId,
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsConfigurationService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsConfigurationService.cs
@@ -1,10 +1,5 @@
-﻿#if NETCOREAPP
-using Microsoft.Extensions.Logging;
+﻿using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Scoping;
-#else
-using Umbraco.Core.Logging;
-using Umbraco.Core.Scoping;
-#endif
 using System;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Migrations;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
@@ -14,8 +9,6 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
     public class DynamicsConfigurationService
     {
         private readonly IScopeProvider _scopeProvider;
-
-#if NETCOREAPP
         private readonly ILogger<DynamicsService> _logger;
 
         public DynamicsConfigurationService(IScopeProvider scopeProvider, ILogger<DynamicsService> logger)
@@ -24,16 +17,6 @@ public DynamicsConfigurationService(IScopeProvider scopeProvider, ILogger<Dynami
 
             _logger = logger;
         }
-#else
-        private readonly ILogger _logger;
-
-        public DynamicsConfigurationService(IScopeProvider scopeProvider, ILogger logger)
-        {
-            _scopeProvider = scopeProvider;
-
-            _logger = logger;
-        }
-#endif
 
         public string AddorUpdateOAuthConfiguration(string accessToken, string userId, string fullName)
         {
@@ -61,11 +44,7 @@ public string AddorUpdateOAuthConfiguration(string accessToken, string userId, s
             {
                 var message = $"An error has occurred while adding the OAuth configuration: {ex.Message}";
 
-#if NETCOREAPP
                 _logger.LogError(message);
-#else
-                _logger.Error<DynamicsService>(message);
-#endif
                 return message;
             }
         }
@@ -119,11 +98,7 @@ public string Delete()
             {
                 var message = $"An error has occurred while deleting the OAuth configuration: {e.Message}";
 
-#if NETCOREAPP
                 _logger.LogError(message);
-#else
-                _logger.Error<DynamicsConfigurationService>(message);
-#endif
 
                 return message;
             }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsService.cs
@@ -5,19 +5,12 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
-
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models;
-
-
-#if NETCOREAPP
 using Microsoft.Extensions.Options;
-#else
-#endif
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
 {
@@ -33,21 +26,12 @@ public class DynamicsService
         // Access to the client within the class is via ClientFactory(), allowing us to mock the responses in tests.
         public static Func<HttpClient> ClientFactory = () => s_client;
 
-#if NETCOREAPP
         public DynamicsService(IOptions<DynamicsSettings> options, DynamicsConfigurationService dynamicsConfigurationService)
         {
             _settings = options.Value;
 
             _dynamicsConfigurationService = dynamicsConfigurationService;
         }
-#else
-        public DynamicsService(DynamicsConfigurationService dynamicsConfigurationService)
-        {
-            _settings = new DynamicsSettings(ConfigurationManager.AppSettings);
-
-            _dynamicsConfigurationService = dynamicsConfigurationService;
-        }
-#endif
 
         public async Task<IdentityDto> GetIdentity(string accessToken)
         {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/UmbracoAuthorizationService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/UmbracoAuthorizationService.cs
@@ -1,17 +1,11 @@
 ﻿using System.Threading.Tasks;
-
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
 using System.Collections.Generic;
 using System.Net.Http;
 using System;
 using Newtonsoft.Json;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
-
-#if NETCOREAPP
 using Microsoft.Extensions.Options;
-#else
-using System.Configuration;
-#endif
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
 {
@@ -31,20 +25,12 @@ public class UmbracoAuthorizationService : BaseAuthorizationService, IDynamicsAu
 
         protected const string OAuthScopes = "{0}.default";
 
-#if NETCOREAPP
         public UmbracoAuthorizationService(IOptions<DynamicsSettings> options, 
             DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService) 
             : base(dynamicsService, dynamicsConfigurationService)
         {
             _settings = options.Value;
         }
-#else
-        public UmbracoAuthorizationService(DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService)
-            : base(dynamicsService, dynamicsConfigurationService)
-        {
-            _settings = new DynamicsSettings(ConfigurationManager.AppSettings);
-        }
-#endif
 
         public string GetAuthorizationUrl()
         {

Original file line number	Diff line number	Diff line change
`@@ -1,32 +1,16 @@`
`1`	`1`	`using Umbraco.Cms.Integrations.Crm.Dynamics.Models.ViewModels;`
`2`		`-`
`3`		`-#if NETCOREAPP`
`4`	`2`	`using Microsoft.AspNetCore.Html;`
`5`	`3`	`using Microsoft.AspNetCore.Mvc.Rendering;`
`6`		`-#else`
`7`		`-using System.Web;`
`8`		`-using System.Web.Mvc;`
`9`		`-using System.Web.Mvc.Html;`
`10`		`-#endif`
`11`	`4`
`12`	`5`	`namespace Umbraco.Cms.Integrations.Crm.Dynamics.Helpers`
`13`	`6`	`{`
`14`	`7`	`public static class DynamicsHtmlExtensions`
`15`	`8`	`{`
`16`		`-#if NETCOREAPP`
`17`	`9`	`public static IHtmlContent RenderDynamicsForm(this IHtmlHelper<dynamic> htmlHelper, FormViewModel formVM, string renderingViewPath = "")`
`18`	`10`	`{`
`19`	`11`	`return htmlHelper.Partial(string.IsNullOrEmpty(renderingViewPath)`
`20`	`12`	`? Constants.RenderingComponent.DefaultViewPath : renderingViewPath,`
`21`	`13`	`formVM);`
`22`	`14`	`}`
`23`		`-#else`
`24`		`- public static IHtmlString RenderDynamicsForm(this HtmlHelper helper, FormViewModel formVM, string renderingViewPath = "")`
`25`		`- {`
`26`		`- return helper.Partial(string.IsNullOrEmpty(renderingViewPath)`
`27`		`- ? Constants.RenderingComponent.DefaultV8ViewPath : renderingViewPath,`
`28`		`- formVM);`
`29`		`- }`
`30`		`-#endif`
`31`	`15`	`}`
`32`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,7 @@`
`1`	`1`	`using NPoco;`
`2`		`-`
`3`		`-#if NETCOREAPP`
`4`	`2`	`using Microsoft.Extensions.Logging;`
`5`		`-`
`6`	`3`	`using Umbraco.Cms.Infrastructure.Migrations;`
`7`	`4`	`using Umbraco.Cms.Infrastructure.Persistence.DatabaseAnnotations;`
`8`		`-#else`
`9`		`-using Umbraco.Core.Logging;`
`10`		`-using Umbraco.Core.Migrations;`
`11`		`-using Umbraco.Core.Persistence.DatabaseAnnotations;`
`12`		`-#endif`
`13`	`5`
`14`	`6`	`namespace Umbraco.Cms.Integrations.Crm.Dynamics.Migrations`
`15`	`7`	`{`
`@@ -24,30 +16,17 @@ public DynamicsMigration(IMigrationContext context) : base(context)`
`24`	`16`	`{`
`25`	`17`	`}`
`26`	`18`
`27`		`-#if NETCOREAPP`
`28`	`19`	`protected override void Migrate()`
`29`		`-#else`
`30`		`- public override void Migrate()`
`31`		`-#endif`
`32`	`20`	`{`
`33`		`-#if NETCOREAPP`
`34`	`21`	`Logger.LogDebug(MigrationLoggingMessage);`
`35`	`22`
`36`		`-#else`
`37`		`- Logger.Debug<DynamicsMigration>(MigrationLoggingMessage);`
`38`		`-#endif`
`39`		`-`
`40`	`23`	`if (TableExists(Constants.DynamicsOAuthConfigurationTable) == false)`
`41`	`24`	`{`
`42`	`25`	`Create.Table<DynamicsOAuthConfigurationTable>().Do();`
`43`	`26`	`}`
`44`	`27`	`else`
`45`	`28`	`{`
`46`		`-#if NETCOREAPP`
`47`	`29`	`Logger.LogDebug(DbTableExistsMessage);`
`48`		`-#else`
`49`		`- Logger.Debug<DynamicsMigration>(DbTableExistsMessage);`
`50`		`-#endif`
`51`	`30`	`}`
`52`	`31`	`}`
`53`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,4 @@`
`1`		`-#if NETCOREAPP`
`2`		`-using Umbraco.Cms.Infrastructure.Migrations;`
`3`		`-#else`
`4`		`-using Umbraco.Core.Migrations;`
`5`		`-#endif`
	`1`	`+using Umbraco.Cms.Infrastructure.Migrations;`
`6`	`2`
`7`	`3`	`namespace Umbraco.Cms.Integrations.Crm.Dynamics.Migrations`
`8`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,6 @@`
`1`		`-#if NETCOREAPP`
`2`		`-using Microsoft.Extensions.Logging;`
	`1`	`+using Microsoft.Extensions.Logging;`
`3`	`2`	`using Umbraco.Cms.Infrastructure.Migrations;`
`4`	`3`	`using Umbraco.Cms.Infrastructure.Persistence;`
`5`		`-#else`
`6`		`-using Umbraco.Core.Logging;`
`7`		`-using Umbraco.Core.Migrations;`
`8`		`-#endif`
`9`	`4`
`10`	`5`	`namespace Umbraco.Cms.Integrations.Crm.Dynamics.Migrations`
`11`	`6`	`{`
`@@ -15,25 +10,15 @@ public EnsureAccessTokenColumnLength(IMigrationContext context) : base(context)`
`15`	`10`	`{`
`16`	`11`	`}`
`17`	`12`
`18`		`-#if NETCOREAPP`
`19`	`13`	`protected override void Migrate()`
`20`		`-#else`
`21`		`- public override void Migrate()`
`22`		`-#endif`
`23`	`14`	`{`
`24`		`-#if NETCOREAPP`
`25`	`15`	`Logger.LogDebug("Running migration {0}", nameof(EnsureAccessTokenColumnLength));`
`26`	`16`
`27`		`-#else`
`28`		`- Logger.Debug<EnsureAccessTokenColumnLength>("Running migration {0}", nameof(EnsureAccessTokenColumnLength));`
`29`		`-#endif`
`30`		`-`
`31`	`17`	`Alter.Table(Constants.DynamicsOAuthConfigurationTable)`
`32`	`18`	`.AlterColumn(nameof(DynamicsOAuthConfigurationTable.AccessToken))`
`33`	`19`	`.AsString(Constants.AccessTokenFieldSize)`
`34`	`20`	`.NotNullable()`
`35`	`21`	`.Do();`
`36`		`-`
`37`	`22`	`}`
`38`	`23`	`}`
`39`	`24`	`}`