@joshuanode/n8n-nodes-cipp 0.0.22 → 0.0.25

package/dist/credentials/CippApi.credentials.d.ts

@@ -1,9 +1,11 @@
-import type { Icon, ICredentialType, INodeProperties } from 'n8n-workflow';
+import type { ICredentialDataDecryptedObject, ICredentialType, IHttpRequestOptions, INodeProperties, Icon } from 'n8n-workflow';
 export declare class CippApi implements ICredentialType {
     name: string;
     displayName: string;
     icon: Icon;
     documentationUrl: string;
+    genericAuth: boolean;
     properties: INodeProperties[];
+    authenticate(credentials: ICredentialDataDecryptedObject, requestOptions: IHttpRequestOptions): Promise<IHttpRequestOptions>;
 }
 //# sourceMappingURL=CippApi.credentials.d.ts.map

package/dist/credentials/CippApi.credentials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CippApi.credentials.d.ts","sourceRoot":"","sources":["../../credentials/CippApi.credentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE3E,qBAAa,OAAQ,YAAW,eAAe;IAC9C,IAAI,SAAa;IACjB,WAAW,SAAkB;IAC7B,IAAI,EAAE,IAAI,CAAmB;IAC7B,gBAAgB,SAAsE;IAEtF,UAAU,EAAE,eAAe,EAAE,CAqC3B;CAIF"}
+{"version":3,"file":"CippApi.credentials.d.ts","sourceRoot":"","sources":["../../credentials/CippApi.credentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,8BAA8B,EAC9B,eAAe,EAEf,mBAAmB,EACnB,eAAe,EACf,IAAI,EACJ,MAAM,cAAc,CAAC;AA6EtB,qBAAa,OAAQ,YAAW,eAAe;IAC9C,IAAI,SAAa;IACjB,WAAW,SAAkB;IAC7B,IAAI,EAAE,IAAI,CAAmB;IAC7B,gBAAgB,SAAsE;IACtF,WAAW,UAAQ;IAEnB,UAAU,EAAE,eAAe,EAAE,CAqC3B;IAEI,YAAY,CACjB,WAAW,EAAE,8BAA8B,EAC3C,cAAc,EAAE,mBAAmB,GACjC,OAAO,CAAC,mBAAmB,CAAC;CAW/B"}

package/dist/credentials/CippApi.credentials.js

@@ -1,11 +1,61 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CippApi = void 0;
+const tokenCache = new Map();
+function getCredentialString(credentials, name) {
+    const value = credentials[name];
+    if (typeof value !== 'string' || value.trim() === '') {
+        throw new Error(`Missing required CIPP credential field: ${name}`);
+    }
+    return value.trim();
+}
+function getCacheKey(clientId, tenantId) {
+    return `${clientId}:${tenantId}`;
+}
+async function getAccessToken(credentials) {
+    const tenantId = getCredentialString(credentials, 'tenantId');
+    const clientId = getCredentialString(credentials, 'clientId');
+    const clientSecret = getCredentialString(credentials, 'clientSecret');
+    const cacheKey = getCacheKey(clientId, tenantId);
+    const cached = tokenCache.get(cacheKey);
+    if (cached && cached.expiresAt > Date.now() + 300000) {
+        return cached.accessToken;
+    }
+    const tokenUrl = `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`;
+    const body = new URLSearchParams({
+        grant_type: 'client_credentials',
+        client_id: clientId,
+        client_secret: clientSecret,
+        scope: `api://${clientId}/.default`,
+    });
+    const response = await fetch(tokenUrl, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded',
+        },
+        body,
+    });
+    const responseBody = (await response.json().catch(() => ({})));
+    if (!response.ok || typeof responseBody.access_token !== 'string') {
+        tokenCache.delete(cacheKey);
+        const message = responseBody.error_description ||
+            responseBody.error ||
+            `Azure AD token request failed with status ${response.status}`;
+        throw new Error(message);
+    }
+    const expiresIn = typeof responseBody.expires_in === 'number' ? responseBody.expires_in : 3600;
+    tokenCache.set(cacheKey, {
+        accessToken: responseBody.access_token,
+        expiresAt: Date.now() + expiresIn * 1000,
+    });
+    return responseBody.access_token;
+}
 class CippApi {
     name = 'cippApi';
     displayName = 'CIPP.app API';
     icon = 'file:cipp.png';
     documentationUrl = 'https://docs.cipp.app/api-documentation/setup-and-authentication';
+    genericAuth = true;
     properties = [
         {
             displayName: 'CIPP Instance URL',
@@ -44,6 +94,15 @@ class CippApi {
             description: 'The Client Secret from your CIPP-SAM Azure AD App Registration',
         },
     ];
+    async authenticate(credentials, requestOptions) {
+        const accessToken = await getAccessToken(credentials);
+        requestOptions.headers = {
+            ...(requestOptions.headers ?? {}),
+            Authorization: `Bearer ${accessToken}`,
+            Accept: 'application/json',
+        };
+        return requestOptions;
+    }
 }
 exports.CippApi = CippApi;
 //# sourceMappingURL=CippApi.credentials.js.map

package/dist/credentials/CippApi.credentials.js.map

@@ -1 +1 @@
-{"version":3,"file":"CippApi.credentials.js","sourceRoot":"","sources":["../../credentials/CippApi.credentials.ts"],"names":[],"mappings":";;;AAEA,MAAa,OAAO;IACnB,IAAI,GAAG,SAAS,CAAC;IACjB,WAAW,GAAG,cAAc,CAAC;IAC7B,IAAI,GAAS,eAAe,CAAC;IAC7B,gBAAgB,GAAG,kEAAkE,CAAC;IAEtF,UAAU,GAAsB;QAC/B;YACC,WAAW,EAAE,mBAAmB;YAChC,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,6BAA6B;YAC1C,WAAW,EAAE,gDAAgD;SAC7D;QACD;YACC,WAAW,EAAE,oBAAoB;YACjC,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,sCAAsC;YACnD,WAAW,EAAE,qEAAqE;SAClF;QACD;YACC,WAAW,EAAE,yBAAyB;YACtC,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,sCAAsC;YACnD,WAAW,EAAE,0EAA0E;SACvF;QACD;YACC,WAAW,EAAE,eAAe;YAC5B,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;YAC/B,OAAO,EAAE,EAAE;YACX,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,gEAAgE;SAC7E;KACD,CAAC;CAIF;AA/CD,0BA+CC"}
+{"version":3,"file":"CippApi.credentials.js","sourceRoot":"","sources":["../../credentials/CippApi.credentials.ts"],"names":[],"mappings":"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"}

package/dist/nodes/Cipp/Cipp.node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Cipp.node.d.ts","sourceRoot":"","sources":["../../../nodes/Cipp/Cipp.node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,qBAAqB,EACrB,wBAAwB,EAExB,iBAAiB,EAEjB,qBAAqB,EACrB,yBAAyB,EACzB,kBAAkB,EAClB,qBAAqB,EACrB,SAAS,EACT,oBAAoB,EACpB,MAAM,cAAc,CAAC;AAWtB,qBAAa,IAAK,YAAW,SAAS;IACrC,WAAW,EAAE,oBAAoB,CAyK/B;IAEF,OAAO;;wCAGE,wBAAwB,cAClB,qBAAqB,GAC/B,OAAO,CAAC,yBAAyB,CAAC;;;+BAyD9B,qBAAqB,WAClB,MAAM,GACb,OAAO,CAAC,qBAAqB,CAAC;;MAqBjC;IAEI,OAAO,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;CA6uHvE"}
+{"version":3,"file":"Cipp.node.d.ts","sourceRoot":"","sources":["../../../nodes/Cipp/Cipp.node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,qBAAqB,EACrB,wBAAwB,EAExB,iBAAiB,EAEjB,qBAAqB,EACrB,yBAAyB,EACzB,kBAAkB,EAClB,qBAAqB,EACrB,SAAS,EACT,oBAAoB,EACpB,MAAM,cAAc,CAAC;AAWtB,qBAAa,IAAK,YAAW,SAAS;IACrC,WAAW,EAAE,oBAAoB,CAyK/B;IAEF,OAAO;;wCAGE,wBAAwB,cAClB,qBAAqB,GAC/B,OAAO,CAAC,yBAAyB,CAAC;;;+BAyD9B,qBAAqB,WAClB,MAAM,GACb,OAAO,CAAC,qBAAqB,CAAC;;MAqBjC;IAEI,OAAO,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;CA6wHvE"}

package/dist/nodes/Cipp/Cipp.node.js

@@ -537,15 +537,29 @@ class Cipp {
                         const users = this.getNodeParameter('usersToOffboard', i);
                         const scheduled = this.getNodeParameter('scheduledOffboard', i);
                         const offboardOptions = this.getNodeParameter('offboardOptions', i, {});
+                        const parsedUsers = parseJsonPayload(users, 'Users to Offboard', i);
+                        const userValues = (Array.isArray(parsedUsers) ? parsedUsers : [parsedUsers])
+                            .map((user) => {
+                            if (typeof user === 'string')
+                                return user;
+                            return (user.value ??
+                                user.userPrincipalName ??
+                                user.UserPrincipalName ??
+                                user.mail ??
+                                user.id);
+                        })
+                            .filter((user) => Boolean(user));
+                        if (userValues.length === 0) {
+                            throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'Users to Offboard must contain at least one user identifier.', { itemIndex: i });
+                        }
                         const offboardBody = {
                             tenantFilter,
-                            user: JSON.parse(users),
+                            user: { value: userValues },
                         };
-                        // Only include Scheduled when enabled — omitting it triggers immediate execution
                         if (scheduled) {
-                            offboardBody.Scheduled = { enabled: true };
+                            const scheduledDate = this.getNodeParameter('scheduledOffboardDate', i);
+                            offboardBody.Scheduled = { enabled: true, date: scheduledDate };
                         }
-                        // Spread offboard options at the top level (CIPP expects them here, not on the user object)
                         for (const [key, value] of Object.entries(offboardOptions)) {
                             if (value !== undefined && value !== '' && value !== false) {
                                 offboardBody[key] = value;
@@ -691,17 +705,16 @@ class Cipp {
                     }
                     else if (operation === 'bulkLicense') {
                         const licenseJson = this.getNodeParameter('licenseJson', i);
-                        let parsedLicense;
-                        try {
-                            parsedLicense = JSON.parse(typeof licenseJson === 'string' ? licenseJson : '{}');
-                        }
-                        catch (e) {
-                            throw new n8n_workflow_1.NodeOperationError(this.getNode(), 'License JSON must be valid JSON', { itemIndex: i });
-                        }
-                        responseData = await GenericFunctions_1.cippApiRequest.call(this, 'POST', '/api/ExecBulkLicense', {
-                            ...parsedLicense,
+                        const parsedLicense = parseJsonPayload(licenseJson, 'License JSON', i);
+                        const licenseRequests = (Array.isArray(parsedLicense)
+                            ? parsedLicense
+                            : Array.isArray(parsedLicense.requests)
+                                ? parsedLicense.requests
+                                : [parsedLicense]).map((request) => ({
                             tenantFilter,
-                        }, {});
+                            ...request,
+                        }));
+                        responseData = await GenericFunctions_1.cippApiRequest.call(this, 'POST', '/api/ExecBulkLicense', licenseRequests, {});
                     }
                 }
                 // ==================== GROUP ====================
@@ -1188,7 +1201,7 @@ class Cipp {
                         const autoReplyState = this.getNodeParameter('autoReplyState', i);
                         const body = {
                             tenantFilter,
-                            user: userId,
+                            userId,
                             AutoReplyState: autoReplyState,
                         };
                         if (autoReplyState === 'Enabled') {
@@ -1198,14 +1211,22 @@ class Cipp {
                     }
                     else if (operation === 'setForwarding') {
                         const userId = this.getNodeParameter('userId', i);
+                        const forwardingType = this.getNodeParameter('forwardingType', i);
                         const forwardTo = this.getNodeParameter('forwardTo', i);
                         const keepCopy = this.getNodeParameter('keepCopy', i);
-                        responseData = await GenericFunctions_1.cippApiRequest.call(this, 'POST', '/api/ExecEmailForward', {
+                        const body = {
                             tenantFilter,
-                            user: userId,
-                            ForwardTo: forwardTo,
-                            KeepCopy: keepCopy,
-                        }, {});
+                            userID: userId,
+                            forwardOption: forwardTo ? forwardingType : 'disabled',
+                            KeepCopy: String(keepCopy),
+                        };
+                        if (forwardTo && forwardingType === 'internalAddress') {
+                            body.ForwardInternal = forwardTo;
+                        }
+                        else if (forwardTo) {
+                            body.ForwardExternal = forwardTo;
+                        }
+                        responseData = await GenericFunctions_1.cippApiRequest.call(this, 'POST', '/api/ExecEmailForward', body, {});
                         // ---------- Edit Mailbox Permissions ----------
                     }
                     else if (operation === 'editMailboxPermissions') {