Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

fixed extension update route

Yevhenii Kulisidi1825a589e19e
diff --git a/src/marketplace/cdn/cdn.service.ts b/src/marketplace/cdn/cdn.service.ts
index 25b31e97a..7dbfe5707 100644
--- a/src/marketplace/cdn/cdn.service.ts
+++ b/src/marketplace/cdn/cdn.service.ts
@@ -42,8 +42,8 @@ export class CdnService {
async deleteFile(filename: string): Promise<void> {
try {
- await this.httpService.axiosRef.delete(`file/${filename}`, {
- data: { token: this.configService.get('CDN_ACCESS_TOKEN') },
+ await this.httpService.axiosRef.delete(`file`, {
+ data: { token: this.configService.get('CDN_ACCESS_TOKEN'), filename },
})
} catch (error) {
console.error(error)
diff --git a/src/marketplace/extensions/dtos/create-extension.dto.ts b/src/marketplace/extensions/dtos/create-extension.dto.ts
index a0d6e1aec..bf26988ea 100644
--- a/src/marketplace/extensions/dtos/create-extension.dto.ts
+++ b/src/marketplace/extensions/dtos/create-extension.dto.ts
@@ -67,5 +67,5 @@ export class AdditionalExtensionInfo {
@IsArray()
@IsString({ each: true })
@ArrayMaxSize(5)
- readonly additionalImagesCdn: string[]
+ readonly additionalImagesToDelete: string[]
}
diff --git a/src/marketplace/extensions/extensions.controller.ts b/src/marketplace/extensions/extensions.controller.ts
index 3e57e45f2..490a41602 100644
--- a/src/marketplace/extensions/extensions.controller.ts
+++ b/src/marketplace/extensions/extensions.controller.ts
@@ -383,6 +383,21 @@ export class ExtensionsController {
throw new BadRequestException('Extension body is required.')
}
+ const extensionBodyAdditionalImagesCount = body.additionalImages
+ ? body.additionalImages.length
+ : 0
+ const extensionAdditionalImagesCount = extension.additionalImages.length
+ const maxAdditionalImagesCount = 5
+
+ if (
+ extensionBodyAdditionalImagesCount + extensionAdditionalImagesCount >
+ maxAdditionalImagesCount
+ ) {
+ throw new BadRequestException(
+ `You can upload maximum ${maxAdditionalImagesCount} additional images.`,
+ )
+ }
+
return await this.extensionsService.updateExtension(
params.extensionId,
body,
diff --git a/src/marketplace/extensions/extensions.service.ts b/src/marketplace/extensions/extensions.service.ts
index e5ad837c9..0eeda5fc3 100644
--- a/src/marketplace/extensions/extensions.service.ts
+++ b/src/marketplace/extensions/extensions.service.ts
@@ -234,24 +234,31 @@ export class ExtensionsService {
where: { id: extensionId },
})
- const additionalImages = [
- ...(extension.additionalImages || []),
- ...(extension.additionalImagesCdn || []),
- ]
-
- const additionalImageFilenames = await additionalImages.reduce(
- async (promise, additionalImage) => {
- const filenames = await promise
- if (typeof additionalImage !== 'string') {
- const { filename } = await this.cdnService.uploadFile(additionalImage)
- filenames.push(filename)
- } else {
- filenames.push(additionalImage)
+ const additionalImages = [..._extension.additionalImages]
+
+ if (extension.additionalImages) {
+ additionalImages.push(
+ ...(await Promise.all(
+ extension.additionalImages.map(
+ async image => (await this.cdnService.uploadFile(image)).filename,
+ ),
+ )),
+ )
+ }
+
+ if (extension.additionalImagesToDelete) {
+ extension.additionalImagesToDelete.forEach(async image => {
+ const index = additionalImages.indexOf(image)
+
+ if (index > -1) {
+ additionalImages.splice(index, 1)
}
- return filenames
- },
- Promise.resolve([]),
- )
+
+ if (additionalImages.includes(image)) {
+ await this.cdnService.deleteFile(image)
+ }
+ })
+ }
await this.extensionRepository.update(
{ id: extensionId },
@@ -272,7 +279,7 @@ export class ExtensionsService {
await this.cdnService.uploadFile(extension.mainImage)
).filename
: _extension.mainImage,
- additionalImages: additionalImageFilenames,
+ additionalImages,
fileURL: extension.extensionScript
? (
await this.cdnService.uploadFile(extension.extensionScript)
diff --git a/src/marketplace/extensions/types/create-extension.type.ts b/src/marketplace/extensions/types/create-extension.type.ts
index 3fa36dea6..a815cd72c 100644
--- a/src/marketplace/extensions/types/create-extension.type.ts
+++ b/src/marketplace/extensions/types/create-extension.type.ts
@@ -12,5 +12,5 @@ export type CreateExtensionType = {
export type AdditionalExtensionInfo = {
version: ExtensionVersionType
- additionalImagesCdn: string[]
+ additionalImagesToDelete: string[]
}