more refectoring

sensebox · Sep 27, 2024 · 8b5de20 · 8b5de20
1 parent c17d04b
commit 8b5de20
Show file tree

Hide file tree

Showing 9 changed files with 865 additions and 20 deletions.
diff --git a/packages/api/lib/controllers/boxesController.js b/packages/api/lib/controllers/boxesController.js
@@ -71,6 +71,8 @@ const
   handleError = require('../helpers/errorHandler'),
   jsonstringify = require('stringify-stream');
 const { createDevice } = require('@sensebox/opensensemap-api-models/src/device');
+const { findByUserId } = require('@sensebox/opensensemap-api-models/src/password');
+const { removeDevice, checkPassword } = require('@sensebox/opensensemap-api-models/src/user/user');
 
 /**
  * @apiDefine Addons
@@ -500,10 +502,8 @@ const getBox = async function getBox (req, res) {
  */
 const postNewBox = async function postNewBox (req, res) {
   try {
-    // let newBox = await req.user.addBox(req._userParams);
-    // newBox = await Box.populate(newBox, Box.BOX_SUB_PROPS_FOR_POPULATION);
-
     const newDevice = await createDevice(req.user.id, req._userParams);
+    // TODO: only return specific fields newBox = await Box.populate(newBox, Box.BOX_SUB_PROPS_FOR_POPULATION);
 
     res.send(201, { message: 'Box successfully created', data: newDevice });
     clearCache(['getBoxes', 'getStats']);
@@ -581,11 +581,14 @@ const deleteBox = async function deleteBox (req, res) {
   const { password, boxId } = req._userParams;
 
   try {
-    await req.user.checkPassword(password);
-    const box = await req.user.removeBox(boxId);
-    res.send({ code: 'Ok', message: 'box and all associated measurements marked for deletion' });
+    const hashedPassword = await findByUserId(req.user.id);
+
+    await checkPassword(password, hashedPassword);
+    const device = await removeDevice(boxId);
+
+    res.send({ code: 'Ok', message: 'device and all associated measurements marked for deletion' });
     clearCache(['getBoxes', 'getStats']);
-    postToMattermost(`Box deleted: ${req.user.name} (${redactEmail(req.user.email)}) just deleted "${box.name}" (${boxId})`);
+    postToMattermost(`Device deleted: ${req.user.name} (${redactEmail(req.user.email)}) just deleted "${device.name}" (${boxId})`);
 
   } catch (err) {
     return handleError(err);
@@ -717,7 +720,8 @@ module.exports = {
   deleteBox: [
     checkContentType,
     retrieveParameters([
-      { predef: 'boxId', required: true },
+      { name: 'boxId', required: true, dataType: 'String' },
+      // { predef: 'boxId', required: true },
       { predef: 'password' }
     ]),
     checkPrivilege,

diff --git a/packages/api/lib/helpers/userParamHelpers.js b/packages/api/lib/helpers/userParamHelpers.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const { checkDeviceOwner } = require('@sensebox/opensensemap-api-models/src/user/user');
+
 const { BadRequestError, UnprocessableEntityError, InvalidArgumentError, ForbiddenError } = require('restify-errors'),
   { utils: { parseAndValidateTimestamp }, db: { mongoose }, decoding: { validators: { transformAndValidateCoords } } } = require('@sensebox/opensensemap-api-models'),
   moment = require('moment'),
@@ -548,7 +550,8 @@ const checkPrivilege = async function checkPrivilege (req) {
 
   if (req._userParams.boxId) {
     try {
-      req.user.checkBoxOwner(req._userParams.boxId);
+      await checkDeviceOwner(req.user.id, req._userParams.boxId);
+      // req.user.checkBoxOwner(req._userParams.boxId);
 
       return;
     } catch (err) {

diff --git a/packages/models/migrations/0007_add_device_models.sql b/packages/models/migrations/0007_add_device_models.sql
@@ -0,0 +1,26 @@
+ALTER TYPE "model" ADD VALUE 'home_v2_lora';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'home_v2_ethernet';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'home_v2_ethernet_feinstaub';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'home_v2_wifi';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'home_v2_wifi_feinstaub';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'home_ethernet';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'home_wifi';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'home_ethernet_feinstaub';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'home_wifi_feinstaub';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_sds011';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_sds011_dht11';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_sds011_dht22';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_sds011_bmp180';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_sds011_bme280';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_pms1003';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_pms1003_bme280';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_pms3003';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_pms3003_bme280';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_pms5003';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_pms5003_bme280';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_pms7003';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_pms7003_bme280';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_sps30_bme280';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'luftdaten_sps30_sht3x';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'hackair_home_v2';--> statement-breakpoint
+ALTER TYPE "model" ADD VALUE 'custom';