@internetderdinge/api 1.229.8 → 1.229.10

package/dist/src/devices/devices.route.js

@@ -7,7 +7,7 @@ import { validateQuerySearchUserAndOrganization } from "../middlewares/validateQ
 import { validateDevice } from "../middlewares/validateDevice.js";
 import * as devicesController from "./devices.controller.js";
 import { resetDevice } from "./devices.controller.js";
-import { createDeviceSchema, queryDevicesSchema, getDeviceSchema, updateDeviceSchema, getEventsSchema, pingDeviceSchema, registerDeviceSchema, ledLightSchema, rebootDeviceSchema, getImageSchema, updateSingleImageMetaSchema, uploadSingleImageSchema, resetDeviceSchema, } from "./devices.validation.js";
+import { createDeviceSchema, queryDevicesSchema, getDeviceSchema, updateDeviceSchema, deleteDeviceSchema, getEventsSchema, pingDeviceSchema, registerDeviceSchema, ledLightSchema, rebootDeviceSchema, getImageSchema, updateSingleImageMetaSchema, uploadSingleImageSchema, resetDeviceSchema, } from "./devices.validation.js";
 import { deviceResponseSchema, devicesResponseSchema, eventResponseSchema, genericResponseSchema, imageResponseSchema, uploadResponseSchema, resetResponseSchema, } from "./devices.schemas.js";
 import { validateOrganizationDelete, validateOrganizationUpdate, } from "../middlewares/validateAction.js";
 export const devicesRouteSpecs = [
@@ -68,6 +68,9 @@ export const devicesRouteSpecs = [
     {
         method: "delete",
         path: "/:deviceId",
+        validate: [auth("manageUsers"), validateDevice, validateOrganizationDelete],
+        requestSchema: deleteDeviceSchema,
+        responseSchema: genericResponseSchema,
         handler: devicesController.deleteEntry,
         summary: "Delete a device",
         description: "Remove the specified device from the system.",

package/dist/src/files/upload.service.js

@@ -2,8 +2,6 @@
 import { S3Client, GetObjectCommand } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
-import multer from "multer";
-import multerS3 from "multer-s3";
 import fs from "fs";
 import request from "request";
 const s3 = new S3Client({
@@ -52,20 +50,6 @@ export const fileFilter = (req, file, cb) => {
         cb(new Error("Invalid file type, only JPEG and PNG is allowed!"), false);
     }
 };
-export const uploadFile = multer({
-    storage: multerS3({
-        s3: s3,
-        bucket: process.env.AWS_S3_BUCKET_NAME,
-        contentType: multerS3.AUTO_CONTENT_TYPE,
-        acl: "public-read",
-        metadata(req, file, cb) {
-            cb(null, { fieldName: file.fieldname });
-        },
-        key(req, file, cb) {
-            cb(null, `${Date.now().toString()}-${file.originalname}`);
-        },
-    }),
-});
 const getPhoto = async (photoId, res) => {
     try {
         const params = {
@@ -116,7 +100,6 @@ const getPhotoFromUserImage = async (photoId, res) => {
     }
 };
 export default {
-    uploadFile,
     uploadImage,
     getPhoto,
     getPhotoFromUserImage,

package/dist/src/index.js

@@ -10,6 +10,7 @@ export { default as i18n } from "../src/i18n/i18n";
 export { default as usersRoute } from "../src/users/users.route";
 export { default as accountsRoute } from "../src/accounts/accounts.route";
 export { default as accountsService } from "../src/accounts/accounts.service";
+export { auth0 } from "../src/accounts/auth0.service";
 export { default as organizationsRoute } from "../src/organizations/organizations.route";
 export { default as organizationsService } from "../src/organizations/organizations.service";
 export { default as Organization } from "../src/organizations/organizations.model";

package/dist/src/iotdevice/iotdevice.service.js

@@ -5,7 +5,7 @@ import AWS from "aws-sdk";
 import { deviceKindHasFeature } from "../utils/deviceUtils";
 import ApiError from "../utils/ApiError";
 import { getAuth0Token } from "../accounts/auth0.service";
-import { uploadImage, getSignedFileUrl, } from "../files/upload.service";
+import { uploadImage, getSignedFileUrl } from "../files/upload.service";
 import { compareImages } from "../utils/comparePapers.service";
 import IotDevice from "./iotdevice.model";
 import { fileTypeFromBuffer } from "file-type";

package/dist/src/middlewares/validateAdmin.js

@@ -1,7 +1,6 @@
 import httpStatus from "http-status";
 import ApiError from "../utils/ApiError";
 const isAdmin = (user) => {
-    return false;
     if (!user)
         return false;
     // return false; // TODO: Remove this line when the user object is properly defined

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetderdinge/api",
-  "version": "1.229.8",
+  "version": "1.229.10",
   "description": "Shared OpenIoT API modules",
   "main": "dist/src/index.js",
   "type": "module",
@@ -68,7 +68,6 @@
     "moment-timezone": "^0.6.0",
     "morgan": "^1.10.1",
     "multer": "^2.0.2",
-    "multer-s3": "^3.0.1",
     "multiparty": "~4.2.3",
     "node-uuid": "~1.4.8",
     "nodemailer": "^8.0.1",

package/src/devices/devices.route.ts

@@ -105,6 +105,9 @@ export const devicesRouteSpecs: RouteSpec[] = [
   {
     method: "delete",
     path: "/:deviceId",
+    validate: [auth("manageUsers"), validateDevice, validateOrganizationDelete],
+    requestSchema: deleteDeviceSchema,
+    responseSchema: genericResponseSchema,
     handler: devicesController.deleteEntry,
     summary: "Delete a device",
     description: "Remove the specified device from the system.",

package/src/files/upload.service.ts

@@ -3,7 +3,6 @@ import { S3Client, GetObjectCommand } from "@aws-sdk/client-s3";
 import { Upload } from "@aws-sdk/lib-storage";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import multer from "multer";
-import multerS3 from "multer-s3";
 import fs from "fs";
 import request from "request";
 
@@ -82,21 +81,6 @@ export const fileFilter = (
   }
 };
 
-export const uploadFile = multer({
-  storage: multerS3({
-    s3: s3,
-    bucket: process.env.AWS_S3_BUCKET_NAME!,
-    contentType: multerS3.AUTO_CONTENT_TYPE,
-    acl: "public-read",
-    metadata(req, file, cb) {
-      cb(null, { fieldName: file.fieldname });
-    },
-    key(req, file, cb) {
-      cb(null, `${Date.now().toString()}-${file.originalname}`);
-    },
-  }),
-});
-
 const getPhoto = async (
   photoId: string,
   res: Express.Response,
@@ -161,7 +145,6 @@ const getPhotoFromUserImage = async (
 };
 
 export default {
-  uploadFile,
   uploadImage,
   getPhoto,
   getPhotoFromUserImage,

package/src/index.ts

@@ -15,6 +15,7 @@ export { default as i18n } from "../src/i18n/i18n";
 export { default as usersRoute } from "../src/users/users.route";
 export { default as accountsRoute } from "../src/accounts/accounts.route";
 export { default as accountsService } from "../src/accounts/accounts.service";
+export { auth0 } from "../src/accounts/auth0.service";
 export { default as organizationsRoute } from "../src/organizations/organizations.route";
 export { default as organizationsService } from "../src/organizations/organizations.service";
 export { default as Organization } from "../src/organizations/organizations.model";

package/src/iotdevice/iotdevice.service.ts

@@ -5,11 +5,7 @@ import AWS from "aws-sdk";
 import { deviceKindHasFeature } from "../utils/deviceUtils";
 import ApiError from "../utils/ApiError";
 import { getAuth0Token } from "../accounts/auth0.service";
-import {
-  uploadFile,
-  uploadImage,
-  getSignedFileUrl,
-} from "../files/upload.service";
+import { uploadImage, getSignedFileUrl } from "../files/upload.service";
 import { compareImages } from "../utils/comparePapers.service";
 import IotDevice from "./iotdevice.model";
 import { fileTypeFromBuffer } from "file-type";

package/src/middlewares/validateAdmin.ts

@@ -3,7 +3,6 @@ import ApiError from "../utils/ApiError";
 import type { Request, Response, NextFunction } from "express";
 
 const isAdmin = (user: Record<string, any> | undefined): boolean => {
-  return false;
   if (!user) return false;
 
   // return false; // TODO: Remove this line when the user object is properly defined