OAuth updates

Author: acoumb

src/Umbraco.Cms.Integrations.Crm.Hubspot/App_Plugins/UmbracoCms.Integrations/Crm/Hubspot/css/styles.css

@@ -20,7 +20,7 @@
 
     .hsFormsList a i {
         position: absolute;
-        top: .5rem;
+        top: .4rem;
         left: .25rem;
     }
 

src/Umbraco.Cms.Integrations.Crm.Hubspot/Configuration/AppSettingsConstants.cs

@@ -9,6 +9,9 @@ public static class AppSettingsConstants
 
         public static string UmbracoCmsIntegrationsCrmHubspotOAuthScopes = "Umbraco.Cms.Integrations.Crm.Hubspot.OAuthScopes";
 
+        public static string UmbracoCmsIntegrationsCrmHubspotOAuthAuthorizationBaseUrl =
+            "Umbraco.Cms.Integrations.Crm.Hubspot.OAuthAuthorizationBaseUrl";
+
         public static string UmbracoCmsIntegrationsCrmHubspotOAuthRedirectUrl = "Umbraco.Cms.Integrations.Crm.Hubspot.OAuthRedirectUrl";
 
         public static string UmbracoCmsIntegrationsOAuthProxyUrl = "Umbraco.Cms.Integrations.OAuthProxyUrl";

src/Umbraco.Cms.Integrations.Crm.Hubspot/Controllers/FormsController.cs

@@ -186,18 +186,17 @@ public async Task<string> GetAccessToken([FromBody] OAuthRequestDto authRequestD
             var data = new Dictionary<string, string>
             {
                 {"grant_type", "authorization_code"},
-                {"client_id", ConfigurationManager.AppSettings["Umbraco.Cms.Integrations.Crm.Hubspot.OAuthClientId"]},
+                {"client_id", _appSettings[AppSettingsConstants.UmbracoCmsIntegrationsCrmHubspotOAuthClientId] },
                 {
-                    "redirect_uri",
-                    ConfigurationManager.AppSettings["Umbraco.Cms.Integrations.Crm.Hubspot.OAuthRedirectUrl"]
+                    "redirect_uri", _appSettings[AppSettingsConstants.UmbracoCmsIntegrationsCrmHubspotOAuthRedirectUrl]
                 },
                 { "code", authRequestDto.Code }
             };
 
             var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Post,
-                RequestUri = new Uri($"{ConfigurationManager.AppSettings["Umbraco.Cms.Integrations.OAuthProxyUrl"]}"),
+                RequestUri = new Uri($"{_appSettings[AppSettingsConstants.UmbracoCmsIntegrationsOAuthProxyUrl]}"),
                 Content = new FormUrlEncodedContent(data)
             };
             requestMessage.Headers.Add("service_name", "Hubspot");
@@ -226,14 +225,14 @@ public async Task<string> RefreshAccessToken()
             var data = new Dictionary<string, string>
             {
                 {"grant_type", "refresh_token"},
-                {"client_id", ConfigurationManager.AppSettings["Umbraco.Cms.Integrations.Crm.Hubspot.OAuthClientId"]},
+                {"client_id", _appSettings[AppSettingsConstants.UmbracoCmsIntegrationsCrmHubspotOAuthClientId] },
                 { "refresh_token", refreshToken }
             };
 
             var requestMessage = new HttpRequestMessage
             {
                 Method = HttpMethod.Post,
-                RequestUri = new Uri($"{ConfigurationManager.AppSettings["Umbraco.Cms.Integrations.OAuthProxyUrl"]}"),
+                RequestUri = new Uri($"{_appSettings[AppSettingsConstants.UmbracoCmsIntegrationsOAuthProxyUrl]}"),
                 Content = new FormUrlEncodedContent(data)
             };
             requestMessage.Headers.Add("service_name", "Hubspot");

src/Umbraco.Cms.Integrations.Crm.Hubspot/Services/HubspotService.cs

@@ -1,21 +1,31 @@
-using System.Configuration;
+using Umbraco.Cms.Integrations.Crm.Hubspot.Configuration;
 
 namespace Umbraco.Cms.Integrations.Crm.Hubspot.Services
 {
     public class HubspotService: IHubspotService
     {
-        private string ClientId => ConfigurationManager.AppSettings["Umbraco.Cms.Integrations.Crm.Hubspot.OAuthClientId"];
+        private readonly IAppSettings _appSettings;
 
-        private string RedirectUrl => ConfigurationManager.AppSettings["Umbraco.Cms.Integrations.Crm.Hubspot.OAuthRedirectUrl"];
+        public HubspotService(IAppSettings appSettings)
+        {
+            _appSettings = appSettings;
+        }
+
+        private string ClientId => _appSettings[AppSettingsConstants.UmbracoCmsIntegrationsCrmHubspotOAuthClientId];
+
+        private string RedirectUrl =>
+            _appSettings[AppSettingsConstants.UmbracoCmsIntegrationsCrmHubspotOAuthRedirectUrl];
+
+        private string AuthorizationBaseUrl =>
+            _appSettings[AppSettingsConstants.UmbracoCmsIntegrationsCrmHubspotOAuthAuthorizationBaseUrl];
 
-        private string Scopes => ConfigurationManager.AppSettings["Umbraco.Cms.Integrations.Crm.Hubspot.OAuthScopes"];
+        private string Scopes => _appSettings[AppSettingsConstants.UmbracoCmsIntegrationsCrmHubspotOAuthScopes];
 
-        private const string AuthorizationUrlFormat =
-            "https://app-eu1.hubspot.com/oauth/authorize?client_id={0}&redirect_uri={1}&scope={2}";
+        private const string AuthorizationUrlFormat = "{0}?client_id={1}&redirect_uri={2}&scope={3}";
 
         public string GetAuthorizationUrl()
         {
-            return string.Format(AuthorizationUrlFormat, ClientId, RedirectUrl, Scopes);
+            return string.Format(AuthorizationUrlFormat, AuthorizationBaseUrl, ClientId, RedirectUrl, Scopes);
         }
     }
 }