Merge pull request #13 from umbraco/feature/google-auth

Feature/google auth

Author: acoumb

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

@@ -10,6 +10,8 @@ public class AppSettings
 
         public string ShopifyClientSecret { get; set; }
 
+        public string GoogleClientSecret { get; set; }
+
         public string this[string propertyName] => (string)GetType().GetProperty(propertyName)?.GetValue(this, null);
     }
 }

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

@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Umbraco.Cms.Integrations.OAuthProxy.Configuration
+{
+    public static class ServiceConfiguration
+    {
+        /// <summary>
+        /// Integrated services with their token URIs
+        /// </summary>
+        public static Dictionary<string, string> ServiceProviders = new Dictionary<string, string>
+        {
+            { "Hubspot", "oauth/v1/token" }, 
+            { "HubspotForms", "oauth/v1/token" }, 
+            { "Semrush", "oauth2/access_token" }, 
+            { "Shopify", "oauth/access_token" },
+            { "Google", "token"}
+        };
+
+        public static void AddServiceClients(this IServiceCollection services)
+        {
+            services.AddHttpClient("HubspotToken", c =>
+            {
+                c.BaseAddress = new Uri("https://api.hubapi.com/");
+            });
+            services.AddHttpClient("HubspotFormsToken", c =>
+            {
+                c.BaseAddress = new Uri("https://api.hubapi.com/");
+            });
+            services.AddHttpClient("SemrushToken", c =>
+            {
+                c.BaseAddress = new Uri("https://oauth.semrush.com/");
+            });
+            services.AddHttpClient("ShopifyToken", c =>
+            {
+                c.BaseAddress = new Uri("https://shop-replace.myshopify.com/admin/");
+            });
+            services.AddHttpClient("GoogleToken", c =>
+            {
+                c.BaseAddress = new Uri("https://oauth2.googleapis.com/");
+            });
+        }
+    }
+}

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

@@ -22,14 +22,6 @@ public class OAuthProxyController : Controller
         public const string ServiceNameHeaderKey = "service_name";
         public const string ServiceAddressReplacePrefixHeaderKey = "service_address_";
 
-        /// <summary>
-        /// Integrated services with their token URIs
-        /// </summary>
-        private static readonly Dictionary<string, string> ValidServices = new()
-        {
-            { "Hubspot", "oauth/v1/token" }, { "HubspotForms", "oauth/v1/token" }, { "Semrush", "oauth2/access_token" }, { "Shopify", "oauth/access_token" }
-        };
-
         public OAuthProxyController(IHttpClientFactory httpClientFactory, IOptions<AppSettings> appSettings)
         {
             _httpClientFactory = httpClientFactory;
@@ -45,7 +37,7 @@ public async Task ProxyTokenRequest()
                 serviceName = "Hubspot";
             }
 
-            if (!ValidServices.ContainsKey(serviceName))
+            if (!ServiceConfiguration.ServiceProviders.ContainsKey(serviceName))
             {
                 throw 
                     new InvalidOperationException($"Provided {ServiceNameHeaderKey} header value of {serviceName} is not supported");
@@ -54,7 +46,7 @@ public async Task ProxyTokenRequest()
             var httpClient = GetClient(serviceName);
 
             var response =
-                await httpClient.PostAsync(ValidServices[serviceName], GetContent(Request.Form, serviceName));
+                await httpClient.PostAsync(ServiceConfiguration.ServiceProviders[serviceName], GetContent(Request.Form, serviceName));
             var content = await response.Content.ReadAsStringAsync();
 
             Response.StatusCode = (int)response.StatusCode;

src/Umbraco.Cms.Integrations.OAuthProxy/Pages/Google.cshtml

@@ -0,0 +1,37 @@
+@page "/oauth/google"
+@model Umbraco.Cms.Integrations.OAuthProxy.Pages.ShopifyModel
+@{
+    ViewData["Title"] = "Authorization";
+}
+
+<div class="text-center">
+    <h1 class="display-4">Umbraco Integrations Authentication</h1>
+    @if (!string.IsNullOrEmpty(Model.AuthorizationCode))
+    {
+        <div id="manual-complete" style="display: none">
+            <p>To complete the integration, please copy the following code and enter it in Umbraco using the form provided.</p>
+
+            <p><input id="auth-code" type="text" value="@Model.AuthorizationCode" readonly style="width: 700px; font-size: 36px; text-align: center" /></p>
+
+            <button onclick="copyToClipboard()">Copy To Clipboard</button>
+        </div>
+
+        <script>
+            if (window.opener && typeof opener.postMessage === 'function') {
+                opener.postMessage({ type: 'google:oauth:success', url: location.href, code: '@Model.AuthorizationCode' }, '*');
+                window.close();
+            } else {
+                document.getElementById("manual-complete").style.display = "block";
+            }1
+
+            function copyToClipboard() {
+                var authCodeInputElement = document.getElementById("auth-code");
+                authCodeInputElement.select();
+                authCodeInputElement.setSelectionRange(0, 99999);
+                navigator.clipboard.writeText(authCodeInputElement.value);
+                alert("Code copied to clipboard");
+            }
+        </script>
+
+    }
+</div>

src/Umbraco.Cms.Integrations.OAuthProxy/Pages/Google.cshtml.cs

@@ -0,0 +1,14 @@
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Umbraco.Cms.Integrations.OAuthProxy.Pages
+{
+    public class GoogleModel : PageModel
+    {
+        public string AuthorizationCode { get; set; }
+
+        public void OnGet()
+        {
+            AuthorizationCode = Request.Query["code"];
+        }
+    }
+}

src/Umbraco.Cms.Integrations.OAuthProxy/Startup.cs

@@ -24,22 +24,7 @@ public void ConfigureServices(IServiceCollection services)
         {
             services.Configure<AppSettings>(Configuration.GetSection("AppSettings"));
 
-            services.AddHttpClient("HubspotToken", c =>
-            {
-                c.BaseAddress = new Uri("https://api.hubapi.com/");
-            });
-            services.AddHttpClient("HubspotFormsToken", c =>
-            {
-                c.BaseAddress = new Uri("https://api.hubapi.com/");
-            });
-            services.AddHttpClient("SemrushToken", c =>
-            {
-                c.BaseAddress = new Uri("https://oauth.semrush.com/");
-            });
-            services.AddHttpClient("ShopifyToken", c =>
-            {
-                c.BaseAddress = new Uri("https://shop-replace.myshopify.com/admin/");
-            });
+            services.AddServiceClients();
 
             services.AddRazorPages();
             services.AddControllers();

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

@@ -11,6 +11,7 @@
     "HubspotClientSecret": "",
     "HubspotFormsClientSecret": "",
     "SemrushClientSecret": "",
-    "ShopifyClientSecret":  "" 
+    "ShopifyClientSecret": "",
+    "GoogleClientSecret": "" 
   }
 }