Group services and update settings

Author: acoumb

src/Umbraco.Cms.Integrations.OAuthProxy/Configuration/AppSettings.cs

@@ -2,12 +2,8 @@
 {
     public class AppSettings
     {
-        public string HubspotAuthUri { get; set; }
-
         public string HubspotClientSecret { get; set; }
 
-        public string SemrushAuthUri { get; set; }
-
         public string SemrushClientSecret { get; set; }
 
         public string this[string propertyName] => (string) GetType().GetProperty(propertyName)?.GetValue(this, null);

src/Umbraco.Cms.Integrations.OAuthProxy/Controllers/OAuthProxyController.cs

@@ -20,7 +20,15 @@ public class OAuthProxyController : Controller
 
         public const string ServiceNameHeaderKey = "service_name";
 
-        private static List<string> ValidServiceNames = new List<string> {"Hubspot", "Semrush"};
+        /// <summary>
+        /// Integrated services with their token URIs
+        /// </summary>
+        private static Dictionary<string, string> ValidServices = new Dictionary<string, string>
+        {
+            { "Hubspot", "oauth/v1/token" }, { "Semrush", "oauth2/access_token" }
+        };
+
+        //private static List<string> ValidServiceNames = new List<string> {"Hubspot", "Semrush"};
 
         public OAuthProxyController(IHttpClientFactory httpClientFactory, IOptions<AppSettings> appSettings)
         {
@@ -37,7 +45,7 @@ public async Task ProxyTokenRequest()
                 serviceName = "Hubspot";
             }
 
-            if (!ValidServiceNames.Contains(serviceName))
+            if (!ValidServices.ContainsKey(serviceName))
             {
                 throw 
                     new InvalidOperationException($"Provided {ServiceNameHeaderKey} header value of {serviceName} is not supported");
@@ -46,7 +54,7 @@ public async Task ProxyTokenRequest()
             var httpClient = _httpClientFactory.CreateClient($"{serviceName}Token");
 
             var response =
-                await httpClient.PostAsync(GetAuthUri(serviceName), GetContent(Request.Form, serviceName));
+                await httpClient.PostAsync(ValidServices[serviceName], GetContent(Request.Form, serviceName));
             var content = await response.Content.ReadAsStringAsync();
 
             Response.StatusCode = (int)response.StatusCode;
@@ -65,7 +73,5 @@ private HttpContent GetContent(IFormCollection form, string serviceName)
         }
 
         private string GetClientSecret(string serviceName) => _appSettings[$"{serviceName}ClientSecret"];
-
-        private string GetAuthUri(string serviceName) => _appSettings[$"{serviceName}AuthUri"];
     }
 }

src/Umbraco.Cms.Integrations.OAuthProxy/appsettings.Development.json

@@ -8,9 +8,7 @@
     }
   },
   "AppSettings": {
-    "HubspotAuthUri": "",
     "HubspotClientSecret": "",
-    "SemrushAuthUri": "oauth2/access_token",
-    "SemrushClientSecret": "XOPzh6WKjOI5bfhB0M26dIWFHLfktOWk"
+    "SemrushClientSecret": ""
   }
 }