diff --git a/packages/backend/src/routers/delete-site.js b/packages/backend/src/routers/delete-site.js index 7137d48a..66ce2f29 100644 --- a/packages/backend/src/routers/delete-site.js +++ b/packages/backend/src/routers/delete-site.js @@ -21,8 +21,9 @@ const express = require('express'); const router = express.Router(); const auth = require('../middleware/auth.js'); const config = require('../config'); +const { DB_WRITE } = require('../services/database/consts.js'); -// -----------------------------------------------------------------------// +// -----------------------------------------------------------------------// // POST /delete-site // -----------------------------------------------------------------------// router.post('/delete-site', auth, express.json(), async (req, res, next)=>{ @@ -40,12 +41,12 @@ router.post('/delete-site', auth, express.json(), async (req, res, next)=>{ // modules const {} = require('../helpers'); - const db = require('../db/mysql.js') + const db = req.services.get('database').get(DB_WRITE, 'subdomains:legacy'); - await db.promise().execute( - `DELETE FROM subdomains WHERE user_id = ? AND uuid = ?`, + await db.write( + `DELETE FROM subdomains WHERE user_id = ? AND uuid = ?`, [req.user.id, req.body.site_uuid] - ); + ); res.send({}); }) diff --git a/packages/backend/src/routers/file.js b/packages/backend/src/routers/file.js index c7ae0a9b..e53f661a 100644 --- a/packages/backend/src/routers/file.js +++ b/packages/backend/src/routers/file.js @@ -21,6 +21,7 @@ const express = require('express'); const router = new express.Router(); const {validate_signature_auth, get_url_from_req, get_descendants, id2path, get_user, sign_file} = require('../helpers'); const { DB_WRITE } = require('../services/database/consts'); +const { Context } = require('../util/context'); // -----------------------------------------------------------------------// // GET /file @@ -175,6 +176,7 @@ router.get('/file', async (req, res, next)=>{ res.writeHead(206, headers); try{ + const storage = Context.get('storage'); let stream = await storage.create_read_stream(fsentry[0].uuid, { bucket: fsentry[0].bucket, bucket_region: fsentry[0].bucket_region, diff --git a/packages/backend/src/routers/writeFile.js b/packages/backend/src/routers/writeFile.js index 39c19b41..8d7accfc 100644 --- a/packages/backend/src/routers/writeFile.js +++ b/packages/backend/src/routers/writeFile.js @@ -507,7 +507,6 @@ module.exports = eggspress('/writeFile', { else{ // modules const {uuid2fsentry, id2path} = require('../helpers') - const write = require('../filesystem/operations/write.js'); const _path = require('path'); // Check if files were uploaded