addigy 2.10.4 → 2.11.0

package/index.d.ts

@@ -29,3 +29,10 @@ export { Software } from './lib/software/software';
 export * from './lib/software/software.types';
 export { Users } from './lib/users/users';
 export * from './lib/users/user.types';
+export { AddigyV2 } from './lib/v2/addigy-v2';
+export { CertsV2 } from './lib/v2/certs-v2';
+export { DevicesV2 } from './lib/v2/devices-v2';
+export { PaginationV2 } from './lib/v2/pagination-v2';
+export { PoliciesV2 } from './lib/v2/policies-v2';
+export { UsersV2 } from './lib/v2/users-v2';
+export * from './lib/v2/v2.types';

package/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Users = exports.Software = exports.ScreenConnect = exports.Profiles = exports.Policies = exports.MdmProfiles = exports.MdmPolicies = exports.MdmConfigurations = exports.Maintenance = exports.Integrations = exports.Files = exports.Facts = exports.Devices = exports.Certs = exports.Billing = exports.Applications = exports.Auth = exports.Alerts = exports.Addigy = void 0;
+exports.UsersV2 = exports.PoliciesV2 = exports.PaginationV2 = exports.DevicesV2 = exports.CertsV2 = exports.AddigyV2 = exports.Users = exports.Software = exports.ScreenConnect = exports.Profiles = exports.Policies = exports.MdmProfiles = exports.MdmPolicies = exports.MdmConfigurations = exports.Maintenance = exports.Integrations = exports.Files = exports.Facts = exports.Devices = exports.Certs = exports.Billing = exports.Applications = exports.Auth = exports.Alerts = exports.Addigy = void 0;
 __exportStar(require("./lib/types"), exports);
 var addigy_1 = require("./lib/addigy");
 Object.defineProperty(exports, "Addigy", { enumerable: true, get: function () { return addigy_1.Addigy; } });
@@ -65,3 +65,16 @@ __exportStar(require("./lib/software/software.types"), exports);
 var users_1 = require("./lib/users/users");
 Object.defineProperty(exports, "Users", { enumerable: true, get: function () { return users_1.Users; } });
 __exportStar(require("./lib/users/user.types"), exports);
+var addigy_v2_1 = require("./lib/v2/addigy-v2");
+Object.defineProperty(exports, "AddigyV2", { enumerable: true, get: function () { return addigy_v2_1.AddigyV2; } });
+var certs_v2_1 = require("./lib/v2/certs-v2");
+Object.defineProperty(exports, "CertsV2", { enumerable: true, get: function () { return certs_v2_1.CertsV2; } });
+var devices_v2_1 = require("./lib/v2/devices-v2");
+Object.defineProperty(exports, "DevicesV2", { enumerable: true, get: function () { return devices_v2_1.DevicesV2; } });
+var pagination_v2_1 = require("./lib/v2/pagination-v2");
+Object.defineProperty(exports, "PaginationV2", { enumerable: true, get: function () { return pagination_v2_1.PaginationV2; } });
+var policies_v2_1 = require("./lib/v2/policies-v2");
+Object.defineProperty(exports, "PoliciesV2", { enumerable: true, get: function () { return policies_v2_1.PoliciesV2; } });
+var users_v2_1 = require("./lib/v2/users-v2");
+Object.defineProperty(exports, "UsersV2", { enumerable: true, get: function () { return users_v2_1.UsersV2; } });
+__exportStar(require("./lib/v2/v2.types"), exports);

