Added proxy URL for authentication requests.

AndyButland · AndyButland · commit f8bd79171249 · 2021-11-03T12:46:23.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -396,4 +396,5 @@ src/Umbraco.Forms.Integrations.TestSite/Media
 src/Umbraco.Forms.Integrations.TestSite/scripts
 src/Umbraco.Forms.Integrations.TestSite/Umbraco
 src/Umbraco.Forms.Integrations.TestSite/Views
-*.zip
+*.zip
+appsettings.Local.json
diff --git a/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Configuration/AppSettings.cs b/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Configuration/AppSettings.cs
@@ -0,0 +1,7 @@
+﻿namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Configuration
+{
+    public class AppSettings
+    {
+        public string ClientSecret { get; set; }
+    }
+}
diff --git a/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Controllers/OAuthProxyController.cs b/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Controllers/OAuthProxyController.cs
@@ -0,0 +1,48 @@
+﻿using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Configuration;
+
+namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Controllers
+{
+    [ApiController]
+    public class OAuthProxyController : Controller
+    {
+        private readonly IHttpClientFactory _httpClientFactory;
+        private readonly AppSettings _appSettings;
+
+        public OAuthProxyController(IHttpClientFactory httpClientFactory, IOptions<AppSettings> appSettings)
+        {
+            _httpClientFactory = httpClientFactory;
+            _appSettings = appSettings.Value;
+        }
+
+        [HttpPost]
+        [Route("/oauth/v1/token")]
+        public async Task ProxyTokenRequest()
+        {
+            var httpClient = _httpClientFactory.CreateClient("HubspotToken");
+
+            var response = await httpClient.PostAsync("oauth/v1/token", GetContent(Request.Form));
+            var content = await response.Content.ReadAsStringAsync();
+
+            Response.StatusCode = (int)response.StatusCode;
+
+            Response.ContentType = response.Content.Headers.ContentType?.ToString();
+            Response.ContentLength = response.Content.Headers.ContentLength;
+
+            await Response.WriteAsync(content);
+        }
+
+        private HttpContent GetContent(IFormCollection form)
+        {
+            var dictionary = form.ToDictionary(x => x.Key, x => x.Value.ToString());
+            dictionary.Add("client_secret", _appSettings.ClientSecret);
+            return new FormUrlEncodedContent(dictionary);
+        }
+    }
+}
diff --git a/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Pages/Error.cshtml.cs b/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Pages/Error.cshtml.cs
@@ -1,13 +1,9 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback.Pages
+namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Pages
 {
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
     [IgnoreAntiforgeryToken]
diff --git a/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Pages/Index.cshtml.cs b/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Pages/Index.cshtml.cs
@@ -1,12 +1,7 @@
-﻿using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
+﻿using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback.Pages
+namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Pages
 {
     public class IndexModel : PageModel
     {
diff --git a/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Pages/_ViewImports.cshtml b/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Pages/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback
-@namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback.Pages
+@using Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy
+@namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Program.cs b/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Program.cs
@@ -1,13 +1,8 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback
+namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy
 {
     public class Program
     {
@@ -18,6 +13,13 @@ public static void Main(string[] args)
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
+#if DEBUG
+                .ConfigureAppConfiguration(config
+                    => config.AddJsonFile(
+                        "appsettings.Local.json",
+                        optional: true,
+                        reloadOnChange: true))
+#endif
                 .ConfigureWebHostDefaults(webBuilder =>
                 {
                     webBuilder.UseStartup<Startup>();
diff --git a/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Properties/launchSettings.json b/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Properties/launchSettings.json
@@ -15,7 +15,7 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback": {
+    "Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy": {
       "commandName": "Project",
       "dotnetRunMessages": "true",
       "launchBrowser": true,
diff --git a/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Startup.cs b/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Startup.cs
@@ -8,8 +8,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Configuration;
 
-namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback
+namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy
 {
     public class Startup
     {
@@ -23,7 +24,15 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
+            services.Configure<AppSettings>(Configuration.GetSection("AppSettings"));
+
+            services.AddHttpClient("HubspotToken", c =>
+            {
+                c.BaseAddress = new Uri("https://api.hubapi.com");
+            });
+
             services.AddRazorPages();
+            services.AddControllers();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -49,6 +58,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 
             app.UseEndpoints(endpoints =>
             {
+                endpoints.MapControllers();
                 endpoints.MapRazorPages();
             });
         }
diff --git a/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.csproj b/src/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback/Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.csproj
diff --git a/src/Umbraco.Forms.Integrations.Crm.Hubspot/Services/BaseTokenRequest.cs b/src/Umbraco.Forms.Integrations.Crm.Hubspot/Services/BaseTokenRequest.cs
@@ -9,9 +9,6 @@ internal abstract class BaseTokenRequest
         [JsonProperty("client_id")]
         public string ClientId { get; set; }
 
-        [JsonProperty("client_secret")]
-        public string ClientSecret { get; set; }
-
         [JsonProperty("redirect_uri")]
         public string RedirectUrl { get; set; }
     }
diff --git a/src/Umbraco.Forms.Integrations.Crm.Hubspot/Services/HubspotContactService.cs b/src/Umbraco.Forms.Integrations.Crm.Hubspot/Services/HubspotContactService.cs
@@ -33,12 +33,12 @@ public class HubspotContactService : IContactService
         private readonly IKeyValueService _keyValueService;
 
         private const string CrmApiBaseUrl = "https://api.hubapi.com/crm/v3/";
-        private const string AuthApiTokenUrl = "https://api.hubapi.com/oauth/v1/token";
         private const string InstallUrlFormat = "https://app-eu1.hubspot.com/oauth/authorize?client_id={0}&redirect_uri={1}&scope={2}";
         private const string OAuthScopes = "crm.objects.contacts.read%20crm.objects.contacts.write";
-        private const string OAauthClientId = "";
-        private const string OAauthSecret = "";
+        private const string OAauthClientId = "1a04f5bf-e99e-48e1-9d62-6c25bf2bdefe";
+
         private const string OAuthRedirectUrl = "https://localhost:44364/";
+        private const string OAuthTokenProxyUrl = "https://localhost:44364/oauth/v1/token";
 
         private const string AccessTokenCacheKey = "HubSpotOAuthAccessToken";
 
@@ -61,11 +61,10 @@ public async Task<AuthorizationResult> AuthorizeAsync(string code)
             var tokenRequest = new GetTokenRequest
             {
                 ClientId = OAauthClientId,
-                ClientSecret = OAauthSecret,
                 RedirectUrl = OAuthRedirectUrl,
                 AuthorizationCode = code,
             };
-            var response = await GetResponse(AuthApiTokenUrl, HttpMethod.Post, content: tokenRequest, contentType: "application/x-www-form-urlencoded").ConfigureAwait(false);
+            var response = await GetResponse(OAuthTokenProxyUrl, HttpMethod.Post, content: tokenRequest, contentType: "application/x-www-form-urlencoded").ConfigureAwait(false);
             if (response.IsSuccessStatusCode)
             {
                 var tokenResponse = await response.Content.ReadAsAsync<TokenResponse>();
@@ -220,11 +219,10 @@ private async Task RefreshOAuthAccessToken(string refreshToken)
             var tokenRequest = new RefreshTokenRequest
             {
                 ClientId = OAauthClientId,
-                ClientSecret = OAauthSecret,
                 RedirectUrl = OAuthRedirectUrl,
                 RefreshToken = refreshToken,
             };
-            var response = await GetResponse(AuthApiTokenUrl, HttpMethod.Post, content: tokenRequest, contentType: "application/x-www-form-urlencoded").ConfigureAwait(false);
+            var response = await GetResponse(OAuthTokenProxyUrl, HttpMethod.Post, content: tokenRequest, contentType: "application/x-www-form-urlencoded").ConfigureAwait(false);
             if (response.IsSuccessStatusCode)
             {
                 var tokenResponse = await response.Content.ReadAsAsync<TokenResponse>();
diff --git a/src/Umbraco.Forms.Integrations.sln b/src/Umbraco.Forms.Integrations.sln
@@ -19,7 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback", "Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback\Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback.csproj", "{B3FD7257-B50B-4221-A5CF-59AC25862924}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy", "Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback\Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.csproj", "{B3FD7257-B50B-4221-A5CF-59AC25862924}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,7 @@`
`1`		`-using Microsoft.AspNetCore.Mvc;`
`2`		`-using Microsoft.AspNetCore.Mvc.RazorPages;`
	`1`	`+using Microsoft.AspNetCore.Mvc.RazorPages;`
`3`	`2`	`using Microsoft.Extensions.Logging;`
`4`		`-using System;`
`5`		`-using System.Collections.Generic;`
`6`		`-using System.Linq;`
`7`		`-using System.Threading.Tasks;`
`8`	`3`
`9`		`-namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback.Pages`
	`4`	`+namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Pages`
`10`	`5`	`{`
`11`	`6`	`public class IndexModel : PageModel`
`12`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`"ASPNETCORE_ENVIRONMENT": "Development"`
`16`	`16`	`}`
`17`	`17`	`},`
`18`		`- "Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback": {`
	`18`	`+ "Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy": {`
`19`	`19`	`"commandName": "Project",`
`20`	`20`	`"dotnetRunMessages": "true",`
`21`	`21`	`"launchBrowser": true,`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,9 @@`
`8`	`8`	`using System.Collections.Generic;`
`9`	`9`	`using System.Linq;`
`10`	`10`	`using System.Threading.Tasks;`
	`11`	`+using Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy.Configuration;`
`11`	`12`
`12`		`-namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthCallback`
	`13`	`+namespace Umbraco.Forms.Integrations.Crm.Hubspot.OAuthProxy`
`13`	`14`	`{`
`14`	`15`	`public class Startup`
`15`	`16`	`{`
`@@ -23,7 +24,15 @@ public Startup(IConfiguration configuration)`
`23`	`24`	`// This method gets called by the runtime. Use this method to add services to the container.`
`24`	`25`	`public void ConfigureServices(IServiceCollection services)`
`25`	`26`	`{`
	`27`	`+ services.Configure<AppSettings>(Configuration.GetSection("AppSettings"));`
	`28`	`+`
	`29`	`+ services.AddHttpClient("HubspotToken", c =>`
	`30`	`+ {`
	`31`	`+ c.BaseAddress = new Uri("https://api.hubapi.com");`
	`32`	`+ });`
	`33`	`+`
`26`	`34`	`services.AddRazorPages();`
	`35`	`+ services.AddControllers();`
`27`	`36`	`}`
`28`	`37`
`29`	`38`	`// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.`
`@@ -49,6 +58,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`49`	`58`
`50`	`59`	`app.UseEndpoints(endpoints =>`
`51`	`60`	`{`
	`61`	`+ endpoints.MapControllers();`
`52`	`62`	`endpoints.MapRazorPages();`
`53`	`63`	`});`
`54`	`64`	`}`