@meru2802/aux-server 1.0.19 → 1.0.21

package/dist/controllers/apiController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiController.d.ts","sourceRoot":"","sources":["../../src/controllers/apiController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAOjE,qBAAa,aAAc,SAAQ,cAAc;gBACnC,gBAAgB,CAAC,EAAE,iBAAiB;IAIzC,YAAY,GAAU,KAAK,OAAO,EAAE,KAAK,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CAwGtE;IAEK,cAAc,GACnB,KAAK,OAAO,EACZ,KAAK,QAAQ,KACZ,OAAO,CAAC,IAAI,CAAC,CA2Rd;CACH"}
+{"version":3,"file":"apiController.d.ts","sourceRoot":"","sources":["../../src/controllers/apiController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAOjE,qBAAa,aAAc,SAAQ,cAAc;gBACnC,gBAAgB,CAAC,EAAE,iBAAiB;IAIzC,YAAY,GAAU,KAAK,OAAO,EAAE,KAAK,QAAQ,KAAG,OAAO,CAAC,IAAI,CAAC,CA0GtE;IAEK,cAAc,GACnB,KAAK,OAAO,EACZ,KAAK,QAAQ,KACZ,OAAO,CAAC,IAAI,CAAC,CAkUd;CACH"}

package/dist/controllers/apiController.js

@@ -44,6 +44,7 @@ class ApiController extends BaseController_1.BaseController {
                     userEpmId,
                     expiration: expiration.toISOString(),
                 });