package/lib/addigy.utils.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 export declare function getAxiosHttpAgents(): {
     httpAgent: import("http").Agent;
     httpsAgent: import("https").Agent;

package/lib/addigy.utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAxiosHttpAgents = void 0;
+exports.getAxiosHttpAgents = getAxiosHttpAgents;
 const http_1 = require("http-cookie-agent/http");
 const tough_cookie_1 = require("tough-cookie");
 function getAxiosHttpAgents() {
@@ -9,4 +9,3 @@ function getAxiosHttpAgents() {
         httpsAgent: new http_1.HttpsCookieAgent({ cookies: { jar: new tough_cookie_1.CookieJar() } }),
     };
 }
-exports.getAxiosHttpAgents = getAxiosHttpAgents;

package/lib/users/users.d.ts

@@ -1,9 +1,9 @@
 import { IAddigyInternalAuthObject } from '../auth/auth.types';
-import { UserRoles } from './user.types';
+import { User, UserRoles } from './user.types';
 export declare class Users {
     private readonly http;
     createUser(authObject: IAddigyInternalAuthObject, email: string, name: string, policies: string[] | undefined, role: UserRoles | string, phone?: string): Promise<object[]>;
     updateUser(authObject: IAddigyInternalAuthObject, email: string, name: string, policies: string[] | undefined, role: string, phone?: string): Promise<object[]>;
     deleteUser(authObject: IAddigyInternalAuthObject, email: string): Promise<object[]>;
-    getUsers(authObject: IAddigyInternalAuthObject): Promise<object[]>;
+    getUsers(authObject: IAddigyInternalAuthObject): Promise<User[]>;
 }

package/lib/users/users.js

@@ -87,6 +87,7 @@ class Users {
         }
     }
     async getUsers(authObject) {
+        var _a, _b;
         try {
             let res = await this.http.get('https://app-prod.addigy.com/api/account', {
                 headers: {
@@ -94,7 +95,7 @@ class Users {
                 },
                 method: 'GET',
             });
-            return res.data.users;
+            return (_b = (_a = res === null || res === void 0 ? void 0 : res.data) === null || _a === void 0 ? void 0 : _a.users) !== null && _b !== void 0 ? _b : [];
         }
         catch (err) {
             throw err;

package/lib/v2/addigy-v2.d.ts

@@ -0,0 +1,14 @@
+import { CertsV2 } from './certs-v2';
+import { DevicesV2 } from './devices-v2';
+import { PoliciesV2 } from './policies-v2';
+import { IAddigyV2Config } from './v2.types';
+import { UsersV2 } from './users-v2';
+export declare class AddigyV2 {
+    private readonly config;
+    certs: CertsV2;
+    devices: DevicesV2;
+    policies: PoliciesV2;
+    users: UsersV2;
+    private readonly http;
+    constructor(config: IAddigyV2Config);
+}

package/lib/v2/addigy-v2.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AddigyV2 = void 0;
+const axios_1 = __importDefault(require("axios"));
+const addigy_utils_1 = require("../addigy.utils");
+const certs_v2_1 = require("./certs-v2");
+const devices_v2_1 = require("./devices-v2");
+const policies_v2_1 = require("./policies-v2");
+const users_v2_1 = require("./users-v2");
+class AddigyV2 {
+    constructor(config) {
+        this.config = config;
+        this.http = axios_1.default.create({
+            baseURL: 'https://api.addigy.com/api/v2',
+            ...(0, addigy_utils_1.getAxiosHttpAgents)(),
+            headers: {
+                'content-type': 'application/json',
+                accept: 'application/json',
+                'x-api-key': this.config.apiKey,
+            },
+        });
+        this.certs = new certs_v2_1.CertsV2(this.http);
+        this.devices = new devices_v2_1.DevicesV2(this.http);
+        this.policies = new policies_v2_1.PoliciesV2(this.http);
+        this.users = new users_v2_1.UsersV2(this.http);
+    }
+}
+exports.AddigyV2 = AddigyV2;

package/lib/v2/certs-v2.d.ts

@@ -0,0 +1,7 @@
+import { AxiosInstance } from 'axios';
+import { V2ListOptions } from './v2.types';
+export declare class CertsV2 {
+    private readonly http;
+    constructor(http: AxiosInstance);
+    list(options?: V2ListOptions): Promise<object[]>;
+}

package/lib/v2/certs-v2.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CertsV2 = void 0;
+const pagination_v2_1 = require("./pagination-v2");
+class CertsV2 {
+    constructor(http) {
+        this.http = http;
+    }
+    async list(options) {
+        const baseRequest = {};
+        return pagination_v2_1.PaginationV2.fetchItems(async ({ page, per_page }) => {
+            const requestBody = pagination_v2_1.PaginationV2.buildRequestBody(baseRequest, {
+                ...options,
+                page,
+                perPage: per_page,
+            });
+            const response = await this.http.post('/mdm/certificates/query', requestBody);
+            return response.data;
+        }, options);
+    }
+}
+exports.CertsV2 = CertsV2;

package/lib/v2/devices-v2.d.ts

@@ -0,0 +1,7 @@
+import { AxiosInstance } from 'axios';
+import { V2ListOptions } from './v2.types';
+export declare class DevicesV2 {
+    private readonly http;
+    constructor(http: AxiosInstance);
+    list(options?: V2ListOptions): Promise<object[]>;
+}

package/lib/v2/devices-v2.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DevicesV2 = void 0;
+const pagination_v2_1 = require("./pagination-v2");
+class DevicesV2 {
+    constructor(http) {
+        this.http = http;
+    }
+    async list(options) {
+        const baseRequest = {};
+        return pagination_v2_1.PaginationV2.fetchItems(async ({ page, per_page }) => {
+            const requestBody = pagination_v2_1.PaginationV2.buildRequestBody(baseRequest, {
+                ...options,
+                page,
+                perPage: per_page,
+            });
+            const response = await this.http.post('/devices', requestBody);
+            return response.data;
+        }, options);
+    }
+}
+exports.DevicesV2 = DevicesV2;

package/lib/v2/pagination-v2.d.ts

@@ -0,0 +1,6 @@
+import { V2ListOptions, V2ListRequestBody, V2PaginatedResponse, V2PaginationRequest } from './v2.types';
+export declare class PaginationV2 {
+    private static readonly DEFAULT_PER_PAGE;
+    static buildRequestBody(baseRequest: V2ListRequestBody, options?: V2ListOptions): V2ListRequestBody;
+    static fetchItems<T>(getPage: (request: V2PaginationRequest) => Promise<V2PaginatedResponse<T>>, options?: V2ListOptions): Promise<T[]>;
+}

package/lib/v2/pagination-v2.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PaginationV2 = void 0;
+class PaginationV2 {
+    static buildRequestBody(baseRequest, options) {
+        var _a, _b;
+        const requestBody = {
+            ...baseRequest,
+            page: (_a = options === null || options === void 0 ? void 0 : options.page) !== null && _a !== void 0 ? _a : 1,
+            per_page: (_b = options === null || options === void 0 ? void 0 : options.perPage) !== null && _b !== void 0 ? _b : PaginationV2.DEFAULT_PER_PAGE,
+        };
+        if (options === null || options === void 0 ? void 0 : options.sortField) {
+            requestBody.sort_field = options.sortField;
+        }
+        if (options === null || options === void 0 ? void 0 : options.sortDirection) {
+            requestBody.sort_direction = options.sortDirection;
+        }
+        return requestBody;
+    }
+    static async fetchItems(getPage, options) {
+        var _a, _b, _c, _d, _e, _f;
+        const shouldPaginate = (_a = options === null || options === void 0 ? void 0 : options.paginate) !== null && _a !== void 0 ? _a : true;
+        const perPage = (_b = options === null || options === void 0 ? void 0 : options.perPage) !== null && _b !== void 0 ? _b : PaginationV2.DEFAULT_PER_PAGE;
+        let page = (_c = options === null || options === void 0 ? void 0 : options.page) !== null && _c !== void 0 ? _c : 1;
+        const allItems = [];
+        for (;;) {
+            const response = await getPage({ page, per_page: perPage });
+            const items = (_d = response === null || response === void 0 ? void 0 : response.items) !== null && _d !== void 0 ? _d : [];
+            const metadata = response === null || response === void 0 ? void 0 : response.metadata;
+            allItems.push(...items);
+            if (!shouldPaginate)
+                break;
+            if (typeof (metadata === null || metadata === void 0 ? void 0 : metadata.page_count) === 'number' && page >= metadata.page_count)
+                break;
+            const effectivePerPage = (_e = metadata === null || metadata === void 0 ? void 0 : metadata.per_page) !== null && _e !== void 0 ? _e : perPage;
+            if (items.length === 0 || items.length < effectivePerPage)
+                break;
+            const currentPage = (_f = metadata === null || metadata === void 0 ? void 0 : metadata.page) !== null && _f !== void 0 ? _f : page;
+            const nextPage = currentPage + 1;
+            if (nextPage <= page)
+                break;
+            page = nextPage;
+        }
+        return allItems;
+    }
+}
+exports.PaginationV2 = PaginationV2;
+PaginationV2.DEFAULT_PER_PAGE = 100;

package/lib/v2/policies-v2.d.ts

@@ -0,0 +1,8 @@
+import { AxiosInstance } from 'axios';
+import { V2ListOptions } from './v2.types';
+export declare class PoliciesV2 {
+    private readonly http;
+    constructor(http: AxiosInstance);
+    list(options?: V2ListOptions): Promise<object[]>;
+    create(name: string): Promise<object>;
+}

package/lib/v2/policies-v2.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PoliciesV2 = void 0;
+const pagination_v2_1 = require("./pagination-v2");
+class PoliciesV2 {
+    constructor(http) {
+        this.http = http;
+    }
+    async list(options) {
+        const baseRequest = {};
+        return pagination_v2_1.PaginationV2.fetchItems(async ({ page, per_page }) => {
+            const requestBody = pagination_v2_1.PaginationV2.buildRequestBody(baseRequest, {
+                ...options,
+                page,
+                perPage: per_page,
+            });
+            const response = await this.http.post('/oa/policies/query', requestBody);
+            return response.data;
+        }, options);
+    }
+    async create(name) {
+        const response = await this.http.post('/policies', { name });
+        return response.data;
+    }
+}
+exports.PoliciesV2 = PoliciesV2;

package/lib/v2/users-v2.d.ts

@@ -0,0 +1,10 @@
+import { AxiosInstance } from 'axios';
+import { V2ListOptions } from './v2.types';
+export declare class UsersV2 {
+    private readonly http;
+    constructor(http: AxiosInstance);
+    get(organizationId: string, options?: V2ListOptions): Promise<object[]>;
+    list(organizationId: string, options?: V2ListOptions): Promise<object[]>;
+    update(email: string, name: string, policies: string[], role: string, phone?: string): Promise<object>;
+    remove(email: string): Promise<object>;
+}

package/lib/v2/users-v2.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UsersV2 = void 0;
+const pagination_v2_1 = require("./pagination-v2");
+class UsersV2 {
+    constructor(http) {
+        this.http = http;
+    }
+    async get(organizationId, options) {
+        return this.list(organizationId, options);
+    }
+    async list(organizationId, options) {
+        const baseRequest = {};
+        return pagination_v2_1.PaginationV2.fetchItems(async ({ page, per_page }) => {
+            const requestBody = pagination_v2_1.PaginationV2.buildRequestBody(baseRequest, {
+                ...options,
+                page,
+                perPage: per_page,
+            });
+            const response = await this.http.post(`/o/${encodeURIComponent(organizationId)}/users/query`, requestBody);
+            return response.data;
+        }, options);
+    }
+    async update(email, name, policies, role, phone) {
+        const requestBody = {
+            email,
+            name,
+            role,
+            policies,
+        };
+        if (typeof phone === 'string') {
+            requestBody.phone = phone;
+        }
+        const response = await this.http.put('/users', requestBody);
+        return response.data;
+    }
+    async remove(email) {
+        const response = await this.http.delete('/users', {
+            params: {
+                email,
+            },
+        });
+        return response.data;
+    }
+}
+exports.UsersV2 = UsersV2;

package/lib/v2/v2.types.d.ts

@@ -0,0 +1,31 @@
+export interface IAddigyV2Config {
+    apiKey: string;
+}
+export type V2SortDirection = 'asc' | 'desc';
+export interface V2ListOptions {
+    page?: number;
+    perPage?: number;
+    sortField?: string;
+    sortDirection?: V2SortDirection;
+    paginate?: boolean;
+}
+export interface V2PaginatedMetadata {
+    page?: number;
+    per_page?: number;
+    page_count?: number;
+    total?: number;
+}
+export interface V2PaginatedResponse<T> {
+    items?: T[];
+    metadata?: V2PaginatedMetadata;
+}
+export type V2ListRequestBody = Record<string, unknown> & {
+    page?: number;
+    per_page?: number;
+    sort_field?: string;
+    sort_direction?: V2SortDirection;
+};
+export interface V2PaginationRequest {
+    page: number;
+    per_page: number;
+}

package/lib/v2/v2.types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -6,31 +6,30 @@
     }
   },
   "dependencies": {
-    "@expo/plist": "0.1.3",
-    "axios": "1.7.2",
-    "http-cookie-agent": "6.0.5",
-    "tough-cookie": "4.1.4",
-    "uuid": "9.0.1"
+    "@expo/plist": "0.5.2",
+    "axios": "1.13.6",
+    "http-cookie-agent": "7.0.3",
+    "tough-cookie": "6.0.0",
+    "uuid": "11.1.0"
   },
   "description": "",
   "devDependencies": {
     "@pliancy/eslint-config-ts": "1.1.1",
     "@pliancy/semantic-release-config-npm": "2.2.0",
-    "@types/jest": "29.5.12",
-    "@types/node": "20.12.12",
+    "@types/jest": "30.0.0",
+    "@types/node": "22.13.9",
     "@types/tough-cookie": "4.0.5",
-    "@types/uuid": "9.0.8",
-    "commitizen": "4.3.0",
-    "concurrently": "8.2.2",
-    "cpy-cli": "5.0.0",
+    "commitizen": "4.3.1",
+    "concurrently": "9.2.1",
+    "cpy-cli": "7.0.0",
     "cz-conventional-changelog": "3.3.0",
-    "husky": "9.0.11",
-    "jest": "29.7.0",
-    "open": "10.1.0",
+    "husky": "9.1.7",
+    "jest": "30.2.0",
+    "open": "11.0.0",
     "pinst": "3.0.0",
-    "rimraf": "5.0.7",
-    "ts-jest": "29.1.4",
-    "typescript": "5.4.5"
+    "rimraf": "6.1.3",
+    "ts-jest": "29.4.6",
+    "typescript": "5.9.3"
   },
   "keywords": [
     "addigy",
@@ -46,10 +45,10 @@
     "url": "https://github.com/pliancy/addigy-node"
   },
   "scripts": {
-    "build": "concurrently 'yarn clean' 'yarn test' 'yarn tsc' 'yarn copy'",
+    "build": "yarn clean && yarn test && yarn tsc && yarn copy",
     "build:check": "tsc --noEmit",
     "clean": "rimraf coverage dist tmp",
-    "copy": "pinst --disable && cpy package.json dist && cpy README.md dist && pinst --enable",
+    "copy": "pinst --disable && mkdir -p dist && cpy package.json dist/ && cpy README.md dist/ && pinst --enable",
     "lint": "eslint \"src/**/*.ts\" --fix",
     "_postinstall": "husky install",
     "qa": "concurrently 'yarn lint' 'yarn test' ' yarn clean' 'yarn build:check'",
@@ -58,9 +57,9 @@
     "tsc": "tsc -p tsconfig.build.json"
   },
   "types": "index.d.ts",
-  "version": "2.10.4",
+  "version": "2.11.0",
   "volta": {
-    "node": "20.12.1",
+    "node": "22.14.0",
     "yarn": "1.22.22"
   }
 }