Skip to content

Commit ac9ec8b

Browse files
authored
Merge pull request #3834 from Iron-56/fix-idor-asset-delete
Update docs for setting up google auth
2 parents 3010c8b + 509b208 commit ac9ec8b

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

client/modules/IDE/actions/assets.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ export function getAssets() {
3030
export function deleteAssetRequest(assetKey) {
3131
return async (dispatch) => {
3232
try {
33-
await apiClient.delete(`/S3/${assetKey}`);
33+
const path = assetKey.split('/').pop();
34+
await apiClient.delete(
35+
`/S3/delete?objectKey=${encodeURIComponent(path)}`
36+
);
3437
dispatch(deleteAsset(assetKey));
3538
} catch (error) {
3639
dispatch({

server/controllers/aws.controller.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ export async function deleteObjectsFromS3(keyList) {
6565
}
6666

6767
export async function deleteObjectFromS3(req, res) {
68-
const { objectKey, userId } = req.params;
69-
const fullObjectKey = userId ? `${userId}/${objectKey}` : objectKey;
68+
const userId = req.user.id;
69+
const { objectKey } = req.query;
70+
const fullObjectKey = `${userId}/${objectKey}`;
7071

7172
try {
7273
await deleteObjectsFromS3([fullObjectKey]);

server/routes/aws.routes.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ router.post(
1010
isAuthenticated,
1111
AWSController.copyObjectInS3RequestHandler
1212
);
13-
router.delete(
14-
'/S3/:userId?/:objectKey',
15-
isAuthenticated,
16-
AWSController.deleteObjectFromS3
17-
);
13+
router.delete('/S3/delete', isAuthenticated, AWSController.deleteObjectFromS3);
1814
router.get('/S3/objects', AWSController.listObjectsInS3ForUserRequestHandler);
1915

2016
// eslint-disable-next-line import/no-default-export

0 commit comments

Comments
 (0)