+                const agent = (0, utils_1.getNoProxyHttpAgent)();
                 const epmResponse = await axios_1.default.post(epmUrl, {
                     name: keyName,
                     expiration: expiration.toISOString(),
@@ -54,7 +55,7 @@ class ApiController extends BaseController_1.BaseController {
                         "Content-Type": "application/json",
                         "X-API-KEY": this.config.epmConfig.masterApiKey,
                     },
-                    httpsAgent: this.httpsAgent,
+                    httpsAgent: agent,
                     validateStatus: () => true,
                 });
                 console.log("EPM API Response:", {
@@ -100,14 +101,44 @@ class ApiController extends BaseController_1.BaseController {
             }
         };
         this.getConnectUrls = async (req, res) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             try {
-                const meshNodeId = req.body.meshNodeId;
                 const userId = req.body.userId;
+                let meshNodeId = req.body.meshNodeId;
+                const agentId = req.body.agentId;
                 const isApplet = req.body.isApplet;
-                if (!meshNodeId || !userId) {
+                if (!meshNodeId && !agentId) {
                     const errorResponse = {
-                        error: "'meshNodeId' or 'userId' are missing in body params",
+                        error: "Either 'meshNodeId' or 'agentId' must be present in body",
+                        timestamp: new Date().toISOString(),
+                    };
+                    res.status(400).json(errorResponse);
+                    return;
+                }
+                if (!userId) {
+                    const errorResponse = {
+                        error: "'userId' is missing in body params",
+                        timestamp: new Date().toISOString(),
+                    };
+                    res.status(400).json(errorResponse);
+                    return;
+                }
+                if (!meshNodeId && agentId) {
+                    const nexus_epm_mesh_node_id_query = "SELECT mesh_node_id FROM agents_agent where agent_id = $1";
+                    const nexus_epm_mesh_node_id = await this.dbPool.query(nexus_epm_mesh_node_id_query, [agentId]);
+                    if (nexus_epm_mesh_node_id.rows.length === 0) {
+                        const errorResponse = {
+                            error: `Mesh Node Id corresponding to Agent ID: '${agentId}' Not Found`,
+                            timestamp: new Date().toISOString(),
+                        };
+                        res.status(400).json(errorResponse);
+                        return;
+                    }
+                    meshNodeId = (_a = nexus_epm_mesh_node_id.rows[0]) === null || _a === void 0 ? void 0 : _a.mesh_node_id;
+                }
+                if (!meshNodeId) {
+                    const errorResponse = {
+                        error: `'meshNodeId' for agent id: ${agentId} not found. This endpoint needs reinstallation`,
                         timestamp: new Date().toISOString(),
                     };
                     res.status(400).json(errorResponse);
@@ -126,7 +157,7 @@ class ApiController extends BaseController_1.BaseController {
                 if (!isApplet) {
                     const nexus_epm_agent_id_query = "SELECT agent_id, site_id FROM agents_agent where mesh_node_id= $1";
                     const nexus_epm_agent_id = await this.dbPool.query(nexus_epm_agent_id_query, [meshNodeId]);
-                    if (!((_a = nexus_epm_user_id.rows[0]) === null || _a === void 0 ? void 0 : _a.role_id)) {
+                    if (!((_b = nexus_epm_user_id.rows[0]) === null || _b === void 0 ? void 0 : _b.role_id)) {
                         const errorResponse = {
                             error: `'Role id corresponding to  user ${userId}' Not Found`,
                             timestamp: new Date().toISOString(),
@@ -144,11 +175,11 @@ class ApiController extends BaseController_1.BaseController {
                     }
                     const nexus_epm_agent_client_id_query = "SELECT client_id FROM clients_site WHERE id= $1";
                     const nexus_epm_agent_client_id = await this.dbPool.query(nexus_epm_agent_client_id_query, [
-                        (_b = nexus_epm_agent_id.rows[0]) === null || _b === void 0 ? void 0 : _b.site_id,
+                        (_c = nexus_epm_agent_id.rows[0]) === null || _c === void 0 ? void 0 : _c.site_id,
                     ]);
                     if (nexus_epm_agent_client_id.rows.length === 0) {
                         const errorResponse = {
-                            error: `'Client ID corresponding to site id ${(_c = nexus_epm_agent_id.rows[0]) === null || _c === void 0 ? void 0 : _c.site_id}' Not Found`,
+                            error: `'Client ID corresponding to site id ${(_d = nexus_epm_agent_id.rows[0]) === null || _d === void 0 ? void 0 : _d.site_id}' Not Found`,
                             timestamp: new Date().toISOString(),
                         };
                         res.status(400).json(errorResponse);
@@ -158,10 +189,10 @@ class ApiController extends BaseController_1.BaseController {
                     const nexus_epm_role_site_ids_query = "SELECT site_id FROM accounts_role_can_view_sites WHERE role_id= $1";
                     const [nexus_epm_role_client_ids, nexus_epm_role_site_ids] = await Promise.all([
                         this.dbPool.query(nexus_epm_role_client_ids_query, [
-                            (_d = nexus_epm_user_id.rows[0]) === null || _d === void 0 ? void 0 : _d.role_id,
+                            (_e = nexus_epm_user_id.rows[0]) === null || _e === void 0 ? void 0 : _e.role_id,
                         ]),
                         this.dbPool.query(nexus_epm_role_site_ids_query, [
-                            (_e = nexus_epm_user_id.rows[0]) === null || _e === void 0 ? void 0 : _e.role_id,
+                            (_f = nexus_epm_user_id.rows[0]) === null || _f === void 0 ? void 0 : _f.role_id,
                         ]),
                     ]);
                     const roleHasPermissionForAgentClient = () => {
@@ -194,20 +225,20 @@ class ApiController extends BaseController_1.BaseController {
                         return;
                     }
                 }
-                const meshUser = `user//${userId}___${(_f = nexus_epm_user_id.rows[0]) === null || _f === void 0 ? void 0 : _f.id}`.toLowerCase();
-                const meshUserWithoutDomain = `${userId}___${(_g = nexus_epm_user_id.rows[0]) === null || _g === void 0 ? void 0 : _g.id}`.toLowerCase();
+                const meshUser = `user//${userId}___${(_g = nexus_epm_user_id.rows[0]) === null || _g === void 0 ? void 0 : _g.id}`.toLowerCase();
+                const meshUserWithoutDomain = `${userId}___${(_h = nexus_epm_user_id.rows[0]) === null || _h === void 0 ? void 0 : _h.id}`.toLowerCase();
                 const meshUsers = [
                     {
                         meshId: meshUser,
                         meshUserName: meshUserWithoutDomain,
-                        fullName: `${(_h = nexus_epm_user_id.rows[0]) === null || _h === void 0 ? void 0 : _h.first_name} ${(_j = nexus_epm_user_id.rows[0]) === null || _j === void 0 ? void 0 : _j.last_name}`,
-                        email: ((_k = nexus_epm_user_id.rows[0]) === null || _k === void 0 ? void 0 : _k.email) || "",
+                        fullName: `${(_j = nexus_epm_user_id.rows[0]) === null || _j === void 0 ? void 0 : _j.first_name} ${(_k = nexus_epm_user_id.rows[0]) === null || _k === void 0 ? void 0 : _k.last_name}`,
+                        email: ((_l = nexus_epm_user_id.rows[0]) === null || _l === void 0 ? void 0 : _l.email) || "",
                     },
                 ];
                 const { createdUsers, existingUsers, failedToCreate } = await this.createMeshUsers(meshUsers);
                 if (failedToCreate.length == 1) {
                     const errorResponse = {
-                        error: `User with id ${(_l = nexus_epm_user_id.rows[0]) === null || _l === void 0 ? void 0 : _l.id} Could not be created in Nexus Mesh!`,
+                        error: `User with id ${(_m = nexus_epm_user_id.rows[0]) === null || _m === void 0 ? void 0 : _m.id} Could not be created in Nexus Mesh!`,
                         timestamp: new Date().toISOString(),
                     };
                     res.status(500).json(errorResponse);

package/dist/controllers/healthController.js

@@ -18,7 +18,7 @@ class HealthController extends BaseController_1.BaseController {
         this.status = (req, res) => {
             const response = {
                 service: "aux-server",
-                version: "1.0.19",
+                version: "1.0.21",
                 meshCentral: {
                     connected: this.isWebSocketConnected,
                     server: this.meshServer,

package/dist/types/schemas/index.d.ts

@@ -14,7 +14,8 @@ export declare const addUserToGroupSchema: z.ZodObject<{
     users: z.ZodArray<z.ZodString>;
 }, z.core.$strip>;
 export declare const generateConnectUrlsSchema: z.ZodObject<{
-    meshNodeId: z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>;
+    meshNodeId: z.ZodOptional<z.ZodPipe<z.ZodString, z.ZodTransform<string, string>>>;
+    agentId: z.ZodOptional<z.ZodString>;
     userId: z.ZodString;
     isApplet: z.ZodPipe<z.ZodOptional<z.ZodBoolean>, z.ZodTransform<boolean | undefined, boolean | undefined>>;
 }, z.core.$strip>;

package/dist/types/schemas/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/schemas/index.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AACpB,OAAO,EACL,UAAU,EACV,gBAAgB,EAGjB,MAAM,IAAI,CAAC;AAEZ,eAAO,MAAM,0BAA0B;;;iBAkEpC,CAAC;AAEJ,eAAO,MAAM,uBAAuB;;;iBA+BlC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;iBAkH9B,CAAC;AAEJ,eAAO,MAAM,yBAAyB;;;;iBAmEpC,CAAC;AAEH,eAAO,MAAM,8BAA8B;;;;;;;kBA8BvC,CAAC;AAEL,MAAM,MAAM,2BAA2B,GAAG,CAAC,CAAC,KAAK,CAC/C,OAAO,0BAA0B,CAClC,CAAC;AACF,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAC/E,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACzE,MAAM,MAAM,0BAA0B,GAAG,CAAC,CAAC,KAAK,CAC9C,OAAO,yBAAyB,CACjC,CAAC;AACF,MAAM,MAAM,+BAA+B,GAAG,CAAC,CAAC,KAAK,CACnD,OAAO,8BAA8B,CACtC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/schemas/index.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,KAAK,CAAC;AACpB,OAAO,EACL,UAAU,EACV,gBAAgB,EAGjB,MAAM,IAAI,CAAC;AAEZ,eAAO,MAAM,0BAA0B;;;iBAkEpC,CAAC;AAEJ,eAAO,MAAM,uBAAuB;;;iBA+BlC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;iBAkH9B,CAAC;AAEJ,eAAO,MAAM,yBAAyB;;;;;iBAgFnC,CAAC;AAEJ,eAAO,MAAM,8BAA8B;;;;;;;kBA8BvC,CAAC;AAEL,MAAM,MAAM,2BAA2B,GAAG,CAAC,CAAC,KAAK,CAC/C,OAAO,0BAA0B,CAClC,CAAC;AACF,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAC;AAC/E,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACzE,MAAM,MAAM,0BAA0B,GAAG,CAAC,CAAC,KAAK,CAC9C,OAAO,yBAAyB,CACjC,CAAC;AACF,MAAM,MAAM,+BAA+B,GAAG,CAAC,CAAC,KAAK,CACnD,OAAO,8BAA8B,CACtC,CAAC"}

package/dist/types/schemas/index.js

@@ -155,7 +155,8 @@ exports.addUserToGroupSchema = zod_1.default
     message: "Both deviceGroupName and deviceGroupId must be provided",
     path: ["deviceGroupName", "deviceGroupId"],
 });
-exports.generateConnectUrlsSchema = zod_1.default.object({
+exports.generateConnectUrlsSchema = zod_1.default
+    .object({
     meshNodeId: zod_1.default
         .string()
         .min(1, "Hex identifier cannot be empty")
@@ -171,7 +172,9 @@ exports.generateConnectUrlsSchema = zod_1.default.object({
     }, {
         message: "Hex identifier too short. Must have at least 8 characters",
     })
-        .transform((value) => value.toUpperCase()),
+        .transform((value) => value.toUpperCase())
+        .optional(),
+    agentId: zod_1.default.string().min(1, "Agent ID cannot be empty").optional(),
     userId: zod_1.default
         .string()
         .min(1, "User ID cannot be empty")
@@ -203,6 +206,13 @@ exports.generateConnectUrlsSchema = zod_1.default.object({
         message: "isApplet must be a boolean value",
     })
         .transform((value) => (value === undefined ? undefined : Boolean(value))),
+})
+    .refine((data) => {
+    // At least one of meshNodeId or agentId must be provided
+    return data.meshNodeId !== undefined || data.agentId !== undefined;
+}, {
+    message: "Either meshNodeId or agentId must be provided",
+    path: ["meshNodeId"],
 });
 exports.getEndpointInstallScriptSchema = zod_1.default
     .object({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meru2802/aux-server",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "Nexus EPM auxillary server to facilitate additional functionality required by Scogo Iceberg",
   "main": "index.js",
   "files": [