Namespaces and Umbraco 8 specific code cleanup

acoumb · acoumb · commit 10b1d35e38ad · 2024-08-15T07:16:08.000+03:00
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/CheckOAuthConfigurationController.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/CheckOAuthConfigurationController.cs
@@ -1,11 +1,6 @@
 ﻿using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/DynamicsControllerBase.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/DynamicsControllerBase.cs
@@ -1,9 +1,4 @@
 ﻿using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Cms.Api.Common.Attributes;
 using Umbraco.Cms.Web.Common.Routing;
 
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/FormsControllerBase.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/FormsControllerBase.cs
@@ -1,17 +1,9 @@
-﻿using Microsoft.AspNetCore.Mvc;
+﻿using Asp.Versioning;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
-using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
-using Umbraco.Cms.Integrations.Crm.Dynamics.Models;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
 using static Umbraco.Cms.Integrations.Crm.Dynamics.DynamicsComposer;
-using Asp.Versioning;
-using Microsoft.AspNetCore.Http;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
 {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetAccessTokenController.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetAccessTokenController.cs
@@ -1,11 +1,6 @@
 ﻿using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetAuthorizationUrlController.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetAuthorizationUrlController.cs
@@ -1,11 +1,6 @@
 ﻿using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
 
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetEmbedCodeController.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetEmbedCodeController.cs
@@ -1,11 +1,6 @@
 ﻿using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
 
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetFormsController.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetFormsController.cs
@@ -1,15 +1,10 @@
 ﻿using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
-using Umbraco.Cms.Integrations.Crm.Dynamics.Models;
-using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
+using Umbraco.Cms.Integrations.Crm.Dynamics.Models;
+using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
+using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
 {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetSystemUserFullNameController.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/GetSystemUserFullNameController.cs
@@ -1,11 +1,6 @@
 ﻿using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
 
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/OAuthController.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/OAuthController.cs
@@ -1,11 +1,6 @@
 ﻿using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/RevokeAccessTokenController.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Api/Management/Controllers/RevokeAccessTokenController.cs
@@ -1,11 +1,6 @@
 ﻿using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
 
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Configuration/DynamicsOAuthSettings.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Configuration/DynamicsOAuthSettings.cs
@@ -1,33 +1,15 @@
-﻿
-using System.Collections.Specialized;
-
-namespace Umbraco.Cms.Integrations.Crm.Dynamics.Configuration
+﻿namespace Umbraco.Cms.Integrations.Crm.Dynamics.Configuration
 {
     public class DynamicsOAuthSettings
     {
-        public DynamicsOAuthSettings() { }
-
-        public DynamicsOAuthSettings(NameValueCollection appSettings)
-        {
-            ClientId = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmDynamicsClientIdKey];
-
-            ClientSecret = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmDynamicsClientSecretKey];
-
-            RedirectUri = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmDynamicsRedirectUriKey];
-
-            Scopes = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmDynamicsScopesKey];
-
-            TokenEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmDynamicsTokenEndpointKey];
-        }
-
-        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.Crm.Dynamics/Configuration/DynamicsSettings.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Configuration/DynamicsSettings.cs
@@ -1,25 +1,10 @@
-﻿using System.Collections.Specialized;
-
-namespace Umbraco.Cms.Integrations.Crm.Dynamics.Configuration
+﻿namespace Umbraco.Cms.Integrations.Crm.Dynamics.Configuration
 {
     public class DynamicsSettings
     {
-        public DynamicsSettings() { }
-
-        public DynamicsSettings(NameValueCollection appSettings)
-        {
-            HostUrl = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmDynamicsHostUrlKey];
-
-            ApiPath = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmDynamicsApiPathKey];
-
-            UseUmbracoAuthorization = bool.TryParse(appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmDynamicsUseUmbracoAuthorizationKey], out var key) 
-                ? key 
-                : true;
-        }
-
-        public string HostUrl { get; set; }
+        public string HostUrl { get; set; } = string.Empty;
 
-        public string ApiPath { get; set; }
+        public string ApiPath { get; set; } = string.Empty;
 
         public bool UseUmbracoAuthorization { get; set; } = true;
     }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Constants.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Constants.cs
@@ -13,13 +13,9 @@ public class Constants
 
         public const int AccessTokenFieldSize = 4000;
 
-        public const string AppPluginFolderPath = "~/App_Plugins/UmbracoCms.Integrations/Crm/Dynamics";
-
         public static class RenderingComponent
         {
-            public const string DefaultViewPath = AppPluginFolderPath + "/Render/DynamicsForm.cshtml";
-
-            public const string DefaultV8ViewPath = AppPluginFolderPath + "/Render/DynamicsFormV8.cshtml";
+            public const string DefaultViewPath = "~/Views/Dynamics/Render/DynamicsForm.cshtml";
         }
 
         public static class ManagementApi
