Merge branch 'main-v14' into v14/feature/42318-V14-Integrations-Zapier

Author: dtng95

.gitignore

@@ -7,7 +7,7 @@ src/Testsite/umbraco
 src/Testsite/Views
 src/Testsite/wwwroot
 src/Umbraco.Cms.Integrations.Automation.Zapier/wwwroot
-
+src/Umbraco.Cms.Integrations.Commerce.Shopify/wwwroot
 
 
 # User-specific files

azure-pipeline - Crm.Hubspot.yml

@@ -1,14 +1,12 @@
 trigger:
-- main
+- main-v14
 
 pool:
   vmImage: 'windows-latest'
 
 variables:
   projectName: 'Umbraco.Cms.Integrations.Crm.Hubspot'
-  coreProjectName: 'Umbraco.Cms.Integrations.Crm.Hubspot.Core'
   project: 'src/$(projectName)/$(projectName).csproj'
-  coreProject: 'src/$(coreProjectName)/$(coreProjectName).csproj'
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
 
@@ -24,14 +22,6 @@ steps:
     projects: '$(project)'
     includeNuGetOrg: true
 
-- task: VSBuild@1
-  displayName: 'Build Core Project'
-  inputs:
-    solution: '$(coreProject)'
-    msbuildArgs: '/p:DeployOnBuild=true /p:WebPublishMethod=Package /p:PackageAsSingleFile=true /p:SkipInvalidConfigurations=true /p:PackageLocation="$(build.artifactStagingDirectory)"'
-    platform: '$(buildPlatform)'
-    configuration: '$(buildConfiguration)'
-
 - task: VSBuild@1
   displayName: 'Build Project'
   inputs:
@@ -48,23 +38,6 @@ steps:
     packagesToPack: '$(project)'
     versioningScheme: 'off'
 
-- task: DotNetCoreCLI@2
-  displayName: 'Create Core NuGet Package'
-  inputs:
-    command: 'pack'
-    arguments: '--configuration $(buildConfiguration)'
-    packagesToPack: '$(coreProject)'
-    versioningScheme: 'off'
-
-- task: CmdLine@2
-  displayName: 'Create Umbraco Package'
-  inputs:
-    script: |
-      dotnet tool install --global Umbraco.Tools.Packages
-      cd src/$(projectName)/
-      umbpack pack .\package.xml -o $(Build.ArtifactStagingDirectory)
-      cd ../../
-
 - task: PublishBuildArtifacts@1
   displayName: 'Publish Build Artifacts'
   inputs:

src/Umbraco.Cms.Integrations.Commerce.Shopify/Api/Configuration/BackOfficeSecurityRequirementsOperationFilter.cs

@@ -0,0 +1,8 @@
+using Umbraco.Cms.Api.Management.OpenApi;
+
+namespace Umbraco.Cms.Integrations.Commerce.Shopify.Api.Configuration;
+
+public class BackOfficeSecurityRequirementsOperationFilter : BackOfficeSecurityRequirementsOperationFilterBase
+{
+    protected override string ApiName => Constants.ManagementApi.ApiName;
+}

src/Umbraco.Cms.Integrations.Commerce.Shopify/Api/Management/Controllers/CheckConfigurationController.cs

@@ -0,0 +1,30 @@
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Configuration;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Models;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Services;
+
+namespace Umbraco.Cms.Integrations.Commerce.Shopify.Api.Management.Controllers
+{
+    [ApiVersion("1.0")]
+    [ApiExplorerSettings(GroupName = Constants.ManagementApi.GroupName)]
+    public class CheckConfigurationController : ShopifyControllerBase
+    {
+        private readonly ShopifyOAuthSettings _oauthSettings;
+        public CheckConfigurationController(IOptions<ShopifySettings> shopifySettings, IShopifyService shopifyService, IShopifyAuthorizationService shopifyAuthorizationService, IOptions<ShopifyOAuthSettings> oauthSettings) : base(shopifySettings, shopifyService, shopifyAuthorizationService)
+        {
+            _oauthSettings = oauthSettings.Value;
+        }
+
+        [HttpGet("check-configuration")]
+        [ProducesResponseType(typeof(EditorSettings), StatusCodes.Status200OK)]
+        public IActionResult CheckConfiguration()
+        {
+            var settings = ShopifyService.GetApiConfiguration();
+
+            return Ok(settings);
+        }
+    }
+}

src/Umbraco.Cms.Integrations.Commerce.Shopify/Api/Management/Controllers/GetAccessTokenController.cs

