🪣 S3 home directory for files

linagora · Sep 28, 2023 · b020118 · b020118
1 parent a6fa424
commit b020118
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/tdrive/backend/node/src/core/platform/services/storage/index.ts b/tdrive/backend/node/src/core/platform/services/storage/index.ts
@@ -23,6 +23,7 @@ export default class StorageService extends TdriveService<StorageAPI> implements
 
   private encryptionOptions: EncryptionConfiguration;
   private algorithm = "aes-256-cbc";
+  private homeDir = "tdrive";
 
   api(): StorageAPI {
     return this;
@@ -37,6 +38,7 @@ export default class StorageService extends TdriveService<StorageAPI> implements
     const type = this.getConnectorType();
     if (type === "S3") {
       logger.info("Using 'S3' connector for storage.");
+      this.homeDir = this.configuration.get<string>("S3.bucket");
       return new S3ConnectorService({
         bucket: this.configuration.get<string>("S3.bucket"),
         region: this.configuration.get<string>("S3.region"),
@@ -56,6 +58,10 @@ export default class StorageService extends TdriveService<StorageAPI> implements
     return new LocalConnectorService(this.configuration.get<LocalConfiguration>("local"));
   }
 
+  getHomeDir(): string {
+    return this.homeDir;
+  }
+
   async write(path: string, stream: Stream, options?: WriteOptions): Promise<WriteMetadata> {
     try {
       if (options?.encryptionKey) {

diff --git a/tdrive/backend/node/src/core/platform/services/storage/provider.ts b/tdrive/backend/node/src/core/platform/services/storage/provider.ts
@@ -54,4 +54,5 @@ export interface StorageConnectorAPI {
 export default interface StorageAPI extends TdriveServiceProvider, StorageConnectorAPI {
   getConnector(): StorageConnectorAPI;
   getConnectorType(): string;
+  getHomeDir(): string;
 }
diff --git a/tdrive/backend/node/src/services/files/services/index.ts b/tdrive/backend/node/src/services/files/services/index.ts
@@ -311,5 +311,7 @@ export class FileServiceImpl {
 }
 
 function getFilePath(entity: File): string {
-  return `/tdrive/files/${entity.company_id}/${entity.user_id || "anonymous"}/${entity.id}`;
+  return `/${gr.platformServices.storage.getHomeDir()}/files/${entity.company_id}/${
+    entity.user_id || "anonymous"
+  }/${entity.id}`;
 }