@internetderdinge/api 1.224.2 → 1.229.1

package/src/iotdevice/iotdevice.route.ts

@@ -1,9 +1,9 @@
-import { Router } from 'express';
-import buildRouterAndDocs from '../utils/buildRouterAndDocs';
-import auth from '../middlewares/auth';
-import { validateAdmin } from '../middlewares/validateAdmin';
-import { validateDevice } from '../middlewares/validateDevice';
-import type { RouteSpec } from '../types/routeSpec';
+import { Router } from "express";
+import buildRouterAndDocs from "../utils/buildRouterAndDocs";
+import auth from "../middlewares/auth";
+import { validateAdmin } from "../middlewares/validateAdmin";
+import { validateDevice } from "../middlewares/validateDevice";
+import type { RouteSpec } from "../types/routeSpec";
 
 import {
   getEventsSchema,
@@ -15,7 +15,7 @@ import {
   shadowAlarmValidationSchema,
   apiStatusRequestSchema,
   // add other input schemas as needed
-} from './iotdevice.validation';
+} from "./iotdevice.validation";
 
 import {
   iotDeviceResponseSchema,
@@ -26,7 +26,7 @@ import {
   deviceStatusSchema,
   apiStatusSchema,
   entryResponseSchema,
-} from './iotdevice.schemas';
+} from "./iotdevice.schemas";
 
 import {
   getIotDevices,
@@ -40,142 +40,151 @@ import {
   getApiStatus,
   getEntry,
   updateEntry,
-} from './iotdevice.controller';
-import { request } from 'https';
+} from "./iotdevice.controller";
+import { request } from "https";
 
 export const iotdeviceRouteSpecs: RouteSpec[] = [
   {
-    method: 'get',
-    path: '/',
-    validate: [auth('getUsers'), validateAdmin],
+    method: "get",
+    path: "/",
+    validate: [auth("getUsers"), validateAdmin],
     requestSchema: iotDevicesSchema,
     responseSchema: iotDeviceResponseSchema.array(),
     handler: getIotDevices,
-    summary: 'List all IoT devices',
-    description: 'Retrieves a list of all registered IoT devices.',
+    summary: "List all IoT devices",
+    description: "Retrieves a list of all registered IoT devices.",
   },
   {
-    method: 'get',
-    path: '/events/:deviceId',
-    validate: [auth('getUsers'), validateDevice],
+    method: "get",
+    path: "/events/:deviceId",
+    validate: [auth("getUsers"), validateDevice],
     requestSchema: getEventsSchema,
     responseSchema: eventResponseSchema.array(),
     handler: getEvents,
-    summary: 'Get events for a device',
-    description: 'Fetches event records for the specified device by its ID.',
+    summary: "Get events for a device",
+    description: "Fetches event records for the specified device by its ID.",
   },
   {
-    method: 'post',
-    path: '/devices',
-    validate: [auth('getUsers'), validateAdmin],
+    method: "post",
+    path: "/devices",
+    validate: [auth("getUsers"), validateAdmin],
     requestSchema: getDeviceSchema,
     responseSchema: deviceResponseSchema,
     handler: getDevice,
-    summary: 'Fetch a single device by criteria',
-    description: 'Retrieves a single IoT device matching the provided criteria.',
+    summary: "Fetch a single device by criteria",
+    description:
+      "Retrieves a single IoT device matching the provided criteria.",
   },
   {
-    method: 'get',
-    path: '/device/shadowAlarmUpdate/:deviceId',
-    validate: [auth('getUsers'), validateAdmin],
+    method: "get",
+    path: "/device/shadowAlarmUpdate/:deviceId",
+    validate: [auth("getUsers"), validateAdmin],
     requestSchema: getEntrySchema,
     responseSchema: shadowAlarmSchema,
     handler: shadowAlarmGet,
-    summary: 'Get shadow alarm settings',
-    description: 'Fetches the shadow alarm configuration for a specific device.',
+    summary: "Get shadow alarm settings",
+    description:
+      "Fetches the shadow alarm configuration for a specific device.",
   },
   {
-    method: 'post',
-    path: '/device/shadowAlarmUpdate/:deviceId',
-    validate: [auth('getUsers'), validateAdmin],
-    requestSchema: shadowAlarmSchema,
+    method: "post",
+    path: "/device/shadowAlarmUpdate/:deviceId",
+    validate: [auth("getUsers"), validateAdmin],
+    requestSchema: { body: shadowAlarmSchema },
     responseSchema: shadowAlarmSchema,
     handler: shadowAlarmUpdate,
-    summary: 'Update shadow alarm settings',
-    description: 'Updates the shadow alarm configuration for a specific device.',
+    summary: "Update shadow alarm settings",
+    description:
+      "Updates the shadow alarm configuration for a specific device.",
   },
   {
-    method: 'get',
-    path: '/shadow/:nrfId/:shadowName',
-    validate: [auth('getUsers'), validateAdmin],
+    method: "get",
+    path: "/shadow/:nrfId/:shadowName",
+    validate: [auth("getUsers"), validateAdmin],
     requestSchema: shadowAlarmValidationSchema,
     responseSchema: shadowAlarmSchema,
     handler: shadowAdmin,
-    summary: 'Administer device shadow by nrfId and name',
-    description: 'Performs administrative operations on a device shadow identified by NRF ID and shadow name.',
+    summary: "Administer device shadow by nrfId and name",
+    description:
+      "Performs administrative operations on a device shadow identified by NRF ID and shadow name.",
   },
   {
-    method: 'post',
-    path: '/ledlight/:deviceId',
-    validate: [auth('getUsers'), validateAdmin],
+    method: "post",
+    path: "/ledlight/:deviceId",
+    validate: [auth("getUsers"), validateAdmin],
     responseSchema: pingResponseSchema,
     handler: pingDevice,
-    summary: 'Ping device LED light',
-    description: 'Sends a ping to the device’s LED light to test its connectivity or response.',
+    summary: "Ping device LED light",
+    description:
+      "Sends a ping to the device’s LED light to test its connectivity or response.",
   },
   {
-    method: 'post',
-    path: '/ping/:deviceId',
-    validate: [auth('getUsers'), validateAdmin],
+    method: "post",
+    path: "/ping/:deviceId",
+    validate: [auth("getUsers"), validateAdmin],
     requestSchema: pingDeviceSchema,
     responseSchema: pingResponseSchema,
     handler: pingDevice,
-    summary: 'Ping device',
-    description: 'Sends a ping command to the specified device to verify its availability.',
+    summary: "Ping device",
+    description:
+      "Sends a ping command to the specified device to verify its availability.",
   },
   {
-    method: 'get',
-    path: '/getDeviceStatus/:deviceId',
-    validate: [auth('getUsers'), validateAdmin],
+    method: "get",
+    path: "/getDeviceStatus/:deviceId",
+    validate: [auth("getUsers"), validateAdmin],
     responseSchema: deviceStatusSchema,
     handler: getDeviceStatus,
-    summary: 'Get current status of a device',
-    description: 'Retrieves the current operational status of the specified device.',
+    summary: "Get current status of a device",
+    description:
+      "Retrieves the current operational status of the specified device.",
   },
   {
-    method: 'get',
-    path: '/status/:kind',
+    method: "get",
+    path: "/status/:kind",
     validate: [],
     requestSchema: apiStatusRequestSchema,
     responseSchema: apiStatusSchema,
     handler: getApiStatus,
-    summary: 'Get API status by kind',
-    description: 'Retrieves the API status information for a given status kind.',
+    summary: "Get API status by kind",
+    description:
+      "Retrieves the API status information for a given status kind.",
   },
   {
-    method: 'get',
-    path: '/:deviceId',
-    validate: [auth('getUsers'), validateDevice, validateAdmin],
+    method: "get",
+    path: "/:deviceId",
+    validate: [auth("getUsers"), validateDevice, validateAdmin],
     requestSchema: getEntrySchema,
     responseSchema: entryResponseSchema,
     handler: getEntry,
-    summary: 'Get one entry for a device',
-    description: 'Fetches a single data entry for the specified device by ID.',
+    summary: "Get one entry for a device",
+    description: "Fetches a single data entry for the specified device by ID.",
   },
   {
-    method: 'post',
-    path: '/:deviceId',
-    validate: [auth('manageUsers'), validateDevice, validateAdmin],
+    method: "post",
+    path: "/:deviceId",
+    validate: [auth("manageUsers"), validateDevice, validateAdmin],
     requestSchema: updateEntrySchema,
     responseSchema: entryResponseSchema,
     handler: updateEntry,
-    summary: 'Create or replace an entry for a device',
-    description: 'Creates or replaces a data entry for the specified device.',
+    summary: "Create or replace an entry for a device",
+    description: "Creates or replaces a data entry for the specified device.",
   },
   {
-    method: 'patch',
-    path: '/:deviceId',
-    validate: [auth('manageUsers'), validateDevice, validateAdmin],
+    method: "patch",
+    path: "/:deviceId",
+    validate: [auth("manageUsers"), validateDevice, validateAdmin],
     requestSchema: updateEntrySchema,
     responseSchema: entryResponseSchema,
     handler: updateEntry,
-    summary: 'Update an entry for a device',
-    description: 'Applies a partial update to an existing data entry for the specified device.',
+    summary: "Update an entry for a device",
+    description:
+      "Applies a partial update to an existing data entry for the specified device.",
   },
 ];
 
 const router: Router = Router();
 