@@ -51,23 +47,6 @@ public static class Configuration
             public const string Settings = "Umbraco:Cms:Integrations:Crm:Dynamics:Settings";
 
             public const string OAuthSettings = "Umbraco:Cms:Integrations:Crm:Dynamics:OAuthSettings";
-
-            public const string UmbracoCmsIntegrationsCrmDynamicsHostUrlKey = "Umbraco.Cms.Integrations.Crm.Dynamics.HostUrl";
-
-            public const string UmbracoCmsIntegrationsCrmDynamicsApiPathKey = "Umbraco.Cms.Integrations.Crm.Dynamics.ApiPath";
-
-            public const string UmbracoCmsIntegrationsCrmDynamicsUseUmbracoAuthorizationKey = 
-                "Umbraco.Cms.Integrations.Crm.Dynamics.UseUmbracoAuthorization";
-
-            public const string UmbracoCmsIntegrationsCrmDynamicsClientIdKey = "Umbraco.Cms.Integrations.Crm.Dynamics.ClientId";
-
-            public const string UmbracoCmsIntegrationsCrmDynamicsClientSecretKey = "Umbraco.Cms.Integrations.Crm.Dynamics.ClientSecret";
-
-            public const string UmbracoCmsIntegrationsCrmDynamicsRedirectUriKey = "Umbraco.Cms.Integrations.Crm.Dynamics.RedirectUri";
-
-            public const string UmbracoCmsIntegrationsCrmDynamicsScopesKey = "Umbraco.Cms.Integrations.Crm.Dynamics.Scopes";
-
-            public const string UmbracoCmsIntegrationsCrmDynamicsTokenEndpointKey = "Umbraco.Cms.Integrations.Crm.Dynamics.TokenEndpoint";
         }
 
         public static class Modules
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerPropertyEditor.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerPropertyEditor.cs
@@ -1,9 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Cms.Core.PropertyEditors;
+﻿using Umbraco.Cms.Core.PropertyEditors;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Editors
 {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerValueConverter.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Editors/DynamicsFormPickerValueConverter.cs
@@ -1,13 +1,10 @@
-﻿using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
+﻿using Newtonsoft.Json.Linq;
+using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Helpers;
-using Umbraco.Cms.Integrations.Crm.Dynamics.Models.ViewModels;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models;
+using Umbraco.Cms.Integrations.Crm.Dynamics.Models.ViewModels;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Services;
-using Microsoft.Extensions.Options;
-using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Models.PublishedContent;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Editors
 {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Migrations/EnsureAccessTokenColumnLength.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Migrations/EnsureAccessTokenColumnLength.cs
@@ -1,6 +1,5 @@
 ﻿using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Infrastructure.Migrations;
-using Umbraco.Cms.Infrastructure.Persistence;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Migrations
 {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/Dtos/ResponseDto.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/Dtos/ResponseDto.cs
@@ -1,6 +1,4 @@
-﻿using System.Collections.Generic;
-
-using Newtonsoft.Json;
+﻿using Newtonsoft.Json;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos
 {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/DynamicsModule.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/DynamicsModule.cs
@@ -1,6 +1,4 @@
-﻿using System;
-
-namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models
+﻿namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models
 {
     [Flags]
     public enum DynamicsModule
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/JavascriptResponse.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/JavascriptResponse.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Text;
+﻿using System.Text;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models
 {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/ViewModels/FormViewModel.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Models/ViewModels/FormViewModel.cs
@@ -1,5 +1,4 @@
 ﻿using Newtonsoft.Json;
-using System.Linq;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Models.ViewModels
 {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/AuthorizationService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/AuthorizationService.cs
@@ -1,11 +1,7 @@
-﻿using System.Threading.Tasks;
-using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
+﻿using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
-using System.Net.Http;
-using System;
-using System.Collections.Generic;
+using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
-using Microsoft.Extensions.Options;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
 {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/BaseAuthorizationService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/BaseAuthorizationService.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Net.Http;
-
-namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
+﻿namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
 {
     public class BaseAuthorizationService
     {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsConfigurationService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsConfigurationService.cs
@@ -1,6 +1,5 @@
 ﻿using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Scoping;
-using System;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Migrations;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
 
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsService.cs
@@ -1,16 +1,10 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading.Tasks;
+﻿using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System.Net.Http.Headers;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
-using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models;
-using Microsoft.Extensions.Options;
+using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
 {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/IDynamicsAuthorizationService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/IDynamicsAuthorizationService.cs
@@ -1,6 +1,4 @@
-﻿using System.Threading.Tasks;
-
-namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
+﻿namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
 {
     public interface IDynamicsAuthorizationService
     {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/UmbracoAuthorizationService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/UmbracoAuthorizationService.cs
@@ -1,11 +1,7 @@
-﻿using System.Threading.Tasks;
-using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
-using System.Collections.Generic;
-using System.Net.Http;
-using System;
+﻿using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
+using Umbraco.Cms.Integrations.Crm.Dynamics.Configuration;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
-using Microsoft.Extensions.Options;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
 {
