Remove AuthorizationEndpoint property and update authorization controllers for V8

acoumb · acoumb · commit 89698ab509d9 · 2023-04-06T09:50:04.000+03:00
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Configuration/ShopifyOAuthSettings.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Configuration/ShopifyOAuthSettings.cs
@@ -16,8 +16,6 @@ public ShopifyOAuthSettings(NameValueCollection appSettings)
 
             Scopes = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyScopesKey];
 
-            //AuthorizationEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyAuthorizationEndpointKey];
-
             TokenEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyTokenEndpointKey];
         }
 
@@ -29,8 +27,6 @@ public ShopifyOAuthSettings(NameValueCollection appSettings)
 
         public string Scopes { get; set; }
 
-        //public string AuthorizationEndpoint { get; set; }
-
         public string TokenEndpoint { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Constants.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Constants.cs
@@ -42,8 +42,6 @@ public static class Configuration
 
             public const string UmbracoCmsIntegrationsCommerceShopifyScopesKey = "Umbraco.Cms.Integrations.Commerce.Shopify.Scopes";
 
-            public const string UmbracoCmsIntegrationsCommerceShopifyAuthorizationEndpointKey = "Umbraco.Cms.Integrations.Commerce.Shopify.AuthorizationEndpoint";
-
             public const string UmbracoCmsIntegrationsCommerceShopifyTokenEndpointKey = "Umbraco.Cms.Integrations.Commerce.Shopify.TokenEndpoint";
         }
 
diff --git a/src/Umbraco.Cms.Integrations.Commerce.Shopify/Controllers/ShopifyAuthorizationController.cs b/src/Umbraco.Cms.Integrations.Commerce.Shopify/Controllers/ShopifyAuthorizationController.cs
@@ -5,8 +5,9 @@
 
 using Umbraco.Cms.Web.Common.Controllers;
 #else
-using System.Web.Mvc;
-using System.Configuration;
+using System.Web.Http;
+using System.Net.Http;
+using System.Net.Http.Headers;
 
 using Umbraco.Web.WebApi;
 #endif
@@ -18,9 +19,6 @@ public class ShopifyAuthorizationController : UmbracoApiController
         [HttpGet]
 #if NETCOREAPP
         public IActionResult OAuth(string code)
-#else
-        public ActionResult OAuth(string code)
-#endif
         {
             return new ContentResult
             {
@@ -30,5 +28,16 @@ public ActionResult OAuth(string code)
                 ContentType = "text/html"
             };
         }
+#else
+        public HttpResponseMessage OAuth(string code)
+        {
+            var response = new HttpResponseMessage();
+            response.Content = new StringContent(string.IsNullOrEmpty(code)
+                ? JavascriptResponse.Fail("Authorization process failed.")
+                : JavascriptResponse.Ok(code));
+            response.Content.Headers.ContentType = new MediaTypeHeaderValue("text/html");
+            return response;
+         }
+#endif
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Configuration/DynamicsOAuthSettings.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Configuration/DynamicsOAuthSettings.cs
@@ -17,8 +17,6 @@ public DynamicsOAuthSettings(NameValueCollection appSettings)
 
             Scopes = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmDynamicsScopesKey];
 
-            AuthorizationEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmDynamicsAuthorizationEndpointKey];
-
             TokenEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmDynamicsTokenEndpointKey];
         }
 
@@ -30,8 +28,6 @@ public DynamicsOAuthSettings(NameValueCollection appSettings)
 
         public string Scopes { get; set; }
 
-        public string AuthorizationEndpoint { get; set; }
-
         public string TokenEndpoint { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Constants.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Constants.cs
@@ -54,8 +54,6 @@ public static class Configuration
 
             public const string UmbracoCmsIntegrationsCrmDynamicsScopesKey = "Umbraco.Cms.Integrations.Crm.Dynamics.Scopes";
 
-            public const string UmbracoCmsIntegrationsCrmDynamicsAuthorizationEndpointKey = "Umbraco.Cms.Integrations.Crm.Dynamics.AuthorizationEndpoint";
-
             public const string UmbracoCmsIntegrationsCrmDynamicsTokenEndpointKey = "Umbraco.Cms.Integrations.Crm.Dynamics.TokenEndpoint";
         }
     }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Dynamics/Controllers/DynamicsAuthorizationController.cs b/src/Umbraco.Cms.Integrations.Crm.Dynamics/Controllers/DynamicsAuthorizationController.cs