-buildRouterAndDocs(router, iotdeviceRouteSpecs, '/iotdevice', ['IoTDevice']);
+buildRouterAndDocs(router, iotdeviceRouteSpecs, "/iotdevice", ["IoTDevice"]);
 
 export default router;

package/src/iotdevice/iotdevice.service.ts

@@ -1,7 +1,8 @@
+// @ts-nocheck
 import httpStatus from "http-status";
 import axios from "axios";
 import AWS from "aws-sdk";
-import { deviceKindHasFeature } from "@wirewire/helpers";
+import { deviceKindHasFeature } from "../utils/deviceUtils";
 import ApiError from "../utils/ApiError";
 import { getAuth0Token } from "../accounts/auth0.service";
 import {
@@ -11,10 +12,10 @@ import {
 } from "../files/upload.service";
 import { compareImages } from "../utils/comparePapers.service";
 import IotDevice from "./iotdevice.model";
-import fileType from "file-type";
+import { fileTypeFromBuffer } from "file-type";
 
 import type { AxiosRequestConfig } from "axios";
-import type { Device } from "../devices.model";
+import type { Device } from "../devices/devices.model.js";
 import type { AxiosResponse } from "axios";
 
 import iotsdk from "aws-iot-device-sdk-v2";
@@ -507,7 +508,7 @@ export const uploadSingleImage = async ({
       }
     }
 
-    const type = await fileType(buffer);
+    const type = await fileTypeFromBuffer(buffer);
     const fileName = `ePaperImages/${id}`;
 
     await uploadImage({ blob: buffer, key: fileName + ".png", type });

package/src/iotdevice/iotdevice.types.ts

@@ -0,0 +1,6 @@
+export type Device = any;
+
+export type ShadowUpdatePayload = {
+  shadowName: string;
+  [key: string]: any;
+};

package/src/middlewares/auth.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import passport from "passport";
 import httpStatus from "http-status";
 import { expressjwt as jwt } from "express-jwt";
@@ -8,14 +9,7 @@ import ApiError from "../utils/ApiError";
 import Token from "../tokens/tokens.model";
 import { roleRights } from "../config/roles";
 
-interface AuthRequest extends Request {
-  auth?: {
-    id: string;
-    tokenId: string;
-    type: string;
-    [key: string]: any; // Additional user data
-  };
-}
+type AuthRequest = Request;
 
 type VerifyCallback = (
   req: AuthRequest,

package/src/middlewares/error.ts

@@ -1,16 +1,25 @@
-import mongoose from 'mongoose';
-import httpStatus from 'http-status';
-import config from '../config/config';
-import logger from '../config/logger';
-import ApiError from '../utils/ApiError';
+// @ts-nocheck
+import mongoose from "mongoose";
+import httpStatus from "http-status";
+import config from "../config/config";
+import logger from "../config/logger";
+import ApiError from "../utils/ApiError";
 
-import type { Request, Response, NextFunction } from 'express';
+import type { Request, Response, NextFunction } from "express";
 
-export const errorConverter = (err: any, req: Request, res: Response, next: NextFunction): void => {
+export const errorConverter = (
+  err: any,
+  req: Request,
+  res: Response,
+  next: NextFunction,
+): void => {
   let error = err;
   if (!(error instanceof ApiError)) {
     const statusCode =
-      error.statusCode || (error instanceof mongoose.Error ? httpStatus.BAD_REQUEST : httpStatus.INTERNAL_SERVER_ERROR);
+      error.statusCode ||
+      (error instanceof mongoose.Error
+        ? httpStatus.BAD_REQUEST
+        : httpStatus.INTERNAL_SERVER_ERROR);
     const message = error.message || httpStatus[statusCode];
     error = new ApiError(statusCode, message, false, err.stack);
   }
@@ -18,9 +27,14 @@ export const errorConverter = (err: any, req: Request, res: Response, next: Next
 };
 
 // eslint-disable-next-line no-unused-vars
-export const errorHandler = (err: ApiError, req: Request, res: Response, next: NextFunction): void => {
+export const errorHandler = (
+  err: ApiError,
+  req: Request,
+  res: Response,
+  next: NextFunction,
+): void => {
   let { statusCode, message } = err;
-  if (config.env === 'production' && !err.isOperational) {
+  if (config.env === "production" && !err.isOperational) {
     statusCode = httpStatus.INTERNAL_SERVER_ERROR;
     message = httpStatus[httpStatus.INTERNAL_SERVER_ERROR];
   }
@@ -30,10 +44,10 @@ export const errorHandler = (err: ApiError, req: Request, res: Response, next: N
   const response = {
     code: statusCode,
     message,
-    ...(config.env === 'development' && { stack: err.stack }),
+    ...(config.env === "development" && { stack: err.stack }),
   };
 
-  if (config.env === 'development') {
+  if (config.env === "development") {
     logger.error(err);
   }
 

package/src/middlewares/mongooseValidations/ensureSameOrganization.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 /**
  * Throws if patient doesn’t exist or isn’t in the given org.
  */
@@ -7,9 +8,9 @@ export async function ensureSameOrganization(
   UserModel: Model<any>,
 ) {
   // console.log('ensureSameOrganization', patientId, organizationId);
-  const user = await UserModel.findById(patientId).select('organization');
-  if (!user) throw new Error('Patient not found');
+  const user = await UserModel.findById(patientId).select("organization");
+  if (!user) throw new Error("Patient not found");
   if (!user.organization.equals(organizationId)) {
-    throw new Error('Patient must belong to the same organization');
+    throw new Error("Patient must belong to the same organization");
   }
 }

package/src/middlewares/validateAi.ts

@@ -1,24 +1,32 @@
-import httpStatus from 'http-status';
-import ApiError from '../utils/ApiError'; // keep .cjs import
-import expressPkg from 'express';
-const { Request, Response, NextFunction } = expressPkg;
+import httpStatus from "http-status";
+import ApiError from "../utils/ApiError"; // keep .cjs import
+import type { Request, Response, NextFunction } from "express";
 
 interface User {
-  'https://memo.wirewire.de/roles'?: string[];
+  "https://memo.wirewire.de/roles"?: string[];
 }
 
 // you can adjust the User source if your auth payload differs
 export const isAiRole = (user?: User): boolean => {
   if (!user) return false;
-  return user['https://memo.wirewire.de/roles']?.includes('ai') ?? false;
+  return user["https://memo.wirewire.de/roles"]?.includes("ai") ?? false;
 };
 
-export const validateAiRole = async (req: Request & { auth?: User }, res: Response, next: NextFunction): Promise<void> => {
+export const validateAiRole = async (
+  req: Request & { auth?: User },
+  res: Response,
+  next: NextFunction,
+): Promise<void> => {
   // assuming the auth payload is attached to req.auth
 
-  console.log('Validating AI role for user:', req.auth);
+  console.log("Validating AI role for user:", req.auth);
   if (isAiRole(req.auth)) {
     return next();
   }
-  return next(new ApiError(httpStatus.FORBIDDEN, 'User is not part of the ai group (validateAi)'));
+  return next(
+    new ApiError(
+      httpStatus.FORBIDDEN,
+      "User is not part of the ai group (validateAi)",
+    ),
+  );
 };

package/src/middlewares/validateDevice.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import httpStatus from "http-status";
 import ApiError from "../utils/ApiError";
 import devicesService from "../devices/devices.service";

package/src/middlewares/validateDeviceUserOrganization.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import httpStatus from "http-status";
 import ApiError from "../utils/ApiError";
 import devicesService from "../devices/devices.service";

package/src/middlewares/validateOrganization.ts

@@ -1,7 +1,7 @@
+// @ts-nocheck
 import type { Request, Response, NextFunction } from "express";
 import type { UserService } from "../users/users.service";
 import userService from "../users/users.service";
-
 import httpStatus from "http-status";
 import ApiError from "../utils/ApiError";
 import { isAdmin } from "./validateAdmin";

package/src/middlewares/validateQuerySearchUserAndOrganization.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import httpStatus from "http-status";
 import ApiError from "../utils/ApiError";
 import { isAdmin } from "./validateAdmin";

package/src/middlewares/validateTokens.ts

@@ -21,7 +21,8 @@ export async function validateParamsToken(
   }
 
   // compare owner vs. authenticated sub
-  if (token.owner !== res.req.auth.sub) {
+  const tokenOwner = (token as { owner?: string }).owner;
+  if (!tokenOwner || tokenOwner !== res.req.auth?.sub) {
     return next(
       new ApiError(
         httpStatus.FORBIDDEN,

package/src/middlewares/validateUser.ts

@@ -1,3 +1,4 @@
+// @ts-nocheck
 import httpStatus from "http-status";
 import ApiError from "../utils/ApiError";
 import usersService from "../users/users.service";

package/src/models/plugins/index.ts

@@ -1,7 +1,8 @@
-import type { ToJSONPlugin } from './toJSON.plugin';
-import type { PaginatePlugin } from './paginate.plugin';
+// @ts-nocheck
+import type { ToJSONPlugin } from "./toJSON.plugin";
+import type { PaginatePlugin } from "./paginate.plugin";
 // import type { PaginateNewPlugin } from './paginateNew.plugin';
 
-export { default as toJSON } from './toJSON.plugin';
-export { default as paginate } from './paginate.plugin';
+export { default as toJSON } from "./toJSON.plugin";
+export { default as paginate } from "./paginate.plugin";
 // export { default as paginateNew } from './paginateNew.plugin';

package/src/models/plugins/paginate.plugin.ts

@@ -1,5 +1,6 @@
+// @ts-nocheck
 /* eslint-disable no-param-reassign */
-import { Document, Model, Query, Types } from 'mongoose';
+import { Document, Model, Query, Types } from "mongoose";
 
 export interface QueryResult<T> {
   results: T[];
@@ -26,20 +27,26 @@ function paginate<T extends Document>(schema: any) {
     options: PaginateOptions = {},
     plugin?: PluginFunction,
   ): Promise<QueryResult<T>> {
-    let sort = '';
+    let sort = "";
     if (options.sortBy) {
       const sortingCriteria: string[] = [];
-      options.sortBy.split(',').forEach((sortOption) => {
-        const [key, order] = sortOption.split(':');
-        sortingCriteria.push((order === 'desc' ? '-' : '') + key);
+      options.sortBy.split(",").forEach((sortOption) => {
+        const [key, order] = sortOption.split(":");
+        sortingCriteria.push((order === "desc" ? "-" : "") + key);
       });
-      sort = sortingCriteria.join(' ');
+      sort = sortingCriteria.join(" ");
     } else {
-      sort = 'createdAt';
+      sort = "createdAt";
     }
 
-    const limit = options.limit && parseInt(String(options.limit), 10) > 0 ? parseInt(String(options.limit), 10) : 10000;
-    const page = options.page && parseInt(String(options.page), 10) > 0 ? parseInt(String(options.page), 10) : 1;
+    const limit =
+      options.limit && parseInt(String(options.limit), 10) > 0
+        ? parseInt(String(options.limit), 10)
+        : 10000;
+    const page =
+      options.page && parseInt(String(options.page), 10) > 0
+        ? parseInt(String(options.page), 10)
+        : 1;
     const skip = (page - 1) * limit;
 
     let results: any[] = [];
@@ -51,7 +58,7 @@ function paginate<T extends Document>(schema: any) {
 
       const fuzzyFields = options.fuzzySearch.fields;
       const mustClauses = Object.entries(filter).map(([key, value]) => {
-        if (typeof value === 'string' && value.match(/^[a-fA-F0-9]{24}$/)) {
+        if (typeof value === "string" && value.match(/^[a-fA-F0-9]{24}$/)) {
           return { equals: { path: key, value: new Types.ObjectId(value) } };
         }
         return { equals: { path: key, value } };
@@ -81,7 +88,7 @@ function paginate<T extends Document>(schema: any) {
         {
           $facet: {
             results: [],
-            totalCount: [{ $count: 'count' }],
+            totalCount: [{ $count: "count" }],
           },
         },
       ];
@@ -93,12 +100,15 @@ function paginate<T extends Document>(schema: any) {
       // Regular find branch
       const countPromise = this.countDocuments(filter).exec();
 
-      let docsPromise: any = this.find(filter).sort(sort).skip(skip).limit(limit);
+      let docsPromise: any = this.find(filter)
+        .sort(sort)
+        .skip(skip)
+        .limit(limit);
       if (options.populate) {
-        options.populate.split(',').forEach((populateOption) => {
+        options.populate.split(",").forEach((populateOption) => {
           docsPromise = docsPromise.populate(
             populateOption
-              .split('.')
+              .split(".")
               .reverse()
               .reduce((a, b) => ({ path: b, populate: a })),
           );
@@ -117,9 +127,9 @@ function paginate<T extends Document>(schema: any) {
       if (options.populate) {
         results = await this.populate(
           results,
-          options.populate.split(',').map((populateOption) =>
+          options.populate.split(",").map((populateOption) =>
             populateOption
-              .split('.')
+              .split(".")
               .reverse()
               .reduce((a, b) => ({ path: b, populate: a })),
           ),