Semrush integration

- Remove ClientFactory()
- Minor changes on UI

Author: dtng95

src/Umbraco.Cms.Integrations.SEO.Semrush/Api/Management/Controllers/SemrushControllerBase.cs

@@ -18,12 +18,7 @@ namespace Umbraco.Cms.Integrations.SEO.Semrush.Api.Management.Controllers
     public class SemrushControllerBase : Controller
     {
         protected static IHttpClientFactory _clientFactory;
-        private IOptions<SemrushSettings> options;
-        private IWebHostEnvironment webHostEnvironment;
-        private ISemrushTokenService semrushTokenService;
-        private ICacheHelper cacheHelper;
-        private TokenBuilder tokenBuilder;
-        private AuthorizationImplementationFactory authorizationImplementationFactory;
+
         protected static readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim();
 
         protected readonly ISemrushTokenService _semrushTokenService;

src/Umbraco.Cms.Integrations.SEO.Semrush/Api/Management/Controllers/Token/GetAccessTokenController.cs

@@ -23,7 +23,7 @@ public GetAccessTokenController(
 
         [HttpPost("token/get")]
         [ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
-        [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
+        [ProducesResponseType(typeof(string), StatusCodes.Status400BadRequest)]
         public async Task<IActionResult> GetAccessToken([FromBody] AuthorizationRequestDto request)
         {
             var result = await _authorizationService.GetAccessTokenAsync(request.Code);

src/Umbraco.Cms.Integrations.SEO.Semrush/Api/Management/Controllers/Token/RevokeTokenController.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Integrations.SEO.Semrush.Configuration;
@@ -20,6 +21,7 @@ public RevokeTokenController(
         }
 
         [HttpPost("token/revoke")]
+        [ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
         public IActionResult RevokeToken()
         {
             _semrushTokenService.RemoveParameters(Constants.TokenDbKey);

src/Umbraco.Cms.Integrations.SEO.Semrush/Client/src/workspace/semrush-workspace.element.ts

@@ -368,7 +368,7 @@ export class SemrushWorkspaceElement extends UmbLitElement {
     render(){
         return html`
             <umb-body-layout>
-                ${this._loading ? html`<div class="center loader"><uui-loader></uui-loader></div>` : ""}
+                ${this._loading ? html`<div class="semrush-loader"><uui-loader></uui-loader></div>` : ""}
                 <uui-box headline="Content Properties">
                     <div class="semrush-content">
                         <p>
@@ -476,7 +476,7 @@ export class SemrushWorkspaceElement extends UmbLitElement {
 
                         ${this.keywordList?.data !== undefined && !!this.keywordList?.data 
                             ? html`
-                                ${this._searchLoading ? html`<div class="center loader"><uui-loader></uui-loader></div>` : ""}
+                                ${this._searchLoading ? html`<div class="semrush-loader"><uui-loader></uui-loader></div>` : ""}
                                 <div class="semrush-table">
                                     <uui-table>
                                         <uui-table-head style="background-color: ; color: ">
@@ -555,6 +555,10 @@ export class SemrushWorkspaceElement extends UmbLitElement {
                 border-radius: var(--uui-border-radius); 
                 font-size: 0.9rem;
             }
+
+            .semrush-loader{
+                text-align: center;
+            }
         `];
 }
 export default SemrushWorkspaceElement;

src/Umbraco.Cms.Integrations.SEO.Semrush/Services/AuthorizationService.cs

@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Options;
+using System.Net.Http;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using Umbraco.Cms.Integrations.SEO.Semrush.Configuration;
@@ -10,8 +11,8 @@ public class AuthorizationService : BaseAuthorizationService, ISemrushAuthorizat
     {
         private readonly SemrushOAuthSettings _oauthSettings;
 
-        public AuthorizationService(IOptions<SemrushOAuthSettings> options, TokenBuilder tokenBuilder, ISemrushTokenService semrushTokenService)
-            : base(tokenBuilder, semrushTokenService)
+        public AuthorizationService(IOptions<SemrushOAuthSettings> options, TokenBuilder tokenBuilder, ISemrushTokenService semrushTokenService, IHttpClientFactory httpClientFactory)
+            : base(tokenBuilder, semrushTokenService, httpClientFactory)
         {
             _oauthSettings = options.Value;
         }
@@ -33,7 +34,7 @@ public async Task<string> GetAccessTokenAsync(string code)
                 Content = new FormUrlEncodedContent(requestData),
             };
 
-            var response = await ClientFactory().SendAsync(requestMessage);
+            var response = await HttpClientFactory.CreateClient().SendAsync(requestMessage);
 
             var result = await response.Content.ReadAsStringAsync();
 
@@ -71,7 +72,7 @@ public async Task<string> RefreshAccessTokenAsync()
             };
             requestMessage.Headers.Add("service", "Semrush");
 
-            var response = await ClientFactory().SendAsync(requestMessage);
+            var response = await HttpClientFactory.CreateClient().SendAsync(requestMessage);
             if (response.IsSuccessStatusCode)
             {
                 var result = await response.Content.ReadAsStringAsync();

src/Umbraco.Cms.Integrations.SEO.Semrush/Services/BaseAuthorizationService.cs

@@ -10,20 +10,17 @@ public class BaseAuthorizationService
             "&scope={3}";
 
         // Using a static HttpClient (see: https://www.aspnetmonsters.com/2016/08/2016-08-27-httpclientwrong/).
-        private readonly static HttpClient s_client = new HttpClient();
-
-        // 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 IHttpClientFactory HttpClientFactory;
 
         protected readonly TokenBuilder TokenBuilder;
 
         protected readonly ISemrushTokenService SemrushTokenService;
 
-        public BaseAuthorizationService(TokenBuilder tokenBuilder, ISemrushTokenService semrushTokenService)
+        public BaseAuthorizationService(TokenBuilder tokenBuilder, ISemrushTokenService semrushTokenService, IHttpClientFactory httpClientFactory)
         {
             TokenBuilder = tokenBuilder;
-
             SemrushTokenService = semrushTokenService;
+            HttpClientFactory = httpClientFactory;
         }
     }
 }

src/Umbraco.Cms.Integrations.SEO.Semrush/Services/UmbracoAuthorizationService.cs

@@ -1,5 +1,7 @@
-using System.Text.Json;
+using Microsoft.Extensions.Options;
+using System.Text.Json;
 using System.Text.Json.Nodes;
+using Umbraco.Cms.Integrations.SEO.Semrush.Configuration;
 using Umbraco.Cms.Integrations.SEO.Semrush.Models.Dtos;
 
 namespace Umbraco.Cms.Integrations.SEO.Semrush.Services
@@ -10,8 +12,8 @@ public class UmbracoAuthorizationService : BaseAuthorizationService, ISemrushAut
 
         public const string AuthProxyTokenEndpoint = "oauth/v1/token";
 
-        public UmbracoAuthorizationService(TokenBuilder tokenBuilder, ISemrushTokenService semrushTokenService) 
-            : base(tokenBuilder, semrushTokenService)
+        public UmbracoAuthorizationService(IOptions<SemrushOAuthSettings> options, TokenBuilder tokenBuilder, ISemrushTokenService semrushTokenService, IHttpClientFactory httpClientFactory)
+            : base(tokenBuilder, semrushTokenService, httpClientFactory)
         {
         }
 
@@ -30,7 +32,7 @@ public async Task<string> GetAccessTokenAsync(string code)
             };
             requestMessage.Headers.Add("service_name", "Semrush");
 
-            var response = await ClientFactory().SendAsync(requestMessage);
+            var response = await HttpClientFactory.CreateClient().SendAsync(requestMessage);
 
             var result = await response.Content.ReadAsStringAsync();
 
@@ -68,7 +70,7 @@ public async Task<string> RefreshAccessTokenAsync()
             };
             requestMessage.Headers.Add("service", "Semrush");
 
-            var response = await ClientFactory().SendAsync(requestMessage);
+            var response = await HttpClientFactory.CreateClient().SendAsync(requestMessage);
 
             if (response.IsSuccessStatusCode)
             {