@@ -0,0 +1,27 @@
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Configuration;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Services;
+
+namespace Umbraco.Cms.Integrations.Commerce.Shopify.Api.Management.Controllers
+{
+    [ApiVersion("1.0")]
+    [ApiExplorerSettings(GroupName = Constants.ManagementApi.GroupName)]
+    public class GetAccessTokenController : ShopifyControllerBase
+    {
+        public GetAccessTokenController(IOptions<ShopifySettings> shopifySettings, IShopifyService shopifyService, IShopifyAuthorizationService shopifyAuthorizationService) : base(shopifySettings, shopifyService, shopifyAuthorizationService)
+        {
+        }
+
+        [HttpPost("access-token")]
+        [ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetAccessToken([FromBody]OAuthRequestDto authRequestDto)
+        {
+            var setting = await ShopifyAuthorizationService.GetAccessTokenAsync(authRequestDto.Code);
+            return Ok(setting);
+        }
+    }
+}

src/Umbraco.Cms.Integrations.Commerce.Shopify/Api/Management/Controllers/GetAuthorizationUrlController.cs

@@ -0,0 +1,26 @@
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Configuration;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Services;
+
+namespace Umbraco.Cms.Integrations.Commerce.Shopify.Api.Management.Controllers
+{
+    [ApiVersion("1.0")]
+    [ApiExplorerSettings(GroupName = Constants.ManagementApi.GroupName)]
+    public class GetAuthorizationUrlController : ShopifyControllerBase
+    {
+        public GetAuthorizationUrlController(IOptions<ShopifySettings> shopifySettings, IShopifyService shopifyService, IShopifyAuthorizationService shopifyAuthorizationService) : base(shopifySettings, shopifyService, shopifyAuthorizationService)
+        {
+        }
+
+        [HttpGet("authorization-url")]
+        [ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
+        public IActionResult GetAuthorizationUrl()
+        {
+            var authUrl = ShopifyAuthorizationService.GetAuthorizationUrl();
+            return Ok(authUrl);
+        }
+    }
+}

src/Umbraco.Cms.Integrations.Commerce.Shopify/Api/Management/Controllers/GetListByIdsController.cs

@@ -0,0 +1,27 @@
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Configuration;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Services;
+
+namespace Umbraco.Cms.Integrations.Commerce.Shopify.Api.Management.Controllers
+{
+    [ApiVersion("1.0")]
+    [ApiExplorerSettings(GroupName = Constants.ManagementApi.GroupName)]
+    public class GetListByIdsController : ShopifyControllerBase
+    {
+        public GetListByIdsController(IOptions<ShopifySettings> shopifySettings, IShopifyService shopifyService, IShopifyAuthorizationService shopifyAuthorizationService) : base(shopifySettings, shopifyService, shopifyAuthorizationService)
+        {
+        }
+
+        [HttpPost("list-by-ids")]
+        [ProducesResponseType(typeof(ResponseDto<ProductsListDto>), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetListByIds([FromBody] RequestDto dto)
+        {
+            var result = await ShopifyService.GetProductsByIds(dto.Ids.Select(p => p).ToArray());
+            return Ok(result);
+        }
+    }
+}

src/Umbraco.Cms.Integrations.Commerce.Shopify/Api/Management/Controllers/GetListController.cs

@@ -0,0 +1,27 @@
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Configuration;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Models.Dtos;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Services;
+
+namespace Umbraco.Cms.Integrations.Commerce.Shopify.Api.Management.Controllers
+{
+    [ApiVersion("1.0")]
+    [ApiExplorerSettings(GroupName = Constants.ManagementApi.GroupName)]
+    public class GetListController : ShopifyControllerBase
+    {
+        public GetListController(IOptions<ShopifySettings> shopifySettings, IShopifyService shopifyService, IShopifyAuthorizationService shopifyAuthorizationService) : base(shopifySettings, shopifyService, shopifyAuthorizationService)
+        {
+        }
+
+        [HttpGet("list")]
+        [ProducesResponseType(typeof(ResponseDto<ProductsListDto>), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetList(string? pageInfo)
+        {
+            var result = await ShopifyService.GetResults(pageInfo);
+            return Ok(result);
+        }
+    }
+}

src/Umbraco.Cms.Integrations.Commerce.Shopify/Api/Management/Controllers/GetTotalPagesController.cs

@@ -0,0 +1,27 @@
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Configuration;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Services;
+
+namespace Umbraco.Cms.Integrations.Commerce.Shopify.Api.Management.Controllers
+{
+    [ApiVersion("1.0")]
+    [ApiExplorerSettings(GroupName = Constants.ManagementApi.GroupName)]
+    public class GetTotalPagesController : ShopifyControllerBase
+    {
+        public GetTotalPagesController(IOptions<ShopifySettings> shopifySettings, IShopifyService shopifyService, IShopifyAuthorizationService shopifyAuthorizationService) : base(shopifySettings, shopifyService, shopifyAuthorizationService)
+        {
+        }
+
+        [HttpGet("total-pages")]
+        [ProducesResponseType(typeof(int), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetTotalPages()
+        {
+            var productsCount = await ShopifyService.GetCount();
+            return Ok(productsCount / Constants.DEFAULT_PAGE_SIZE + 1);
+        }
+
+    }
+}

src/Umbraco.Cms.Integrations.Commerce.Shopify/Api/Management/Controllers/RefreshAccessTokenController.cs

@@ -0,0 +1,26 @@
+using Asp.Versioning;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Configuration;
+using Umbraco.Cms.Integrations.Commerce.Shopify.Services;
+
+namespace Umbraco.Cms.Integrations.Commerce.Shopify.Api.Management.Controllers
+{
+    [ApiVersion("1.0")]
+    [ApiExplorerSettings(GroupName = Constants.ManagementApi.GroupName)]
+    public class RefreshAccessTokenController : ShopifyControllerBase
+    {
+        public RefreshAccessTokenController(IOptions<ShopifySettings> shopifySettings, IShopifyService shopifyService, IShopifyAuthorizationService shopifyAuthorizationService) : base(shopifySettings, shopifyService, shopifyAuthorizationService)
+        {
+        }
+
+        [HttpPost("refresh-access-token")]
+        [ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
+        public async Task<IActionResult> RefreshAccessToken()
+        {
+            var response = await ShopifyAuthorizationService.RefreshAccessTokenAsync();
+            return Ok(response);
+        }
+    }
+}