Fix delete when using root option in s3

Fixes directus#4460
JH1ller · Mar 12, 2021 · 028cae4 · 028cae4
1 parent 15d1317
commit 028cae4
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/drive-s3/src/AmazonWebServicesS3Storage.ts b/packages/drive-s3/src/AmazonWebServicesS3Storage.ts
@@ -47,7 +47,7 @@ export class AmazonWebServicesS3Storage extends Storage {
 		});
 
 		this.$bucket = config.bucket;
-		this.$root = config.root ?? '';
+		this.$root = config.root ? path.normalize(config.root) : '';
 	}
 
 	/**
@@ -263,6 +263,8 @@ export class AmazonWebServicesS3Storage extends Storage {
 	 * Iterate over all files in the bucket.
 	 */
 	public async *flatList(prefix = ''): AsyncIterable<FileListResponse> {
+		prefix = this._fullPath(prefix);
+
 		let continuationToken: string | undefined;
 
 		do {
@@ -279,9 +281,11 @@ export class AmazonWebServicesS3Storage extends Storage {
 				continuationToken = response.NextContinuationToken;
 
 				for (const file of response.Contents as ObjectList) {
+					const path = file.Key as string;
+
 					yield {
 						raw: file,
-						path: file.Key as string,
+						path: path.substring(this.$root.length),
 					};
 				}
 			} catch (e) {