Services implementing interfaces

acoumb · acoumb · commit 33987e642973 · 2024-08-19T18:39:05.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
@@ -9,15 +9,20 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
 {
     public class CheckOAuthConfigurationController : FormsControllerBase
     {
-        public CheckOAuthConfigurationController(IOptions<DynamicsSettings> options, DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService, DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) : base(options, dynamicsService, dynamicsConfigurationService, authorizationImplementationFactory)
+        public CheckOAuthConfigurationController(
+            IOptions<DynamicsSettings> options, 
+            IDynamicsService dynamicsService, 
+            IDynamicsConfigurationStorage dynamicsConfigurationStorage, 
+            DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) 
+            : base(options, dynamicsService, dynamicsConfigurationStorage, authorizationImplementationFactory)
         {
         }
 
         [HttpGet("oauth-configuration")]
         [ProducesResponseType(typeof(OAuthConfigurationDto), StatusCodes.Status200OK)] 
         public async Task<IActionResult> CheckOAuthConfiguration()
         {
-            var oauthConfiguration = DynamicsConfigurationService.GetOAuthConfiguration();
+            var oauthConfiguration = DynamicsConfigurationStorage.GetOAuthConfiguration();
 
             if (oauthConfiguration == null) return Ok(new OAuthConfigurationDto { Message = string.Empty });
 
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
@@ -16,13 +16,13 @@ public class FormsControllerBase : DynamicsControllerBase
 
         protected readonly IDynamicsAuthorizationService AuthorizationService;
 
-        protected readonly DynamicsService DynamicsService;
+        protected readonly IDynamicsService DynamicsService;
 
-        protected readonly DynamicsConfigurationService DynamicsConfigurationService;
+        protected readonly IDynamicsConfigurationStorage DynamicsConfigurationStorage;
 
         public FormsControllerBase(IOptions<DynamicsSettings> options,
-            DynamicsService dynamicsService,
-            DynamicsConfigurationService dynamicsConfigurationService,
+            IDynamicsService dynamicsService,
+            IDynamicsConfigurationStorage dynamicsConfigurationStorage,
             AuthorizationImplementationFactory authorizationImplementationFactory)
         {
 
@@ -32,7 +32,7 @@ public FormsControllerBase(IOptions<DynamicsSettings> options,
 
             DynamicsService = dynamicsService;
 
-            DynamicsConfigurationService = dynamicsConfigurationService;
+            DynamicsConfigurationStorage = dynamicsConfigurationStorage;
         }
     }
 }
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
@@ -9,7 +9,12 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
 {
     public class GetAccessTokenController : FormsControllerBase
     {
-        public GetAccessTokenController(IOptions<DynamicsSettings> options, DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService, DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) : base(options, dynamicsService, dynamicsConfigurationService, authorizationImplementationFactory)
+        public GetAccessTokenController(
+            IOptions<DynamicsSettings> options, 
+            IDynamicsService dynamicsService, 
+            IDynamicsConfigurationStorage dynamicsConfigurationStorage, 
+            DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) 
+            : base(options, dynamicsService, dynamicsConfigurationStorage, authorizationImplementationFactory)
         {
         }
 
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
@@ -8,7 +8,12 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
 {
     public class GetAuthorizationUrlController : FormsControllerBase
     {
-        public GetAuthorizationUrlController(IOptions<DynamicsSettings> options, DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService, DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) : base(options, dynamicsService, dynamicsConfigurationService, authorizationImplementationFactory)
+        public GetAuthorizationUrlController(
+            IOptions<DynamicsSettings> options, 
+            IDynamicsService dynamicsService, 
+            IDynamicsConfigurationStorage dynamicsConfigurationStorage, 
+            DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) 
+            : base(options, dynamicsService, dynamicsConfigurationStorage, authorizationImplementationFactory)
         {
         }
 
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
@@ -8,7 +8,12 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
 {
     public class GetEmbedCodeController : FormsControllerBase
     {
-        public GetEmbedCodeController(IOptions<DynamicsSettings> options, DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService, DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) : base(options, dynamicsService, dynamicsConfigurationService, authorizationImplementationFactory)
+        public GetEmbedCodeController(
+            IOptions<DynamicsSettings> options, 
+            IDynamicsService dynamicsService, 
+            IDynamicsConfigurationStorage dynamicsConfigurationStorage, 
+            DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) 
+            : base(options, dynamicsService, dynamicsConfigurationStorage, authorizationImplementationFactory)
         {
         }
 
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
@@ -10,7 +10,12 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
 {
     public class GetFormsController : FormsControllerBase
     {
-        public GetFormsController(IOptions<DynamicsSettings> options, DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService, DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) : base(options, dynamicsService, dynamicsConfigurationService, authorizationImplementationFactory)
+        public GetFormsController(
+            IOptions<DynamicsSettings> options, 
+            IDynamicsService dynamicsService, 
+            IDynamicsConfigurationStorage dynamicsConfigurationStorage, 
+            DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) 
+            : base(options, dynamicsService, dynamicsConfigurationStorage, authorizationImplementationFactory)
         {
         }
 
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
@@ -8,12 +8,17 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
 {
     public class GetSystemUserFullNameController : FormsControllerBase
     {
-        public GetSystemUserFullNameController(IOptions<DynamicsSettings> options, DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService, DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) : base(options, dynamicsService, dynamicsConfigurationService, authorizationImplementationFactory)
+        public GetSystemUserFullNameController(
+            IOptions<DynamicsSettings> options, 
+            IDynamicsService dynamicsService, 
+            IDynamicsConfigurationStorage dynamicsConfigurationStorage, 
+            DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) 
+            : base(options, dynamicsService, dynamicsConfigurationStorage, authorizationImplementationFactory)
         {
         }
 
         [HttpGet("system-user-fullname")]
         [ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
-        public IActionResult GetSystemUserFullName() => Ok(DynamicsConfigurationService.GetSystemUserFullName());
+        public IActionResult GetSystemUserFullName() => Ok(DynamicsConfigurationStorage.GetSystemUserFullName());
     }
 }
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
@@ -8,12 +8,17 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers
 {
     public class RevokeAccessTokenController : FormsControllerBase
     {
-        public RevokeAccessTokenController(IOptions<DynamicsSettings> options, DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService, DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) : base(options, dynamicsService, dynamicsConfigurationService, authorizationImplementationFactory)
+        public RevokeAccessTokenController(
+            IOptions<DynamicsSettings> options, 
+            IDynamicsService dynamicsService, 
+            IDynamicsConfigurationStorage dynamicsConfigurationStorage, 
+            DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) 
+            : base(options, dynamicsService, dynamicsConfigurationStorage, authorizationImplementationFactory)
         {
         }
 
         [HttpDelete("revoke-access-token")]
         [ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
-        public IActionResult RevokeAccessToken() => Ok(DynamicsConfigurationService.Delete());
+        public IActionResult RevokeAccessToken() => Ok(DynamicsConfigurationStorage.Delete());
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/AuthorizationService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/AuthorizationService.cs
@@ -8,9 +8,11 @@ public class AuthorizationService : BaseAuthorizationService, IDynamicsAuthoriza
     {
         private readonly DynamicsOAuthSettings _oauthSettings;
 
-        public AuthorizationService(IOptions<DynamicsOAuthSettings> oauthOptions,
-            DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService)
-                : base(dynamicsService, dynamicsConfigurationService)
+        public AuthorizationService(
+            IOptions<DynamicsOAuthSettings> oauthOptions,
+            IDynamicsService dynamicsService, 
+            IDynamicsConfigurationStorage dynamicsConfigurationStorage)
+            : base(dynamicsService, dynamicsConfigurationStorage)
 
         {
             _oauthSettings = oauthOptions.Value;
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/BaseAuthorizationService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/BaseAuthorizationService.cs
@@ -8,9 +8,9 @@ public class BaseAuthorizationService
         // 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;
 
-        protected readonly DynamicsService DynamicsService;
+        protected readonly IDynamicsService DynamicsService;
 
-        protected readonly DynamicsConfigurationService DynamicsConfigurationService;
+        protected readonly IDynamicsConfigurationStorage DynamicsConfigurationStorage;
 
         protected const string DynamicsAuthorizationUrl = "https://login.microsoftonline.com/common/oauth2/v2.0/authorize" +
             "?client_id={0}" +
@@ -19,11 +19,11 @@ public class BaseAuthorizationService
             "&response_mode=query" +
             "&scope={2}";
 
-        public BaseAuthorizationService(DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService)
+        public BaseAuthorizationService(IDynamicsService dynamicsService, IDynamicsConfigurationStorage dynamicsConfigurationStorage)
         {
             DynamicsService = dynamicsService;
 
-            DynamicsConfigurationService = dynamicsConfigurationService;
+            DynamicsConfigurationStorage = dynamicsConfigurationStorage;
         }
 
 
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsConfigurationStorage.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/DynamicsConfigurationStorage.cs
@@ -1,23 +1,23 @@
 ﻿using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core.Scoping;
+using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Migrations;
 using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
 
 namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
 {
-    public class DynamicsConfigurationService
+    public class DynamicsConfigurationStorage : IDynamicsConfigurationStorage
     {
         private readonly IScopeProvider _scopeProvider;
-        private readonly ILogger<DynamicsService> _logger;
+        private readonly ILogger<DynamicsConfigurationStorage> _logger;
 
-        public DynamicsConfigurationService(IScopeProvider scopeProvider, ILogger<DynamicsService> logger)
+        public DynamicsConfigurationStorage(IScopeProvider scopeProvider, ILogger<DynamicsConfigurationStorage> logger)
         {
             _scopeProvider = scopeProvider;
 
             _logger = logger;
         }
 
-        public string AddorUpdateOAuthConfiguration(string accessToken, string userId, string fullName)
+        public string AddOrUpdateOAuthConfiguration(string accessToken, string userId, string fullName)
         {
             try
             {
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/IDynamicsConfigurationStorage.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/IDynamicsConfigurationStorage.cs
@@ -0,0 +1,15 @@
+﻿using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
+
+namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
+{
+    public interface IDynamicsConfigurationStorage
+    {
+        string AddOrUpdateOAuthConfiguration(string accessToken, string userId, string fullName);
+
+        OAuthConfigurationDto GetOAuthConfiguration();
+
+        string GetSystemUserFullName();
+
+        string Delete();
+    }
+}
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/IDynamicsService.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Services/IDynamicsService.cs
@@ -0,0 +1,16 @@
+﻿using Umbraco.Cms.Integrations.Crm.Dynamics.Models;
+using Umbraco.Cms.Integrations.Crm.Dynamics.Models.Dtos;
+
+namespace Umbraco.Cms.Integrations.Crm.Dynamics.Services
+{
+    public interface IDynamicsService
+    {
+        Task<IdentityDto> GetIdentity(string accessToken);
+
+        Task<string> GetEmbedCode(string formId);
+
+        Task<IEnumerable<FormDto>> GetForms(DynamicsModule module);
+
+        Task<FormDto> GetRealTimeForm(string id);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,20 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers`
`9`	`9`	`{`
`10`	`10`	`public class CheckOAuthConfigurationController : FormsControllerBase`
`11`	`11`	`{`
`12`		`- public CheckOAuthConfigurationController(IOptions<DynamicsSettings> options, DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService, DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) : base(options, dynamicsService, dynamicsConfigurationService, authorizationImplementationFactory)`
	`12`	`+ public CheckOAuthConfigurationController(`
	`13`	`+ IOptions<DynamicsSettings> options,`
	`14`	`+ IDynamicsService dynamicsService,`
	`15`	`+ IDynamicsConfigurationStorage dynamicsConfigurationStorage,`
	`16`	`+ DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory)`
	`17`	`+ : base(options, dynamicsService, dynamicsConfigurationStorage, authorizationImplementationFactory)`
`13`	`18`	`{`
`14`	`19`	`}`
`15`	`20`
`16`	`21`	`[HttpGet("oauth-configuration")]`
`17`	`22`	`[ProducesResponseType(typeof(OAuthConfigurationDto), StatusCodes.Status200OK)]`
`18`	`23`	`public async Task<IActionResult> CheckOAuthConfiguration()`
`19`	`24`	`{`
`20`		`- var oauthConfiguration = DynamicsConfigurationService.GetOAuthConfiguration();`
	`25`	`+ var oauthConfiguration = DynamicsConfigurationStorage.GetOAuthConfiguration();`
`21`	`26`
`22`	`27`	`if (oauthConfiguration == null) return Ok(new OAuthConfigurationDto { Message = string.Empty });`
`23`	`28`
Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,13 @@ public class FormsControllerBase : DynamicsControllerBase`
`16`	`16`
`17`	`17`	`protected readonly IDynamicsAuthorizationService AuthorizationService;`
`18`	`18`
`19`		`- protected readonly DynamicsService DynamicsService;`
	`19`	`+ protected readonly IDynamicsService DynamicsService;`
`20`	`20`
`21`		`- protected readonly DynamicsConfigurationService DynamicsConfigurationService;`
	`21`	`+ protected readonly IDynamicsConfigurationStorage DynamicsConfigurationStorage;`
`22`	`22`
`23`	`23`	`public FormsControllerBase(IOptions<DynamicsSettings> options,`
`24`		`- DynamicsService dynamicsService,`
`25`		`- DynamicsConfigurationService dynamicsConfigurationService,`
	`24`	`+ IDynamicsService dynamicsService,`
	`25`	`+ IDynamicsConfigurationStorage dynamicsConfigurationStorage,`
`26`	`26`	`AuthorizationImplementationFactory authorizationImplementationFactory)`
`27`	`27`	`{`
`28`	`28`
`@@ -32,7 +32,7 @@ public FormsControllerBase(IOptions<DynamicsSettings> options,`
`32`	`32`
`33`	`33`	`DynamicsService = dynamicsService;`
`34`	`34`
`35`		`- DynamicsConfigurationService = dynamicsConfigurationService;`
	`35`	`+ DynamicsConfigurationStorage = dynamicsConfigurationStorage;`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,12 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers`
`9`	`9`	`{`
`10`	`10`	`public class GetAccessTokenController : FormsControllerBase`
`11`	`11`	`{`
`12`		`- public GetAccessTokenController(IOptions<DynamicsSettings> options, DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService, DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) : base(options, dynamicsService, dynamicsConfigurationService, authorizationImplementationFactory)`
	`12`	`+ public GetAccessTokenController(`
	`13`	`+ IOptions<DynamicsSettings> options,`
	`14`	`+ IDynamicsService dynamicsService,`
	`15`	`+ IDynamicsConfigurationStorage dynamicsConfigurationStorage,`
	`16`	`+ DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory)`
	`17`	`+ : base(options, dynamicsService, dynamicsConfigurationStorage, authorizationImplementationFactory)`
`13`	`18`	`{`
`14`	`19`	`}`
`15`	`20`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,12 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers`
`8`	`8`	`{`
`9`	`9`	`public class GetAuthorizationUrlController : FormsControllerBase`
`10`	`10`	`{`
`11`		`- public GetAuthorizationUrlController(IOptions<DynamicsSettings> options, DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService, DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) : base(options, dynamicsService, dynamicsConfigurationService, authorizationImplementationFactory)`
	`11`	`+ public GetAuthorizationUrlController(`
	`12`	`+ IOptions<DynamicsSettings> options,`
	`13`	`+ IDynamicsService dynamicsService,`
	`14`	`+ IDynamicsConfigurationStorage dynamicsConfigurationStorage,`
	`15`	`+ DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory)`
	`16`	`+ : base(options, dynamicsService, dynamicsConfigurationStorage, authorizationImplementationFactory)`
`12`	`17`	`{`
`13`	`18`	`}`
`14`	`19`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,12 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers`
`8`	`8`	`{`
`9`	`9`	`public class GetEmbedCodeController : FormsControllerBase`
`10`	`10`	`{`
`11`		`- public GetEmbedCodeController(IOptions<DynamicsSettings> options, DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService, DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) : base(options, dynamicsService, dynamicsConfigurationService, authorizationImplementationFactory)`
	`11`	`+ public GetEmbedCodeController(`
	`12`	`+ IOptions<DynamicsSettings> options,`
	`13`	`+ IDynamicsService dynamicsService,`
	`14`	`+ IDynamicsConfigurationStorage dynamicsConfigurationStorage,`
	`15`	`+ DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory)`
	`16`	`+ : base(options, dynamicsService, dynamicsConfigurationStorage, authorizationImplementationFactory)`
`12`	`17`	`{`
`13`	`18`	`}`
`14`	`19`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,12 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers`
`10`	`10`	`{`
`11`	`11`	`public class GetFormsController : FormsControllerBase`
`12`	`12`	`{`
`13`		`- public GetFormsController(IOptions<DynamicsSettings> options, DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService, DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) : base(options, dynamicsService, dynamicsConfigurationService, authorizationImplementationFactory)`
	`13`	`+ public GetFormsController(`
	`14`	`+ IOptions<DynamicsSettings> options,`
	`15`	`+ IDynamicsService dynamicsService,`
	`16`	`+ IDynamicsConfigurationStorage dynamicsConfigurationStorage,`
	`17`	`+ DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory)`
	`18`	`+ : base(options, dynamicsService, dynamicsConfigurationStorage, authorizationImplementationFactory)`
`14`	`19`	`{`
`15`	`20`	`}`
`16`	`21`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,17 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers`
`8`	`8`	`{`
`9`	`9`	`public class GetSystemUserFullNameController : FormsControllerBase`
`10`	`10`	`{`
`11`		`- public GetSystemUserFullNameController(IOptions<DynamicsSettings> options, DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService, DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) : base(options, dynamicsService, dynamicsConfigurationService, authorizationImplementationFactory)`
	`11`	`+ public GetSystemUserFullNameController(`
	`12`	`+ IOptions<DynamicsSettings> options,`
	`13`	`+ IDynamicsService dynamicsService,`
	`14`	`+ IDynamicsConfigurationStorage dynamicsConfigurationStorage,`
	`15`	`+ DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory)`
	`16`	`+ : base(options, dynamicsService, dynamicsConfigurationStorage, authorizationImplementationFactory)`
`12`	`17`	`{`
`13`	`18`	`}`
`14`	`19`
`15`	`20`	`[HttpGet("system-user-fullname")]`
`16`	`21`	`[ProducesResponseType(typeof(string), StatusCodes.Status200OK)]`
`17`		`- public IActionResult GetSystemUserFullName() => Ok(DynamicsConfigurationService.GetSystemUserFullName());`
	`22`	`+ public IActionResult GetSystemUserFullName() => Ok(DynamicsConfigurationStorage.GetSystemUserFullName());`
`18`	`23`	`}`
`19`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,17 @@ namespace Umbraco.Cms.Integrations.Crm.Dynamics.Api.Management.Controllers`
`8`	`8`	`{`
`9`	`9`	`public class RevokeAccessTokenController : FormsControllerBase`
`10`	`10`	`{`
`11`		`- public RevokeAccessTokenController(IOptions<DynamicsSettings> options, DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService, DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory) : base(options, dynamicsService, dynamicsConfigurationService, authorizationImplementationFactory)`
	`11`	`+ public RevokeAccessTokenController(`
	`12`	`+ IOptions<DynamicsSettings> options,`
	`13`	`+ IDynamicsService dynamicsService,`
	`14`	`+ IDynamicsConfigurationStorage dynamicsConfigurationStorage,`
	`15`	`+ DynamicsComposer.AuthorizationImplementationFactory authorizationImplementationFactory)`
	`16`	`+ : base(options, dynamicsService, dynamicsConfigurationStorage, authorizationImplementationFactory)`
`12`	`17`	`{`
`13`	`18`	`}`
`14`	`19`
`15`	`20`	`[HttpDelete("revoke-access-token")]`
`16`	`21`	`[ProducesResponseType(typeof(string), StatusCodes.Status200OK)]`
`17`		`- public IActionResult RevokeAccessToken() => Ok(DynamicsConfigurationService.Delete());`
	`22`	`+ public IActionResult RevokeAccessToken() => Ok(DynamicsConfigurationStorage.Delete());`
`18`	`23`	`}`
`19`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,11 @@ public class AuthorizationService : BaseAuthorizationService, IDynamicsAuthoriza`
`8`	`8`	`{`
`9`	`9`	`private readonly DynamicsOAuthSettings _oauthSettings;`
`10`	`10`
`11`		`- public AuthorizationService(IOptions<DynamicsOAuthSettings> oauthOptions,`
`12`		`- DynamicsService dynamicsService, DynamicsConfigurationService dynamicsConfigurationService)`
`13`		`- : base(dynamicsService, dynamicsConfigurationService)`
	`11`	`+ public AuthorizationService(`
	`12`	`+ IOptions<DynamicsOAuthSettings> oauthOptions,`
	`13`	`+ IDynamicsService dynamicsService,`
	`14`	`+ IDynamicsConfigurationStorage dynamicsConfigurationStorage)`
	`15`	`+ : base(dynamicsService, dynamicsConfigurationStorage)`
`14`	`16`
`15`	`17`	`{`
`16`	`18`	`_oauthSettings = oauthOptions.Value;`