@@ -5,8 +5,9 @@
 
 using Umbraco.Cms.Web.Common.Controllers;
 #else
-using System.Web.Mvc;
-using System.Configuration;
+using System.Web.Http;
+using System.Net.Http;
+using System.Net.Http.Headers;
 
 using Umbraco.Web.WebApi;
 #endif
@@ -18,9 +19,6 @@ public class DynamicsAuthorizationController : UmbracoApiController
         [HttpGet]
 #if NETCOREAPP
         public IActionResult OAuth(string code)
-#else
-        public ActionResult OAuth(string code)
-#endif
         { 
             return new ContentResult
             {
@@ -30,5 +28,17 @@ public ActionResult OAuth(string code)
                 ContentType = "text/html"
             };
         }
+#else
+        public HttpResponseMessage OAuth(string code)
+        {
+            var response = new HttpResponseMessage();
+            response.Content = new StringContent(string.IsNullOrEmpty(code)
+                ? JavascriptResponse.Fail("Authorization process failed.")
+                : JavascriptResponse.Ok(code));
+            response.Content.Headers.ContentType = new MediaTypeHeaderValue("text/html");
+            return response;
+        }
+#endif
+        
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/Configuration/HubspotOAuthSettings.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot/Configuration/HubspotOAuthSettings.cs
@@ -16,8 +16,6 @@ public HubspotOAuthSettings(NameValueCollection appSettings)
 
             Scopes = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmHubspotScopesKey];
 
-            AuthorizationEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmHubspotAuthorizationEndpointKey];
-
             TokenEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmHubspotTokenEndpointKey];
         }
 
@@ -29,8 +27,6 @@ public HubspotOAuthSettings(NameValueCollection appSettings)
 
         public string Scopes { get; set; }
 
-        public string AuthorizationEndpoint { get; set; }
-
         public string TokenEndpoint { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/Constants.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot/Constants.cs
@@ -33,8 +33,6 @@ public static class Configuration
 
             public const string UmbracoCmsIntegrationsCrmHubspotScopesKey = "Umbraco.Cms.Integrations.Crm.Hubspot.Scopes";
 
-            public const string UmbracoCmsIntegrationsCrmHubspotAuthorizationEndpointKey = "Umbraco.Cms.Integrations.Crm.Hubspot.AuthorizationEndpoint";
-
             public const string UmbracoCmsIntegrationsCrmHubspotTokenEndpointKey = "Umbraco.Cms.Integrations.Crm.Hubspot.TokenEndpoint";
         }
 
diff --git a/src/Umbraco.Cms.Integrations.Crm.Hubspot/Controllers/HubspotAuthorizationController.cs b/src/Umbraco.Cms.Integrations.Crm.Hubspot/Controllers/HubspotAuthorizationController.cs
@@ -5,7 +5,9 @@
 
 using Umbraco.Cms.Web.Common.Controllers;
 #else
-using System.Web.Mvc;
+using System.Web.Http;
+using System.Net.Http;
+using System.Net.Http.Headers;
 
 using Umbraco.Web.WebApi;
 #endif
@@ -17,10 +19,7 @@ public class HubspotAuthorizationController : UmbracoApiController
         [HttpGet]
 #if NETCOREAPP
         public IActionResult OAuth(string code)
