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!

using CurrentUserId

Blue Mousecc20914d8453
diff --git a/src/marketplace/extensions/dtos/get-all-extensions-queries.dto.ts b/src/marketplace/extensions/dtos/get-all-extensions-queries.dto.ts
index 5d082fd5f..c1bb12989 100644
--- a/src/marketplace/extensions/dtos/get-all-extensions-queries.dto.ts
+++ b/src/marketplace/extensions/dtos/get-all-extensions-queries.dto.ts
@@ -1,4 +1,4 @@
-import { IsNumberString, IsOptional, IsUUID } from 'class-validator'
+import { IsNumberString, IsOptional } from 'class-validator'
export class GetAllExtensionsQueries {
@IsNumberString()
@@ -8,8 +8,4 @@ export class GetAllExtensionsQueries {
@IsNumberString()
@IsOptional()
readonly limit?: number
-
- @IsUUID()
- @IsOptional()
- readonly ownerId?: string
}
diff --git a/src/marketplace/extensions/dtos/queries/get-installed-extensions.dto.ts b/src/marketplace/extensions/dtos/queries/get-installed-extensions.dto.ts
index 2739c5d1d..65b43ec27 100644
--- a/src/marketplace/extensions/dtos/queries/get-installed-extensions.dto.ts
+++ b/src/marketplace/extensions/dtos/queries/get-installed-extensions.dto.ts
@@ -1,9 +1,6 @@
-import { IsNumberString, IsOptional, IsUUID } from 'class-validator'
+import { IsNumberString, IsOptional } from 'class-validator'
export class GetInstalledExtensionsQueriesDto {
- @IsUUID()
- readonly userId: string
-
@IsNumberString()
@IsOptional()
readonly offset?: number
diff --git a/src/marketplace/extensions/dtos/queries/install-extension.dto.ts b/src/marketplace/extensions/dtos/queries/install-extension.dto.ts
deleted file mode 100644
index 1680e7173..000000000
--- a/src/marketplace/extensions/dtos/queries/install-extension.dto.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { IsUUID } from 'class-validator'
-
-export class InstallExtensionQueriesDto {
- @IsUUID()
- readonly userId: string
-}
diff --git a/src/marketplace/extensions/dtos/queries/uninstall-extension.dto.ts b/src/marketplace/extensions/dtos/queries/uninstall-extension.dto.ts
deleted file mode 100644
index c634de788..000000000
--- a/src/marketplace/extensions/dtos/queries/uninstall-extension.dto.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { IsUUID } from 'class-validator'
-
-export class UninstallExtensionQueriesDto {
- @IsUUID()
- readonly userId: string
-}
diff --git a/src/marketplace/extensions/extensions.controller.ts b/src/marketplace/extensions/extensions.controller.ts
index b1a5a630b..97b2e1404 100644
--- a/src/marketplace/extensions/extensions.controller.ts
+++ b/src/marketplace/extensions/extensions.controller.ts
@@ -40,8 +40,6 @@ import { Extension } from './entities/extension.entity'
import { GetInstalledExtensionsQueriesDto } from './dtos/queries/get-installed-extensions.dto'
import { InstallExtensionParamsDto } from './dtos/params/install-extension.dto'
import { UninstallExtensionParamsDto } from './dtos/params/uninstall-extension.dto'
-import { InstallExtensionQueriesDto } from './dtos/queries/install-extension.dto'
-import { UninstallExtensionQueriesDto } from './dtos/queries/uninstall-extension.dto'
import { InstallExtensionBodyDto } from './dtos/bodies/install-extension.dto'
import { UninstallExtensionBodyDto } from './dtos/bodies/uninstall-extension.dto'
import { ProjectService } from '../../project/project.service'
@@ -70,6 +68,7 @@ export class ExtensionsController {
@Get('installed')
async getInstalledExtensions(
@Query() queries: GetInstalledExtensionsQueriesDto,
+ @CurrentUserId() userId: string,
): Promise<{
extensions: Extension[]
count: number
@@ -78,7 +77,7 @@ export class ExtensionsController {
const [extensions, count] = await this.extensionsService.findAndCount({
where: {
- owner: queries.userId,
+ owner: userId,
},
skip: queries.offset || 0,
take: queries.limit > 100 ? 25 : queries.limit || 25,
@@ -168,6 +167,7 @@ export class ExtensionsController {
@Get('published')
async getAllPublishedExtensions(
@Query() queries: GetAllExtensionsQueries,
+ @CurrentUserId() userId: string,
): Promise<{
extensions: Extension[]
count: number
@@ -176,7 +176,7 @@ export class ExtensionsController {
skip: queries.offset || 0,
take: queries.limit > 100 ? 25 : queries.limit || 25,
where: {
- owner: queries.ownerId,
+ owner: userId,
},
})
@@ -397,10 +397,10 @@ export class ExtensionsController {
@Post(':extensionId/install')
async installExtension(
@Param() params: InstallExtensionParamsDto,
- @Query() queries: InstallExtensionQueriesDto,
@Body() body: InstallExtensionBodyDto,
+ @CurrentUserId() userId: string,
): Promise<any> {
- this.logger.debug({ params, queries, body })
+ this.logger.debug({ params, body })
const extension = await this.extensionsService.findOne({
where: { id: params.extensionId },
@@ -409,7 +409,7 @@ export class ExtensionsController {
throw new NotFoundException('Extension not found.')
}
- const user = await this.userService.findOne(queries.userId)
+ const user = await this.userService.findOne(userId)
if (!user) {
throw new NotFoundException('User not found.')
}
@@ -457,10 +457,10 @@ export class ExtensionsController {
@Delete(':extensionId/uninstall')
async uninstallExtension(
@Param() params: UninstallExtensionParamsDto,
- @Query() queries: UninstallExtensionQueriesDto,
@Body() body: UninstallExtensionBodyDto,
+ @CurrentUserId() userId: string,
): Promise<void> {
- this.logger.debug({ params, queries, body })
+ this.logger.debug({ params, body })
const extension = await this.extensionsService.findOne({
where: { id: params.extensionId },
@@ -469,7 +469,7 @@ export class ExtensionsController {
throw new NotFoundException('Extension not found.')
}
- const user = await this.userService.findOne(queries.userId)
+ const user = await this.userService.findOne(userId)
if (!user) {
throw new NotFoundException('User not found.')
}