retropilot
/
retropilot-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: delete old getDrive method

pull/4/head
Cameron Clough 2022-03-24 23:34:13 +00:00
parent 1b2ea1b5d8
commit 449342dab9
No known key found for this signature in database
GPG Key ID: BFB3B74B026ED43F
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/controllers/devices.js
View File

@ -209,14 +209,6 @@ async function getDrives(dongleId, includeDeleted, includeMeta) {
return Drives.findAll(query);
}
async function getDrive(identifier) {
const drive = await Drives.findOne({ where: { identifier } });
if (!drive) {
return null;
}
return drive.dataValues;
}
async function getDriveFromIdentifier(dongleId, identifier) {
return Drives.findOne({ where: { dongle_id: dongleId, identifier } });
}
@ -364,7 +356,6 @@ export default {
// drive stuff, move maybe?
getDrives,
getDrive,
getBootlogs,
getCrashlogs,
getDriveFromIdentifier,

2
src/server/router/legacy.js
View File

@ -457,7 +457,7 @@ router.get('/useradmin/cabana_drive/:extendedRouteIdentifier', runAsyncWrapper(a
const { extendedRouteIdentifier } = req.params;
const [dongleId, dongleIdHashReq, driveIdentifier, driveIdentifierHashReq] = extendedRouteIdentifier.split('|');
const drive = await deviceController.getDrive(dongleId, driveIdentifier);
const drive = await deviceController.getDriveFromIdentifier(dongleId, driveIdentifier);
if (!drive) {
return res.status(404).json({ status: 'drive not found' });
}

9
src/server/router/useradmin.js
View File

@ -399,17 +399,20 @@ router.get('/drive/:dongleId/:driveIdentifier', requireAuthenticated, runAsyncWr
const { dongleId } = req.params;
const device = await deviceController.getDeviceFromDongleId(dongleId);
if (!device) {
logger.debug('HTTP.DRIVE Device not found, dongleId:', dongleId);
return res.status(404).send('Not Found.');
}
const { account_id: accountId } = device;
if (accountId !== req.account.id) {
logger.debug('HTTP.DRIVE Account mismatch');
return res.status(403).send('Forbidden.');
}
const { driveIdentifier } = req.params;
const drive = await deviceController.getDrive(dongleId, driveIdentifier);
if (drive == null) {
const drive = await deviceController.getDriveFromIdentifier(dongleId, driveIdentifier);
if (!drive) {
logger.debug('HTTP.DRIVE Drive not found, dongleId:', dongleId, 'driveIdentifier:', driveIdentifier);
return res.status(404).send('Not Found.');
}
@ -621,7 +624,7 @@ router.get('/drive/:dongleId/:driveIdentifier/:action', requireAuthenticated, ru
dongleId,
driveIdentifier,
} = req.params;
const drive = await deviceController.getDrive(dongleId, driveIdentifier);
const drive = await deviceController.getDriveFromIdentifier(dongleId, driveIdentifier);
if (!drive) {
return res.status(404).send('Not Found.');
}