Merge pull request #294 from umbraco/feature/v17/activecampaign

Feature/v17/activecampaign

Author: acoumb

NuGet.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <packageSources>
-        <clear />
-        <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-        <add key="Umbraco Prereleases" value="https://www.myget.org/F/umbracoprereleases/api/v3/index.json" />
-    </packageSources>
+	<packageSources>
+		<clear />
+		<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+		<add key="Umbraco Prereleases" value="https://www.myget.org/F/umbracoprereleases/api/v3/index.json" />
+	</packageSources>
 </configuration>

azure-pipeline - Crm.ActiveCampaign.yml

@@ -1,8 +1,8 @@
 trigger:
   branches:
     include:
-    - main-v16
-    - v16/dev
+    - main-v17
+    - v17/dev
   paths:
     include:
     - src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/**
@@ -16,24 +16,28 @@ variables:
   project: 'src/$(projectName)/$(projectName).csproj'
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
+  productGroup: 'DXP'
+  productVersion: 'v17'
+  DT_API_KEY: $(dtApiKey)
+  DT_BASE_URL: $(dtBaseUrl)
 
 steps:
+- task: UseDotNet@2
+  displayName: 'Use SDK version 10.0.100'
+  inputs:
+    packageType: 'sdk'
+    version: '10.0.100'
+
 - task: NuGetToolInstaller@1
   displayName: 'Install NuGet'
 
 - task: DotNetCoreCLI@2
   displayName: 'NuGet Restore'
   inputs:
     command: 'restore'
-    feedsToUse: 'select'
+    feedsToUse: 'config'
     projects: '$(project)'
-    includeNuGetOrg: true
-
-- task: UseDotNet@2
-  displayName: 'Use SDK version 9.0.203'
-  inputs:
-    packageType: 'sdk'
-    version: '9.0.203'
+    nugetConfigPath: 'NuGet.config'
 
 - task: VSBuild@1
   displayName: 'Build Project'
@@ -57,3 +61,26 @@ steps:
     PathtoPublish: '$(Build.ArtifactStagingDirectory)'
     ArtifactName: 'drop'
     publishLocation: 'Container'
+
+# Generate/upload SBOM with cdxgen
+- script: |
+    cd $(Build.SourcesDirectory)
+    npm install --global @cyclonedx/cdxgen
+  displayName: 'Install cdxgen'
+
+- script: |
+    mkdir -p $(Build.ArtifactStagingDirectory)/bom
+    cd $(Build.SourcesDirectory)
+
+    cdxgen --recurse --output $(Build.ArtifactStagingDirectory)\bom\bom.json --json-pretty --project-group "$(productGroup)" --project-name "$(projectName)" --project-version "$(productVersion)" --server-url "$(DT_BASE_URL)" --api-key "$(DT_API_KEY)" --deep
+  displayName: 'Generate & Upload SBOM with cdxgen'
+  env:
+    DT_API_KEY: $(DT_API_KEY)
+    DT_BASE_URL: $(DT_BASE_URL)
+
+# Publish SBOM artifact
+- task: PublishPipelineArtifact@1
+  displayName: 'Publish SBOM Artifact'
+  inputs:
+    targetPath: $(Build.ArtifactStagingDirectory)/bom
+    artifactName: SBOM    

examples/Umbraco.Cms.Integrations.Testsite.V17/Umbraco.Cms.Integrations.Testsite.V17.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Umbraco.Cms" Version="17.0.0" />
+    <ProjectReference Include="..\..\src\Umbraco.Cms.Integrations.Crm.ActiveCampaign\Umbraco.Cms.Integrations.Crm.ActiveCampaign.csproj" />
     <ProjectReference Include="..\..\src\Umbraco.Cms.Integrations.Commerce.Shopify\Umbraco.Cms.Integrations.Commerce.Shopify.csproj" />
   </ItemGroup>
 
@@ -21,6 +22,4 @@
     <!-- Razor files are needed for the backoffice to work correctly -->
     <CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
   </PropertyGroup>
-
-
 </Project>

src/Umbraco.Cms.Integrations.Automation.Zapier/NuGet.config

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using Umbraco.Cms.Api.Common.OpenApi;
 using Umbraco.Cms.Core.Composing;

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/ActiveCampaignComposer.cs

@@ -0,0 +1 @@
+@umbraco-cms:registry=https://www.myget.org/F/umbracoprereleases/npm/

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/.npmrc

@@ -1,7 +1,8 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { ClientOptions } from './types.gen';
-import { type Config, type ClientOptions as DefaultClientOptions, createClient, createConfig } from '@hey-api/client-fetch';
+import { type ClientOptions, type Config, createClient, createConfig } from '@hey-api/client-fetch';
+
+import type { ClientOptions as ClientOptions2 } from './types.gen';
 
 /**
  * The `createClientConfig()` function will be called on client initialization
@@ -11,9 +12,9 @@ import { type Config, type ClientOptions as DefaultClientOptions, createClient,
  * `setConfig()`. This is useful for example if you're using Next.js
  * to ensure your client always has the correct values.
  */
-export type CreateClientConfig<T extends DefaultClientOptions = ClientOptions> = (override?: Config<DefaultClientOptions & T>) => Config<Required<DefaultClientOptions> & T>;
+export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
 
