test

Type4ny-Project · Dec 17, 2024 · b228869 · b228869
1 parent 656faee
commit b228869
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts
@@ -169,11 +169,13 @@ export class DriveService {
 				ext = '';
 			}
 
-			const baseUrl = this.meta.objectStorageBaseUrl
-				? `${ this.meta.objectStorageUseSSL ? 'https' : 'http' }://${ this.meta.objectStorageEndpoint }${ this.meta.objectStoragePort ? `:${this.meta.objectStoragePort}` : '' }/${ this.meta.objectStorageBucket }` :
-				this.config.objectStorage?.objectStorageBaseUrl
-					? `${ this.config.objectStorage.objectStorageUseSSL ? 'https' : 'http' }://${ this.config.objectStorage.objectStorageEndpoint }${ this.config.objectStorage.objectStoragePort ? `:${this.config.objectStorage.objectStoragePort}` : '' }/${ this.config.objectStorage.objectStorageBucket }` :
-					this.config.objectStorage?.objectStorageBaseUrl;
+			const baseUrl = this.meta.objectStorageBaseUrl ?? this.config.objectStorage?.objectStorageBaseUrl;
+
+			// this.meta.objectStorageBaseUrl
+			// 	? `${ this.meta.objectStorageUseSSL ? 'https' : 'http' }://${ this.meta.objectStorageEndpoint }${ this.meta.objectStoragePort ? `:${this.meta.objectStoragePort}` : '' }/${ this.meta.objectStorageBucket }` :
+			// 	this.config.objectStorage?.objectStorageBaseUrl
+			// 		? `${ this.config.objectStorage.objectStorageUseSSL ? 'https' : 'http' }://${ this.config.objectStorage.objectStorageEndpoint }${ this.config.objectStorage.objectStoragePort ? `:${this.config.objectStorage.objectStoragePort}` : '' }/${ this.config.objectStorage.objectStorageBucket }` :
+			// 		this.config.objectStorage?.objectStorageBaseUrl;
 
 			// for original
 			const key = `${this.meta.objectStoragePrefix ? this.meta.objectStoragePrefix : this.config.objectStorage?.objectStoragePrefix}/${randomUUID()}${ext}`;