-#else
-        public ActionResult OAuth(string code)
-#endif
-        { 
+        {
             return new ContentResult
             {
                 Content = string.IsNullOrEmpty(code)
@@ -29,5 +28,16 @@ public ActionResult OAuth(string code)
                 ContentType = "text/html"
             };
         }
+#else
+        public HttpResponseMessage OAuth(string code)
+        {
+            var response = new HttpResponseMessage();
+            response.Content = new StringContent(string.IsNullOrEmpty(code)
+                ? JavascriptResponse.Fail("Authorization process failed.")
+                : JavascriptResponse.Ok(code));
+            response.Content.Headers.ContentType = new MediaTypeHeaderValue("text/html");
+            return response;
+        }
+#endif
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.SEO.GoogleSearchConsole.UrlInspectionTool/Configuration/GoogleSearchConsoleOAuthSettings.cs b/src/Umbraco.Cms.Integrations.SEO.GoogleSearchConsole.UrlInspectionTool/Configuration/GoogleSearchConsoleOAuthSettings.cs
@@ -16,8 +16,6 @@ public GoogleSearchConsoleOAuthSettings(NameValueCollection appSettings)
 
             Scopes = appSettings[Constants.Configuration.UmbracoCmsIntegrationsSeoGoogleSearchConsoleScopesKey];
 
-            AuthorizationEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsSeoGoogleSearchConsoleAuthorizationEndpointKey];
-
             TokenEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsSeoGoogleSearchConsoleTokenEndpointKey];
         }
 
@@ -29,8 +27,6 @@ public GoogleSearchConsoleOAuthSettings(NameValueCollection appSettings)
 
         public string Scopes { get; set; }
 
-        public string AuthorizationEndpoint { get; set; }
-
         public string TokenEndpoint { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.SEO.GoogleSearchConsole.UrlInspectionTool/Constants.cs b/src/Umbraco.Cms.Integrations.SEO.GoogleSearchConsole.UrlInspectionTool/Constants.cs
@@ -27,8 +27,6 @@ public static class Configuration
 
             public const string UmbracoCmsIntegrationsSeoGoogleSearchConsoleScopesKey = "Umbraco.Cms.Integrations.SEO.GoogleSearchConsole.Scopes";
 
-            public const string UmbracoCmsIntegrationsSeoGoogleSearchConsoleAuthorizationEndpointKey = "Umbraco.Cms.Integrations.SEO.GoogleSearchConsole.AuthorizationEndpoint";
-
             public const string UmbracoCmsIntegrationsSeoGoogleSearchConsoleTokenEndpointKey = "Umbraco.Cms.Integrations.SEO.GoogleSearchConsole.TokenEndpoint";
         }
     }
diff --git a/src/Umbraco.Cms.Integrations.SEO.GoogleSearchConsole.UrlInspectionTool/Controllers/GoogleSearchConsoleAuthorizationController.cs b/src/Umbraco.Cms.Integrations.SEO.GoogleSearchConsole.UrlInspectionTool/Controllers/GoogleSearchConsoleAuthorizationController.cs
@@ -5,7 +5,9 @@
 
 using Umbraco.Cms.Web.Common.Controllers;
 #else
-using System.Web.Mvc;
+using System.Web.Http;
+using System.Net.Http;
+using System.Net.Http.Headers;
 
 using Umbraco.Web.WebApi;
 #endif
@@ -17,9 +19,6 @@ public class GoogleSearchConsoleAuthorizationController : UmbracoApiController
         [HttpGet]
 #if NETCOREAPP
         public IActionResult OAuth(string code)
-#else
-        public ActionResult OAuth(string code)
-#endif
         {
             return new ContentResult
             {
@@ -29,5 +28,16 @@ public ActionResult OAuth(string code)
                 ContentType = "text/html"
             };
         }
+#else
+        public HttpResponseMessage OAuth(string code)
+        {
+            var response = new HttpResponseMessage();
+            response.Content = new StringContent(string.IsNullOrEmpty(code)
+                ? JavascriptResponse.Fail("Authorization process failed.")
+                : JavascriptResponse.Ok(code));
+            response.Content.Headers.ContentType = new MediaTypeHeaderValue("text/html");
+            return response;
+         }
+#endif
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.SEO.Semrush/Configuration/SemrushOAuthSettings.cs b/src/Umbraco.Cms.Integrations.SEO.Semrush/Configuration/SemrushOAuthSettings.cs
@@ -20,8 +20,6 @@ public SemrushOAuthSettings(NameValueCollection appSettings)
 
             Scopes = appSettings[Constants.Configuration.UmbracoCmsIntegrationsSeoSemrushScopesKey];
 