-export const client = createClient(createConfig<ClientOptions>({
-    baseUrl: 'http://localhost:30450',
+export const client = createClient(createConfig<ClientOptions2>({
+    baseUrl: 'http://localhost:28157',
     throwOnError: true
-}));
+}));

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/generated/client.gen.ts

@@ -1,4 +1,5 @@
 // This file is auto-generated by @hey-api/openapi-ts
-export * from './types.gen';
+
+export type * from './types.gen';
 export * from './client.gen';
-export * from './sdk.gen';
+export * from './sdk.gen';

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/generated/index.ts

@@ -1,10 +1,11 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
-import type { Options as ClientOptions, TDataShape, Client } from '@hey-api/client-fetch';
-import type { GetApiAccessData, GetApiAccessResponse, GetFormsData, GetFormsResponse, GetFormsByIdData, GetFormsByIdResponse } from './types.gen';
-import { client as _heyApiClient } from './client.gen';
+import type { Client, Options as Options2, TDataShape } from '@hey-api/client-fetch';
 
-export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = ClientOptions<TData, ThrowOnError> & {
+import { client } from './client.gen';
+import type { GetApiAccessData, GetApiAccessErrors, GetApiAccessResponses, GetFormsByIdData, GetFormsByIdErrors, GetFormsByIdResponses, GetFormsData, GetFormsErrors, GetFormsResponses } from './types.gen';
+
+export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends boolean = boolean> = Options2<TData, ThrowOnError> & {
     /**
      * You can provide a client instance returned by `createClient()` instead of
      * individual options. This might be also useful if you want to implement a
@@ -18,9 +19,9 @@ export type Options<TData extends TDataShape = TDataShape, ThrowOnError extends
     meta?: Record<string, unknown>;
 };
 
-export class ActiveCampaignFormsService {
+export class ActiveCampaignForms {
     public static getApiAccess<ThrowOnError extends boolean = true>(options?: Options<GetApiAccessData, ThrowOnError>) {
-        return (options?.client ?? _heyApiClient).get<GetApiAccessResponse, unknown, ThrowOnError>({
+        return (options?.client ?? client).get<GetApiAccessResponses, GetApiAccessErrors, ThrowOnError>({
             security: [
                 {
                     scheme: 'bearer',
@@ -33,7 +34,7 @@ export class ActiveCampaignFormsService {
     }
 
     public static getForms<ThrowOnError extends boolean = true>(options?: Options<GetFormsData, ThrowOnError>) {
-        return (options?.client ?? _heyApiClient).get<GetFormsResponse, unknown, ThrowOnError>({
+        return (options?.client ?? client).get<GetFormsResponses, GetFormsErrors, ThrowOnError>({
             security: [
                 {
                     scheme: 'bearer',
@@ -46,7 +47,7 @@ export class ActiveCampaignFormsService {
     }
 
     public static getFormsById<ThrowOnError extends boolean = true>(options: Options<GetFormsByIdData, ThrowOnError>) {
-        return (options.client ?? _heyApiClient).get<GetFormsByIdResponse, unknown, ThrowOnError>({
+        return (options.client ?? client).get<GetFormsByIdResponses, GetFormsByIdErrors, ThrowOnError>({
             security: [
                 {
                     scheme: 'bearer',
@@ -57,5 +58,4 @@ export class ActiveCampaignFormsService {
             ...options
         });
     }
-    
-}
+}

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/generated/sdk.gen.ts

@@ -1,20 +1,18 @@
 // This file is auto-generated by @hey-api/openapi-ts
 
+export type ClientOptions = {
+    baseUrl: 'http://localhost:28157' | (string & {});
+};
+
 export type ApiAccessDtoModel = {
     readonly account: string;
     readonly isApiConfigurationValid: boolean;
 };
 
-export type FormCollectionResponseDtoModelReadable = {
+export type FormCollectionResponseDtoModel = {
     message: string;
     forms: Array<FormDtoModel>;
-    meta: MetaDtoModelReadable;
-};
-
-export type FormCollectionResponseDtoModelWritable = {
-    message: string;
-    forms: Array<FormDtoModel>;
-    meta: MetaDtoModelWritable;
+    meta: MetaDtoModel;
 };
 
 export type FormDtoModel = {
@@ -27,7 +25,7 @@ export type FormResponseDtoModel = {
     form: FormDtoModel;
 };
 
-export type MetaDtoModelReadable = {
+export type MetaDtoModel = {
     total: string;
     readonly totalPages: number;
 };
@@ -73,10 +71,6 @@ export type GetFormsErrors = {
      * The resource is protected and requires an authentication token
      */
     401: unknown;
-    /**
-     * Payment Required
-     */
-    402: unknown;
     /**
      * Forbidden
      */
@@ -95,7 +89,7 @@ export type GetFormsResponses = {
     /**
      * OK
      */
-    200: FormCollectionResponseDtoModelReadable;
+    200: FormCollectionResponseDtoModel;
 };
 
 export type GetFormsResponse = GetFormsResponses[keyof GetFormsResponses];
@@ -136,7 +130,3 @@ export type GetFormsByIdResponses = {
 };
 
 export type GetFormsByIdResponse = GetFormsByIdResponses[keyof GetFormsByIdResponses];
-
-export type ClientOptions = {
-    baseUrl: 'http://localhost:30450' | (string & {});
-};