Factory updates to support refresh token action

Author: acoumb

src/Umbraco.Cms.Integrations.Authorization/Models/Enums/ServiceType.cs

@@ -5,8 +5,9 @@ public class ServiceType
     {
         public enum ServiceTypeEnum
         {
-            Hubspot,
-            Semrush,
+            HubspotAuthorization,
+            SemrushAuthorization,
+            SemrushReauthorization,
             Shopify
         }
     }

src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy/Configuration/Settings.cs

@@ -7,6 +7,8 @@ public class Settings
 
         public string AuthEndpoint { get; set; }
 
+        public string RefreshAuthEndpoint { get; set; }
+
         public string ClientId { get; set; }
 
         public string ClientSecret { get; set; }

src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy/Factories/AuthorizationServiceFactory.cs

@@ -1,12 +1,10 @@
 using System;
 using System.Net.Http;
-using Microsoft.AspNetCore.Http;
+
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Options;
+
 using Umbraco.Cms.Integrations.Authorization.Core.Models.Enums;
 using Umbraco.Cms.Integrations.Authorization.Core.Interfaces;
-using Umbraco.Cms.Integrations.Authorization.Core.Models.Dtos;
-using Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Configuration;
 using Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Services;
 
 namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Factories
@@ -28,10 +26,12 @@ public IAuthorizationService Create(ServiceType.ServiceTypeEnum serviceType)
         {
             switch (serviceType)
             {
-                case ServiceType.ServiceTypeEnum.Hubspot:
+                case ServiceType.ServiceTypeEnum.HubspotAuthorization:
                     return new HubspotService(_httpClientFactory, _configuration);
-                case ServiceType.ServiceTypeEnum.Semrush:
-                    return new SemrushService(_httpClientFactory, _configuration);
+                case ServiceType.ServiceTypeEnum.SemrushAuthorization:
+                    return new SemrushAuthorizationService(_httpClientFactory, _configuration);
+                case ServiceType.ServiceTypeEnum.SemrushReauthorization:
+                    return new SemrushReauthorizationService(_httpClientFactory, _configuration);
                 default: throw new NotImplementedException("Service Type not implemented.");
             }
         }

src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy/Services/SemrushService.cs renamed to src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy/Services/SemrushAuthorizationService.cs

@@ -5,23 +5,22 @@
 
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Options;
 
 using Umbraco.Cms.Integrations.Authorization.Core.Models.Dtos;
 using Umbraco.Cms.Integrations.Authorization.Core.Interfaces;
 using Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Configuration;
 
 namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Services
 {
-    public class SemrushService: IAuthorizationService
+    public class SemrushAuthorizationService: IAuthorizationService
     {
         private readonly IHttpClientFactory _httpClientFactory;
 
         private readonly IConfiguration _configuration;
 
         private readonly Settings _settings;
 
-        public SemrushService(IHttpClientFactory httpClientFactory, IConfiguration configuration)
+        public SemrushAuthorizationService(IHttpClientFactory httpClientFactory, IConfiguration configuration)
         {
             _httpClientFactory = httpClientFactory;
 

src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy/Services/SemrushReauthorizationService.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+
+using Umbraco.Cms.Integrations.Authorization.Core.Models.Dtos;
+using Umbraco.Cms.Integrations.Authorization.Core.Interfaces;
+using Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Configuration;
+
+namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Services
+{
+    public class SemrushReauthorizationService: IAuthorizationService
+    {
+        private readonly IHttpClientFactory _httpClientFactory;
+
+        private readonly IConfiguration _configuration;
+
+        private readonly Settings _settings;
+
+        public SemrushReauthorizationService(IHttpClientFactory httpClientFactory, IConfiguration configuration)
+        {
+            _httpClientFactory = httpClientFactory;
+
+            _configuration = configuration;
+
+            _settings = new Settings();
+            _configuration.GetSection("SemrushSettings").Bind(_settings);
+        }
+
+        public async Task<ResponseDto> ProcessAsync(HttpContent content)
+        {
+            var client = _httpClientFactory.CreateClient();
+            client.BaseAddress = new Uri(_settings.BaseUrl);
+
+            var response = await client.PostAsync(_settings.RefreshAuthEndpoint, content);
+
+            var responseContent = await response.Content.ReadAsStringAsync();
+
+            return new ResponseDto
+            {
+                StatusCode = (int) response.StatusCode,
+                ContentType = response.Content.Headers.ContentType?.ToString(),
+                ContentLength = response.Content.Headers.ContentLength,
+                Content = responseContent
+            };
+        }
+
+        public HttpContent GetContent(IFormCollection form)
+        {
+            var dictionary = form.ToDictionary(x => x.Key, x => x.Value.ToString());
+
+            dictionary.Add("client_id", _settings.ClientId);
+            dictionary.Add("client_secret", _settings.ClientSecret);
+            dictionary.Add("grant_type", "refresh_token");
+
+            return new FormUrlEncodedContent(dictionary);
+        }
+    }
+}

src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy/appsettings.Development.json

@@ -10,6 +10,7 @@
   "SemrushSettings": {
     "BaseUrl": "https://oauth.semrush.com/",
     "AuthEndpoint": "oauth2/access_token",
+    "RefreshAuthEndpoint": "oauth2/access_token",
     "ApiBaseUrl": "https://api.semrush.com",
     "ClientId": "umbraco",
     "ClientSecret": "XOPzh6WKjOI5bfhB0M26dIWFHLfktOWk",