n8n-nodes-mautic-advanced 1.2.0 → 1.3.0

package/dist/credentials/MauticAdvancedApi.credentials.js

@@ -14,25 +14,6 @@ class MauticAdvancedApi {
                 default: '',
                 placeholder: 'https://name.mautic.net',
             },
-            {
-                displayName: 'Mautic Version',
-                name: 'mauticVersion',
-                type: 'options',
-                default: 'v6',
-                options: [
-                    {
-                        name: 'v6 or lower',
-                        value: 'v6',
-                        description: 'Use legacy v1 API endpoints.',
-                    },
-                    {
-                        name: 'v7 or higher',
-                        value: 'v7',
-                        description: 'Use v2 API endpoints where available.',
-                    },
-                ],
-                description: 'Select the major Mautic version of this instance so the node can route API calls correctly.',
-            },
             {
                 displayName: 'Username',
                 name: 'username',

package/dist/credentials/MauticAdvancedOAuth2Api.credentials.js

@@ -21,25 +21,6 @@ class MauticAdvancedOAuth2Api {
                 default: '',
                 placeholder: 'https://name.mautic.net',
             },
-            {
-                displayName: 'Mautic Version',
-                name: 'mauticVersion',
-                type: 'options',
-                default: 'v6',
-                options: [
-                    {
-                        name: 'v6 or lower',
-                        value: 'v6',
-                        description: 'Use legacy v1 API endpoints.',
-                    },
-                    {
-                        name: 'v7 or higher',
-                        value: 'v7',
-                        description: 'Use v2 API endpoints where available.',
-                    },
-                ],
-                description: 'Select the major Mautic version of this instance so the node can route API calls correctly.',
-            },
             {
                 displayName: 'Authorization URL',
                 name: 'authUrl',

package/dist/nodes/MauticAdvanced/CompanyDescription.js

@@ -226,6 +226,16 @@ exports.companyFields = [
                 type: 'number',
                 default: 0,
             },
+            {
+                displayName: 'Owner Name or ID',
+                name: 'owner',
+                type: 'options',
+                description: 'User to assign as company owner. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+                typeOptions: {
+                    loadOptionsMethod: 'getOwners',
+                },
+                default: '',
+            },
             {
                 displayName: 'Overwrite With Blank',
                 name: 'overwriteWithBlank',
@@ -431,6 +441,16 @@ exports.companyFields = [
                 type: 'number',
                 default: 0,
             },
+            {
+                displayName: 'Owner Name or ID',
+                name: 'owner',
+                type: 'options',
+                description: 'User to assign as company owner. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+                typeOptions: {
+                    loadOptionsMethod: 'getOwners',
+                },
+                default: '',
+            },
             {
                 displayName: 'Overwrite With Blank',
                 name: 'overwriteWithBlank',

package/dist/nodes/MauticAdvanced/ContactDescription.js

@@ -446,11 +446,14 @@ exports.contactFields = [
                 default: '',
             },
             {
-                displayName: 'Owner ID',
-                name: 'ownerId',
-                type: 'string',
+                displayName: 'Owner Name or ID',
+                name: 'owner',
+                type: 'options',
+                description: 'User to assign as contact owner. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+                typeOptions: {
+                    loadOptionsMethod: 'getOwners',
+                },
                 default: '',
-                description: 'ID of a Mautic user to assign this contact to',
             },
             {
                 displayName: 'Phone',
@@ -1002,16 +1005,19 @@ exports.contactFields = [
                 default: '',
             },
             {
-                displayName: 'Owner ID',
-                name: 'ownerId',
-                type: 'string',
+                displayName: 'Owner Name or ID',
+                name: 'owner',
+                type: 'options',
+                description: 'User to assign as contact owner. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+                typeOptions: {
+                    loadOptionsMethod: 'getOwners',
+                },
                 displayOptions: {
                     show: {
                         '/jsonParameters': [false],
                     },
                 },
                 default: '',
-                description: 'ID of a Mautic user to assign this contact to',
             },
             {
                 displayName: 'Phone',

package/dist/nodes/MauticAdvanced/GenericFunctions.js

@@ -1,8 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateJSON = exports.serialiseMauticWhere = exports.mauticApiRequestAllItems = exports.DEFAULT_MAUTIC_PAGE_SIZE = exports.mauticApiRequest = void 0;
+exports.validateJSON = exports.serialiseMauticWhere = exports.mauticApiRequestAllItems = exports.DEFAULT_MAUTIC_PAGE_SIZE = exports.mauticApiRequest = exports.getMauticVersion = void 0;
 const n8n_workflow_1 = require("n8n-workflow");
 const authenticatedRequest_1 = require("./utils/authenticatedRequest");
+const versionCache = new Map();
+const VERSION_CACHE_TTL_MS = 5 * 60 * 1000;
+function normalizeInstanceUrl(raw) {
+    const trimmed = raw.trim();
+    if (!trimmed)
+        return '';
+    try {
+        const u = new URL(trimmed);
+        u.protocol = u.protocol.toLowerCase();
+        u.hostname = u.hostname.toLowerCase();
+        u.hash = '';
+        u.search = '';
+        u.pathname = u.pathname.replace(/\/+$/, '');
+        return u.toString().replace(/\/+$/, '');
+    }
+    catch {
+        return trimmed.replace(/\/+$/, '');
+    }
+}
+async function getMauticVersion(context) {
+    const authMethod = context.getNodeParameter('authentication', 0, 'credentials');
+    const credentialType = authMethod === 'credentials' ? 'mauticAdvancedApi' : 'mauticAdvancedOAuth2Api';
+    const credentials = await context.getCredentials(credentialType);
+    const baseUrl = normalizeInstanceUrl(credentials.url || '');
+    const cacheKey = `${credentialType}:${baseUrl}`;
+    const cached = versionCache.get(cacheKey);
+    if (cached && Date.now() < cached.expiresAt) {
+        return cached.version;
+    }
+    let version;
+    try {
+        await mauticApiRequest.call(context, 'GET', '/v2/companies', {}, { page: 1 }, undefined, {
+            Accept: 'application/json',
+        });
+        version = 'v7';
+    }
+    catch (error) {
+        // 403 = v2 route exists but no permission → still v7; 404 = route absent → v6
+        version = error?.httpCode === '403' ? 'v7' : 'v6';
+    }
+    versionCache.set(cacheKey, { version, expiresAt: Date.now() + VERSION_CACHE_TTL_MS });
+    return version;
+}
+exports.getMauticVersion = getMauticVersion;
 async function mauticApiRequest(method, endpoint, body = {}, query, uri, headers) {
     const authenticationMethod = this.getNodeParameter('authentication', 0, 'credentials');
     const options = {
@@ -17,7 +61,7 @@ async function mauticApiRequest(method, endpoint, body = {}, query, uri, headers
     }
     try {
         const returnData = await (0, authenticatedRequest_1.requestMauticAuthenticated)(this, authenticationMethod, options);
-        if (returnData.errors) {
+        if (returnData?.errors) {
             // They seem to sometimes return 200 status but still error.
             // Preserve the full error object including details for better error handling
             throw new n8n_workflow_1.NodeApiError(this.getNode(), returnData, {

package/dist/nodes/MauticAdvanced/MauticAdvanced.node.js

@@ -390,15 +390,13 @@ class MauticAdvanced {
                 // Get all the available owners (users) for filtering
                 async getOwners() {
                     const returnData = [];
-                    const response = await GenericFunctions_1.mauticApiRequest.call(this, 'GET', '/contacts/list/owners');
-                    const owners = response || [];
-                    for (const owner of owners) {
-                        returnData.push({
-                            name: `${owner.firstName || ''} ${owner.lastName || ''}`.trim() ||
-                                owner.username ||
-                                `User ${owner.id}`,
-                            value: owner.id,
-                        });
+                    const response = await GenericFunctions_1.mauticApiRequest.call(this, 'GET', '/users');
+                    const users = response?.users ? Object.values(response.users) : [];
+                    for (const user of users) {
+                        const fullName = `${user.firstName || ''} ${user.lastName || ''}`.trim();
+                        const display = fullName || user.username || `User ${user.id}`;
+                        const label = user.email ? `${display} (${user.email})` : display;
+                        returnData.push({ name: label, value: user.id });
                     }
                     return returnData;
                 },

package/dist/nodes/MauticAdvanced/ai-tools/tool-executor.js

@@ -69,13 +69,9 @@ function buildFilters(params) {
 async function apiRequest(context, method, endpoint, body = {}, query = {}) {
     return GenericFunctions_1.mauticApiRequest.call(context, method, endpoint, body, query);
 }
-// Detect mautic version from credentials
 async function getMauticVersionFromContext(context) {
     try {
-        const authMethod = context.getNodeParameter('authentication', 0, 'credentials');
-        const credName = authMethod === 'oAuth2' ? 'mauticAdvancedOAuth2Api' : 'mauticAdvancedApi';
-        const credentials = await context.getCredentials(credName);
-        return credentials.mauticVersion || 'v6';
+        return await (0, GenericFunctions_1.getMauticVersion)(context);
     }
     catch {
         return 'v6';

package/dist/nodes/MauticAdvanced/operations/CompanyOperations.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeCompanyOperation = void 0;
 const n8n_workflow_1 = require("n8n-workflow");
 const ApiHelpers_1 = require("../utils/ApiHelpers");
+const GenericFunctions_1 = require("../GenericFunctions");
 const DataHelpers_1 = require("../utils/DataHelpers");
 async function executeCompanyOperation(context, operation, i) {
     let responseData;
@@ -36,135 +37,311 @@ exports.executeCompanyOperation = executeCompanyOperation;
 async function createCompany(context, itemIndex) {
     const simple = (0, ApiHelpers_1.getOptionalParam)(context, 'simple', itemIndex, false);
     const name = (0, ApiHelpers_1.getRequiredParam)(context, 'name', itemIndex);
-    const body = { companyname: name };
+    const mauticVersion = await (0, GenericFunctions_1.getMauticVersion)(context);
     const additionalFields = (0, ApiHelpers_1.getOptionalParam)(context, 'additionalFields', itemIndex, {});
-    const { addressUi, customFieldsUi, companyEmail, fax, industry, numberOfEmployees, phone, website, annualRevenue, description, ...rest } = additionalFields;
-    if (addressUi?.addressValues) {
-        const { addressValues } = addressUi;
-        body.companyaddress1 = addressValues.address1;
-        body.companyaddress2 = addressValues.address2;
-        body.companycity = addressValues.city;
-        body.companystate = addressValues.state;
-        body.companycountry = addressValues.country;
-        body.companyzipcode = addressValues.zipCode;
-    }
-    if (companyEmail)
-        body.companyemail = companyEmail;
-    if (fax)
-        body.companyfax = fax;
-    if (industry)
-        body.companyindustry = industry;
-    if (numberOfEmployees)
-        body.companynumber_of_employees = numberOfEmployees;
-    if (phone)
-        body.companyphone = phone;
-    if (website)
-        body.companywebsite = website;
-    if (annualRevenue)
-        body.companyannual_revenue = annualRevenue;
-    if (description)
-        body.companydescription = description;
+    const { addressUi, customFieldsUi, companyEmail, fax, industry, isPublished, numberOfEmployees, owner, phone, website, annualRevenue, description, ...rest } = additionalFields;
+    const body = {};
+    if (mauticVersion === 'v7') {
+        body.name = name;
+        if (addressUi?.addressValues) {
+            const { addressValues } = addressUi;
+            if (addressValues.address1)
+                body.address1 = addressValues.address1;
+            if (addressValues.address2)
+                body.address2 = addressValues.address2;
+            if (addressValues.city)
+                body.city = addressValues.city;
+            if (addressValues.state)
+                body.state = addressValues.state;
+            if (addressValues.country)
+                body.country = addressValues.country;
+            if (addressValues.zipCode)
+                body.zipcode = addressValues.zipCode;
+        }
+        if (companyEmail)
+            body.email = companyEmail;
+        if (industry)
+            body.industry = industry;
+        if (isPublished !== undefined)
+            body.isPublished = isPublished;
+        if (owner)
+            body.owner = `/api/v2/users/${owner}`;
+        if (phone)
+            body.phone = phone;
+        if (website)
+            body.website = website;
+        if (description)
+            body.description = description;
+        // fax, numberOfEmployees, annualRevenue not in v7 Company entity write group — omitted
+    }
+    else {
+        body.companyname = name;
+        if (addressUi?.addressValues) {
+            const { addressValues } = addressUi;
+            body.companyaddress1 = addressValues.address1;
+            body.companyaddress2 = addressValues.address2;
+            body.companycity = addressValues.city;
+            body.companystate = addressValues.state;
+            body.companycountry = addressValues.country;
+            body.companyzipcode = addressValues.zipCode;
+        }
+        if (companyEmail)
+            body.companyemail = companyEmail;
+        if (fax)
+            body.companyfax = fax;
+        if (industry)
+            body.companyindustry = industry;
+        if (numberOfEmployees)
+            body.companynumber_of_employees = numberOfEmployees;
+        if (owner)
+            body.owner = owner;
+        if (phone)
+            body.companyphone = phone;
+        if (website)
+            body.companywebsite = website;
+        if (annualRevenue)
+            body.companyannual_revenue = annualRevenue;
+        if (description)
+            body.companydescription = description;
+    }
     if (customFieldsUi?.customFieldValues) {
         const { customFieldValues } = customFieldsUi;
         const data = customFieldValues.reduce((obj, value) => Object.assign(obj, { [`${value.fieldId}`]: value.fieldValue }), {});
         Object.assign(body, data);
     }
-    Object.assign(body, rest);
-    const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'POST', '/companies/new', body);
-    let result = response.company;
+    // v7 API Platform rejects unknown fields; rest only applies to v1
+    if (mauticVersion !== 'v7')
+        Object.assign(body, rest);
+    let result;
+    if (mauticVersion === 'v7') {
+        const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'POST', '/v2/companies', body, {}, undefined, {
+            'Content-Type': 'application/json',
+            Accept: 'application/json',
+        });
+        result = response;
+    }
+    else {
+        const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'POST', '/companies/new', body);
+        result = response.company;
+    }
     if (simple) {
-        result = result.fields.all;
+        result = toSimpleCompany(result);
     }
     return result;
 }
 async function updateCompany(context, itemIndex) {
     const companyId = (0, ApiHelpers_1.getRequiredParam)(context, 'companyId', itemIndex);
     const simple = (0, ApiHelpers_1.getOptionalParam)(context, 'simple', itemIndex, false);
+    const mauticVersion = await (0, GenericFunctions_1.getMauticVersion)(context);
     const body = {};
     const updateFields = (0, ApiHelpers_1.getOptionalParam)(context, 'updateFields', itemIndex, {});
-    const { addressUi, customFieldsUi, companyEmail, name, fax, industry, numberOfEmployees, phone, website, annualRevenue, description, ...rest } = updateFields;
-    if (addressUi?.addressValues) {
-        const { addressValues } = addressUi;
-        body.companyaddress1 = addressValues.address1;
-        body.companyaddress2 = addressValues.address2;
-        body.companycity = addressValues.city;
-        body.companystate = addressValues.state;
-        body.companycountry = addressValues.country;
-        body.companyzipcode = addressValues.zipCode;
-    }
-    if (companyEmail)
-        body.companyemail = companyEmail;
-    if (name)
-        body.companyname = name;
-    if (fax)
-        body.companyfax = fax;
-    if (industry)
-        body.companyindustry = industry;
-    if (numberOfEmployees)
-        body.companynumber_of_employees = numberOfEmployees;
-    if (phone)
-        body.companyphone = phone;
-    if (website)
-        body.companywebsite = website;
-    if (annualRevenue)
-        body.companyannual_revenue = annualRevenue;
-    if (description)
-        body.companydescription = description;
+    const { addressUi, customFieldsUi, companyEmail, name, fax, industry, isPublished, numberOfEmployees, owner, phone, website, annualRevenue, description, ...rest } = updateFields;
+    if (mauticVersion === 'v7') {
+        if (name)
+            body.name = name;
+        if (addressUi?.addressValues) {
+            const { addressValues } = addressUi;
+            if (addressValues.address1)
+                body.address1 = addressValues.address1;
+            if (addressValues.address2)
+                body.address2 = addressValues.address2;
+            if (addressValues.city)
+                body.city = addressValues.city;
+            if (addressValues.state)
+                body.state = addressValues.state;
+            if (addressValues.country)
+                body.country = addressValues.country;
+            if (addressValues.zipCode)
+                body.zipcode = addressValues.zipCode;
+        }
+        if (companyEmail)
+            body.email = companyEmail;
+        if (industry)
+            body.industry = industry;
+        if (isPublished !== undefined)
+            body.isPublished = isPublished;
+        if (owner)
+            body.owner = `/api/v2/users/${owner}`;
+        if (phone)
+            body.phone = phone;
+        if (website)
+            body.website = website;
+        if (description)
+            body.description = description;
+        // fax, numberOfEmployees, annualRevenue not in v7 Company entity write group — omitted
+    }
+    else {
+        if (name)
+            body.companyname = name;
+        if (addressUi?.addressValues) {
+            const { addressValues } = addressUi;
+            body.companyaddress1 = addressValues.address1;
+            body.companyaddress2 = addressValues.address2;
+            body.companycity = addressValues.city;
+            body.companystate = addressValues.state;
+            body.companycountry = addressValues.country;
+            body.companyzipcode = addressValues.zipCode;
+        }
+        if (companyEmail)
+            body.companyemail = companyEmail;
+        if (fax)
+            body.companyfax = fax;
+        if (industry)
+            body.companyindustry = industry;
+        if (numberOfEmployees)
+            body.companynumber_of_employees = numberOfEmployees;
+        if (owner)
+            body.owner = owner;
+        if (phone)
+            body.companyphone = phone;
+        if (website)
+            body.companywebsite = website;
+        if (annualRevenue)
+            body.companyannual_revenue = annualRevenue;
+        if (description)
+            body.companydescription = description;
+    }
     if (customFieldsUi?.customFieldValues) {
         const { customFieldValues } = customFieldsUi;
         const data = customFieldValues.reduce((obj, value) => Object.assign(obj, { [`${value.fieldId}`]: value.fieldValue }), {});
         Object.assign(body, data);
     }
-    Object.assign(body, rest);
-    const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'PATCH', `/companies/${companyId}/edit`, body);
-    let result = response.company;
+    // v7 API Platform rejects unknown fields; rest only applies to v1
+    if (mauticVersion !== 'v7')
+        Object.assign(body, rest);
+    let result;
+    if (mauticVersion === 'v7') {
+        const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'PATCH', `/v2/companies/${companyId}`, body, {}, undefined, { 'Content-Type': 'application/merge-patch+json', Accept: 'application/json' });
+        result = response;
+    }
+    else {
+        const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'PATCH', `/companies/${companyId}/edit`, body);
+        result = response.company;
+    }
     if (simple) {
-        result = result.fields.all;
+        result = toSimpleCompany(result);
     }
     return result;
 }
 async function getCompany(context, itemIndex) {
     const companyId = (0, ApiHelpers_1.getRequiredParam)(context, 'companyId', itemIndex);
     const simple = (0, ApiHelpers_1.getOptionalParam)(context, 'simple', itemIndex, false);
-    const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', `/companies/${companyId}`);
-    let result = response.company;
+    const mauticVersion = await (0, GenericFunctions_1.getMauticVersion)(context);
+    let result;
+    if (mauticVersion === 'v7') {
+        result = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', `/v2/companies/${companyId}`, {}, {}, undefined, {
+            Accept: 'application/json',
+        });
+    }
+    else {
+        const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', `/companies/${companyId}`);
+        result = response.company;
+    }
     if (simple) {
-        result = result.fields.all;
+        result = toSimpleCompany(result);
     }
-    return (0, DataHelpers_1.convertNumericStrings)(result);
+    // v7 returns proper JSON types already; convertNumericStrings only needed for v1 string responses
+    return mauticVersion === 'v7' ? result : (0, DataHelpers_1.convertNumericStrings)(result);
 }
 async function getAllCompanies(context, itemIndex) {
     const returnAll = (0, ApiHelpers_1.getOptionalParam)(context, 'returnAll', itemIndex, false);
     const simple = (0, ApiHelpers_1.getOptionalParam)(context, 'simple', itemIndex, false);
-    const additionalFields = (0, ApiHelpers_1.getOptionalParam)(context, 'additionalFields', itemIndex, {});
-    const qs = (0, DataHelpers_1.buildQueryFromOptions)(additionalFields);
-    if (!qs.orderBy)
-        qs.orderBy = 'id';
-    if (!qs.orderByDir)
-        qs.orderByDir = 'asc';
+    const mauticVersion = await (0, GenericFunctions_1.getMauticVersion)(context);
     let responseData;
-    if (returnAll) {
-        const limit = (0, ApiHelpers_1.getOptionalParam)(context, 'limit', itemIndex, undefined);
-        responseData = await (0, ApiHelpers_1.makePaginatedRequest)(context, 'companies', 'GET', '/companies', {}, qs, limit);
+    if (mauticVersion === 'v7') {
+        // v7: page-based pagination only (no start/limit/orderBy/search)
+        if (returnAll) {
+            const limit = (0, ApiHelpers_1.getOptionalParam)(context, 'limit', itemIndex, undefined);
+            const allItems = [];
+            let page = 1;
+            while (true) {
+                const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', '/v2/companies', {}, { page }, undefined, { Accept: 'application/json' });
+                const pageItems = Array.isArray(response)
+                    ? response
+                    : (response?.['hydra:member'] ?? []);
+                if (!pageItems.length)
+                    break;
+                allItems.push(...pageItems);
+                if (limit !== undefined && allItems.length >= limit)
+                    break;
+                page++;
+            }
+            responseData = limit !== undefined ? allItems.slice(0, limit) : allItems;
+        }
+        else {
+            // page through until limit satisfied — v7 page size is fixed (~30), limit may exceed it
+            const limit = (0, ApiHelpers_1.getRequiredParam)(context, 'limit', itemIndex);
+            const allItems = [];
+            let page = 1;
+            while (allItems.length < limit) {
+                const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', '/v2/companies', {}, { page }, undefined, { Accept: 'application/json' });
+                const pageItems = Array.isArray(response)
+                    ? response
+                    : (response?.['hydra:member'] ?? []);
+                if (!pageItems.length)
+                    break;
+                allItems.push(...pageItems);
+                page++;
+            }
+            responseData = allItems.slice(0, limit);
+        }
     }
     else {
-        const limit = (0, ApiHelpers_1.getRequiredParam)(context, 'limit', itemIndex);
-        qs.limit = limit;
-        const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', '/companies', {}, qs);
-        responseData = (response.companies ? Object.values(response.companies) : []);
+        const additionalFields = (0, ApiHelpers_1.getOptionalParam)(context, 'additionalFields', itemIndex, {});
+        const qs = (0, DataHelpers_1.buildQueryFromOptions)(additionalFields);
+        if (!qs.orderBy)
+            qs.orderBy = 'id';
+        if (!qs.orderByDir)
+            qs.orderByDir = 'asc';
+        if (returnAll) {
+            const limit = (0, ApiHelpers_1.getOptionalParam)(context, 'limit', itemIndex, undefined);
+            responseData = await (0, ApiHelpers_1.makePaginatedRequest)(context, 'companies', 'GET', '/companies', {}, qs, limit);
+        }
+        else {
+            const limit = (0, ApiHelpers_1.getRequiredParam)(context, 'limit', itemIndex);
+            qs.limit = limit;
+            const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', '/companies', {}, qs);
+            responseData = (response.companies ? Object.values(response.companies) : []);
+        }
     }
     if (simple) {
-        responseData = responseData.map((item) => item.fields.all);
+        responseData = responseData.map((item) => toSimpleCompany(item));
     }
-    return (0, DataHelpers_1.convertNumericStrings)(responseData);
+    // v7 returns proper JSON types already; convertNumericStrings only needed for v1 string responses
+    return mauticVersion === 'v7' ? responseData : (0, DataHelpers_1.convertNumericStrings)(responseData);
 }
 async function deleteCompany(context, itemIndex) {
     const simple = (0, ApiHelpers_1.getOptionalParam)(context, 'simple', itemIndex, false);
     const companyId = (0, ApiHelpers_1.getRequiredParam)(context, 'companyId', itemIndex);
+    const mauticVersion = await (0, GenericFunctions_1.getMauticVersion)(context);
+    if (mauticVersion === 'v7') {
+        // v7 DELETE returns 204 no body
+        await (0, ApiHelpers_1.makeApiRequest)(context, 'DELETE', `/v2/companies/${companyId}`, {}, {}, undefined, {
+            Accept: 'application/json',
+        });
+        return { id: Number(companyId) };
+    }
     const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'DELETE', `/companies/${companyId}/delete`);
     let result = response.company;
     if (simple) {
-        result = result.fields.all;
+        result = toSimpleCompany(result);
     }
     return result;
 }
+function toSimpleCompany(company) {
+    if (company?.fields?.all) {
+        // v1: fields nested under company.fields.all
+        return {
+            id: company.id,
+            owner: company.owner ?? null,
+            ...company.fields.all,
+        };
+    }
+    // v7: fields are at the top level; owner is a User object
+    const { id, owner, score, socialCache, dateAdded, dateModified, isPublished, ...fields } = company;
+    return {
+        id,
+        owner: owner ?? null,
+        ...fields,
+    };
+}

package/dist/nodes/MauticAdvanced/operations/ContactOperations.js

@@ -660,7 +660,7 @@ async function getContactsWithDncFilter(context, qs, options, limit) {
     return contacts;
 }
 async function getContactOwners(context) {
-    const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', '/contacts/list/owners');
+    const response = await (0, ApiHelpers_1.makeApiRequest)(context, 'GET', '/users');
     return (0, DataHelpers_1.convertNumericStrings)(response);
 }
 async function getContactFields(context) {

package/dist/nodes/MauticAdvanced/operations/TagOperations.js

@@ -3,18 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteTagV2 = exports.getAllTagsV2 = exports.getTagV2 = exports.updateTagV2 = exports.createTagV2 = exports.deleteTagV1 = exports.getAllTagsV1 = exports.getTagV1 = exports.updateTagV1 = exports.createTagV1 = exports.getMauticVersion = void 0;
 const ApiHelpers_1 = require("../utils/ApiHelpers");
 const DataHelpers_1 = require("../utils/DataHelpers");
-async function getMauticVersion(context) {
-    const authenticationMethod = context.getNodeParameter('authentication', 0, 'credentials');
-    if (authenticationMethod === 'credentials') {
-        const credentials = await context.getCredentials('mauticAdvancedApi');
-        const version = credentials.mauticVersion || 'v6';
-        return version === 'v7' ? 'v7' : 'v6';
-    }
-    const credentials = await context.getCredentials('mauticAdvancedOAuth2Api');
-    const version = credentials.mauticVersion || 'v6';
-    return version === 'v7' ? 'v7' : 'v6';
-}
-exports.getMauticVersion = getMauticVersion;
+const GenericFunctions_1 = require("../GenericFunctions");
+Object.defineProperty(exports, "getMauticVersion", { enumerable: true, get: function () { return GenericFunctions_1.getMauticVersion; } });
 // -----------------------------
 // v1 tag helpers (legacy API)
 // -----------------------------

package/dist/nodes/MauticAdvanced/utils/DataHelpers.js

@@ -33,7 +33,12 @@ function processContactFields(responseData, options, fieldsToReturn) {
         }
         return sourceData;
     }
-    const processedData = sourceData.map((item) => item.fields?.all || item);
+    const processedData = sourceData.map((item) => {
+        const all = item.fields?.all;
+        if (!all)
+            return item;
+        return { id: item.id, owner: item.owner ?? null, ...all };
+    });
     if (Array.isArray(filterFields) && filterFields.length > 0) {
         return processedData.map((item, index) => filterContactFields(item, sourceData[index], filterFields));
     }

package/dist/nodes/MauticAdvanced/utils/loadOptionsCache.js

@@ -30,9 +30,6 @@ function normalizeCredentialUrl(value) {
         return withoutTrailingSlashes(trimmed);
     }
 }
-function getMauticVersion(credentials) {
-    return String(credentials.mauticVersion || 'v6');
-}
 function credentialRefPart(value) {
     if (typeof value === 'string' && value) {
         return value;
@@ -64,7 +61,6 @@ function getCacheKey(authenticationMethod, credentialType, credentialReference,
         credentialType,
         credentialReference,
         normalizeCredentialUrl(credentials.url),
-        getMauticVersion(credentials),
         datasetKey,
     ]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-mautic-advanced",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Enhanced n8n node for Mautic with comprehensive API coverage including tags, campaigns, categories, and advanced contact management",
   "keywords": [
     "n8n",