42083 V14: Integrations (Shopify)

- Remove redundant netcoreapp condition
- re generate api

Author: dtng95

src/Umbraco.Cms.Integrations.Commerce.Shopify.Core/Helpers/HtmlHelper.cs

@@ -1,31 +1,18 @@
 using System.Collections.Generic;
 
-#if NETCOREAPP
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
-#else
-using System.Web;
-using System.Web.Mvc;
-using System.Web.Mvc.Html;
-#endif
 
 using Umbraco.Cms.Integrations.Commerce.Shopify.Core.Models.ViewModels;
 
 namespace Umbraco.Cms.Integrations.Commerce.Shopify.Core.Helpers
 {
     public static class ShopifyHtmlExtensions
     {
-#if NETCOREAPP
         public static IHtmlContent RenderShopifyProductsList(this IHtmlHelper<dynamic> htmlHelper, List<ProductViewModel> vm, string renderingViewPath = "")
         {
             return htmlHelper.Partial(string.IsNullOrEmpty(renderingViewPath) ? Constants.RenderingComponent.DefaultV9ViewPath : renderingViewPath, vm);
         }
-#else
-        public static IHtmlString RenderShopifyProductsList(this HtmlHelper htmlHelper, List<ProductViewModel> vm, string renderingViewPath = "")
-        {
-            return htmlHelper.Partial(string.IsNullOrEmpty(renderingViewPath) ? Constants.RenderingComponent.DefaultV8ViewPath : renderingViewPath, vm);
-        }
-#endif
     }
 }

src/Umbraco.Cms.Integrations.Commerce.Shopify.Core/Services/AuthorizationService.cs

@@ -1,8 +1,4 @@
-#if NETCOREAPP
-using Microsoft.Extensions.Options;
-#else
-using System.Configuration;
-#endif
+using Microsoft.Extensions.Options;
 
 using System;
 using System.Collections.Generic;
@@ -23,20 +19,11 @@ public class AuthorizationService : BaseAuthorizationService, IShopifyAuthorizat
 
         private readonly ShopifyOAuthSettings _oauthSettings;
 
-#if NETCOREAPP
         public AuthorizationService(IOptions<ShopifySettings> options, IOptions<ShopifyOAuthSettings> oauthSettings, ITokenService tokenService)
-#else
-        public AuthorizationService(ITokenService tokenService)
-#endif
             : base(tokenService) 
         {
-#if NETCOREAPP
             _settings = options.Value;
             _oauthSettings = oauthSettings.Value;
-#else
-            _settings = new ShopifySettings(ConfigurationManager.AppSettings);
-            _oauthSettings = new ShopifyOAuthSettings(ConfigurationManager.AppSettings);
-#endif
         }
 
         public string GetAccessToken(string code) =>

src/Umbraco.Cms.Integrations.Commerce.Shopify.Core/Services/CacheHelper.cs

@@ -1,13 +1,7 @@
 using System;
-
 using Newtonsoft.Json;
-
-#if NETCOREAPP
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Extensions;
-#else
-using Umbraco.Core.Cache;
-#endif
 
 
 namespace Umbraco.Cms.Integrations.Commerce.Shopify.Core.Services

src/Umbraco.Cms.Integrations.Commerce.Shopify.Core/Services/ShopifyService.cs

@@ -3,7 +3,6 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
-
 using Newtonsoft.Json;
 using Umbraco.Cms.Integrations.Commerce.Shopify.Core.Configuration;
 using Umbraco.Cms.Integrations.Commerce.Shopify.Core.Models;
@@ -14,20 +13,9 @@
 using System.Linq;
 using System.Web;
 using Umbraco.Cms.Integrations.Commerce.Shopify.Core.Helpers;
-
-
-
-
-
-#if NETCOREAPP
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using ShopifyLogLevel = Umbraco.Cms.Core.Logging.LogLevel;
-#else
-using System.Configuration;
-using Umbraco.Core.Logging;
-using ShopifyLogLevel = Umbraco.Core.Logging.LogLevel;
-#endif
 
 namespace Umbraco.Cms.Integrations.Commerce.Shopify.Core.Services
 {

src/Umbraco.Cms.Integrations.Commerce.Shopify.Core/Services/TokenService.cs

@@ -1,8 +1,4 @@
-#if NETCOREAPP
-using Umbraco.Cms.Core.Services;
-#else
-using Umbraco.Core.Services;
-#endif
+using Umbraco.Cms.Core.Services;
 
 namespace Umbraco.Cms.Integrations.Commerce.Shopify.Core.Services
 {

src/Umbraco.Cms.Integrations.Commerce.Shopify.Core/Services/UmbracoAuthorizationService.cs

@@ -1,19 +1,12 @@
 using Newtonsoft.Json;
-
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Net;
 using System.Threading.Tasks;
-
 using Umbraco.Cms.Integrations.Commerce.Shopify.Core.Configuration;
 using Umbraco.Cms.Integrations.Commerce.Shopify.Core.Models.Dtos;
-
-#if NETCOREAPP
 using Microsoft.Extensions.Options;
-#else
-using System.Configuration;
-#endif
 
 namespace Umbraco.Cms.Integrations.Commerce.Shopify.Core.Services
 {
@@ -27,25 +20,16 @@ public class UmbracoAuthorizationService : BaseAuthorizationService, IShopifyAut
 
         public const string ServiceAddressReplace = "service_address_shop-replace";
 
-        public const string OAuthProxyBaseUrl = "https://localhost:44340/";  // for local testing: "https://localhost:44364/";
+        public const string OAuthProxyBaseUrl = "https://hubspot-forms-auth.umbraco.com/";  // for local testing: "https://localhost:44364/";
 
         public const string OAuthProxyRedirectUrl = OAuthProxyBaseUrl + "oauth/shopify";
 
         public const string OAuthProxyTokenUrl = OAuthProxyBaseUrl + "oauth/v1/token";
-
-#if NETCOREAPP
         public UmbracoAuthorizationService(IOptions<ShopifySettings> options, ITokenService tokenService)
             : base(tokenService) 
         {
             _settings = options.Value;
         }
-#else
-        public UmbracoAuthorizationService(ITokenService tokenService)
-            : base(tokenService)
-        {
-            _settings = new ShopifySettings(ConfigurationManager.AppSettings);
-        }
-#endif
 
         public string GetAccessToken(string code) => 
             GetAccessTokenAsync(code).ConfigureAwait(false).GetAwaiter().GetResult();

src/Umbraco.Cms.Integrations.Commerce.Shopify/Client/package-lock.json

@@ -17,6 +17,10 @@
     <RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="72.1.0.3" Condition="$(RuntimeIdentifier.StartsWith('linux')) or $(RuntimeIdentifier.StartsWith('win')) or ('$(RuntimeIdentifier)' == '' and !$([MSBuild]::IsOSPlatform('osx')))" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
   <PropertyGroup>
     <!-- Razor files are needed for the backoffice to work correctly -->
     <CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>