-            AuthorizationEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsSeoSemrushAuthorizationEndpointKey];
-
             TokenEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsSeoSemrushTokenEndpointKey];
         }
 
@@ -35,8 +33,6 @@ public SemrushOAuthSettings(NameValueCollection appSettings)
 
         public string Scopes { get; set; }
 
-        public string AuthorizationEndpoint { get; set; }
-
         public string TokenEndpoint { get; set; }
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.SEO.Semrush/Constants.cs b/src/Umbraco.Cms.Integrations.SEO.Semrush/Constants.cs
@@ -33,8 +33,6 @@ public static class Configuration
 
             public const string UmbracoCmsIntegrationsSeoSemrushScopesKey = "Umbraco.Cms.Integrations.SEO.Semrush.Scopes";
 
-            public const string UmbracoCmsIntegrationsSeoSemrushAuthorizationEndpointKey = "Umbraco.Cms.Integrations.SEO.Semrush.AuthorizationEndpoint";
-
             public const string UmbracoCmsIntegrationsSeoSemrushTokenEndpointKey = "Umbraco.Cms.Integrations.SEO.Semrush.TokenEndpoint";
         }
     }
diff --git a/src/Umbraco.Cms.Integrations.SEO.Semrush/Controllers/SemrushAuthorizationController.cs b/src/Umbraco.Cms.Integrations.SEO.Semrush/Controllers/SemrushAuthorizationController.cs
@@ -5,7 +5,9 @@
 
 using Umbraco.Cms.Web.Common.Controllers;
 #else
-using System.Web.Mvc;
+using System.Web.Http;
+using System.Net.Http;
+using System.Net.Http.Headers;
 
 using Umbraco.Web.WebApi;
 #endif
@@ -17,9 +19,6 @@ public class SemrushAuthorizationController : UmbracoApiController
         [HttpGet]
 #if NETCOREAPP
         public IActionResult OAuth(string code)
-#else
-        public ActionResult OAuth(string code)
-#endif
         {
             return new ContentResult
             {
@@ -29,5 +28,16 @@ public ActionResult OAuth(string code)
                 ContentType = "text/html"
             };
         }
