Merge pull request #66 from MarkedsPartner-AS/main

Solves #65 HubSpot API-key sunset

Author: acoumb

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

@@ -100,7 +100,9 @@ public async Task<ResponseDto> GetAll()
                 return new ResponseDto { IsValid = false };
             }
 
-            var response = await ClientFactory().GetAsync($"{HubspotFormsApiEndpoint}?hapikey=" + hubspotApiKey);
+            var requestMessage = CreateRequest(hubspotApiKey);
+
+            var response = await ClientFactory().SendAsync(requestMessage);
 
             if (response.StatusCode == HttpStatusCode.Unauthorized)
             {
@@ -159,12 +161,7 @@ public async Task<ResponseDto> GetAllOAuth()
                 return new ResponseDto { IsValid = false };
             }
 
-            var requestMessage = new HttpRequestMessage
-            {
-                Method = HttpMethod.Get,
-                RequestUri = new Uri(HubspotFormsApiEndpoint)
-            };
-            requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
+            var requestMessage = CreateRequest(accessToken);
 
             var response = await ClientFactory().SendAsync(requestMessage);
             if (response.StatusCode == HttpStatusCode.Unauthorized)
@@ -210,6 +207,17 @@ public async Task<ResponseDto> GetAllOAuth()
             return new ResponseDto();
         }
 
+        private static HttpRequestMessage CreateRequest(string accessToken)
+        {
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Get,
+                RequestUri = new Uri(HubspotFormsApiEndpoint)
+            };
+            requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
+            return requestMessage;
+        }
+
         [HttpGet]
         public HubspotFormPickerSettings CheckConfiguration()
         {