+#else
+        public HttpResponseMessage OAuth(string code)
+        {
+            var response = new HttpResponseMessage();
+            response.Content = new StringContent(string.IsNullOrEmpty(code)
+                ? JavascriptResponse.Fail("Authorization process failed.")
+                : JavascriptResponse.Ok(code));
+            response.Content.Headers.ContentType = new MediaTypeHeaderValue("text/html");
+            return response;
+         }
+#endif
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@ public ShopifyOAuthSettings(NameValueCollection appSettings)`
`16`	`16`
`17`	`17`	`Scopes = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyScopesKey];`
`18`	`18`
`19`		`- //AuthorizationEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyAuthorizationEndpointKey];`
`20`		`-`
`21`	`19`	`TokenEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyTokenEndpointKey];`
`22`	`20`	`}`
`23`	`21`
`@@ -29,8 +27,6 @@ public ShopifyOAuthSettings(NameValueCollection appSettings)`
`29`	`27`
`30`	`28`	`public string Scopes { get; set; }`
`31`	`29`
`32`		`- //public string AuthorizationEndpoint { get; set; }`
`33`		`-`
`34`	`30`	`public string TokenEndpoint { get; set; }`
`35`	`31`	`}`
`36`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,6 @@ public static class Configuration`
`42`	`42`
`43`	`43`	`public const string UmbracoCmsIntegrationsCommerceShopifyScopesKey = "Umbraco.Cms.Integrations.Commerce.Shopify.Scopes";`
`44`	`44`
`45`		`- public const string UmbracoCmsIntegrationsCommerceShopifyAuthorizationEndpointKey = "Umbraco.Cms.Integrations.Commerce.Shopify.AuthorizationEndpoint";`
`46`		`-`
`47`	`45`	`public const string UmbracoCmsIntegrationsCommerceShopifyTokenEndpointKey = "Umbraco.Cms.Integrations.Commerce.Shopify.TokenEndpoint";`
`48`	`46`	`}`
`49`	`47`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,6 @@ public DynamicsOAuthSettings(NameValueCollection appSettings)`
`17`	`17`
`18`	`18`	`Scopes = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmDynamicsScopesKey];`
`19`	`19`
`20`		`- AuthorizationEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmDynamicsAuthorizationEndpointKey];`
`21`		`-`
`22`	`20`	`TokenEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmDynamicsTokenEndpointKey];`
`23`	`21`	`}`
`24`	`22`
`@@ -30,8 +28,6 @@ public DynamicsOAuthSettings(NameValueCollection appSettings)`
`30`	`28`
`31`	`29`	`public string Scopes { get; set; }`
`32`	`30`
`33`		`- public string AuthorizationEndpoint { get; set; }`
`34`		`-`
`35`	`31`	`public string TokenEndpoint { get; set; }`
`36`	`32`	`}`
`37`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,6 @@ public static class Configuration`
`54`	`54`
`55`	`55`	`public const string UmbracoCmsIntegrationsCrmDynamicsScopesKey = "Umbraco.Cms.Integrations.Crm.Dynamics.Scopes";`
`56`	`56`
`57`		`- public const string UmbracoCmsIntegrationsCrmDynamicsAuthorizationEndpointKey = "Umbraco.Cms.Integrations.Crm.Dynamics.AuthorizationEndpoint";`
`58`		`-`
`59`	`57`	`public const string UmbracoCmsIntegrationsCrmDynamicsTokenEndpointKey = "Umbraco.Cms.Integrations.Crm.Dynamics.TokenEndpoint";`
`60`	`58`	`}`
`61`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@ public HubspotOAuthSettings(NameValueCollection appSettings)`
`16`	`16`
`17`	`17`	`Scopes = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmHubspotScopesKey];`
`18`	`18`
`19`		`- AuthorizationEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmHubspotAuthorizationEndpointKey];`
`20`		`-`
`21`	`19`	`TokenEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsCrmHubspotTokenEndpointKey];`
`22`	`20`	`}`
`23`	`21`
`@@ -29,8 +27,6 @@ public HubspotOAuthSettings(NameValueCollection appSettings)`
`29`	`27`
`30`	`28`	`public string Scopes { get; set; }`
`31`	`29`
`32`		`- public string AuthorizationEndpoint { get; set; }`
`33`		`-`
`34`	`30`	`public string TokenEndpoint { get; set; }`
`35`	`31`	`}`
`36`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,6 @@ public static class Configuration`
`33`	`33`
`34`	`34`	`public const string UmbracoCmsIntegrationsCrmHubspotScopesKey = "Umbraco.Cms.Integrations.Crm.Hubspot.Scopes";`
`35`	`35`
`36`		`- public const string UmbracoCmsIntegrationsCrmHubspotAuthorizationEndpointKey = "Umbraco.Cms.Integrations.Crm.Hubspot.AuthorizationEndpoint";`
`37`		`-`
`38`	`36`	`public const string UmbracoCmsIntegrationsCrmHubspotTokenEndpointKey = "Umbraco.Cms.Integrations.Crm.Hubspot.TokenEndpoint";`
`39`	`37`	`}`
`40`	`38`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@ public GoogleSearchConsoleOAuthSettings(NameValueCollection appSettings)`
`16`	`16`
`17`	`17`	`Scopes = appSettings[Constants.Configuration.UmbracoCmsIntegrationsSeoGoogleSearchConsoleScopesKey];`
`18`	`18`
`19`		`- AuthorizationEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsSeoGoogleSearchConsoleAuthorizationEndpointKey];`
`20`		`-`
`21`	`19`	`TokenEndpoint = appSettings[Constants.Configuration.UmbracoCmsIntegrationsSeoGoogleSearchConsoleTokenEndpointKey];`
`22`	`20`	`}`
`23`	`21`
`@@ -29,8 +27,6 @@ public GoogleSearchConsoleOAuthSettings(NameValueCollection appSettings)`
`29`	`27`
`30`	`28`	`public string Scopes { get; set; }`
`31`	`29`
`32`		`- public string AuthorizationEndpoint { get; set; }`
`33`		`-`
`34`	`30`	`public string TokenEndpoint { get; set; }`
`35`	`31`	`}`
`36`	`32`	`}`