diff --git a/src/avatars/avatars.controller.ts b/src/avatars/avatars.controller.ts index 9e83eb33..51514290 100644 --- a/src/avatars/avatars.controller.ts +++ b/src/avatars/avatars.controller.ts @@ -9,25 +9,21 @@ import { Res, StreamableFile, UploadedFile, - UseFilters, UseInterceptors, - UsePipes, - ValidationPipe, } from '@nestjs/common'; import { FileInterceptor } from '@nestjs/platform-express'; import { AvatarType } from '@prisma/client'; import { Response } from 'express'; import * as fs from 'fs'; -import { BaseErrorExceptionFilter } from '../common/error/error-filter'; +import { AuthToken, Guard, ResourceId } from '../auth/guard.decorator'; import { getFileHash, getFileMimeType } from '../common/helper/file.helper'; -import { TokenValidateInterceptor } from '../common/interceptor/token-validate.interceptor'; import { UploadAvatarResponseDto } from './DTO/upload-avatar.dto'; import { CorrespondentFileNotExistError, InvalidAvatarTypeError, } from './avatars.error'; import { AvatarsService } from './avatars.service'; -import { AuthToken, Guard, ResourceId } from '../auth/guard.decorator'; +import { NoAuth } from '../common/interceptor/token-validate.interceptor'; @Controller('/avatars') export class AvatarsController { @@ -84,7 +80,7 @@ export class AvatarsController { } @Get('/:id') - @Guard('query', 'avatar') + @NoAuth() async getAvatar( @Headers('If-None-Match') ifNoneMatch: string, @Param('id', ParseIntPipe) @ResourceId() id: number, diff --git a/src/users/role-permission.service.ts b/src/users/role-permission.service.ts index 39ff00b1..e74e063c 100644 --- a/src/users/role-permission.service.ts +++ b/src/users/role-permission.service.ts @@ -140,7 +140,7 @@ export class RolePermissionService { }, }, { - authorizedActions: ['create', 'query', 'query-default', 'enumerate'], + authorizedActions: ['create', 'query-default', 'enumerate'], authorizedResource: { ownedByUser: undefined, types: ['avatar'], diff --git a/test/avatars.e2e-spec.ts b/test/avatars.e2e-spec.ts index 5b9db5aa..7eac57bc 100644 --- a/test/avatars.e2e-spec.ts +++ b/test/avatars.e2e-spec.ts @@ -111,13 +111,13 @@ describe('Avatar Module', () => { expect(respond.body.message).toMatch(/^AvatarNotFoundError: /); expect(respond.status).toBe(404); }); - it('should return AuthenticationRequiredError', async () => { - const respond = await request(app.getHttpServer()) - .get(`/avatars/${AvatarId}`) - .send(); - expect(respond.body.message).toMatch(/^AuthenticationRequiredError: /); - expect(respond.status).toBe(401); - }); + // it('should return AuthenticationRequiredError', async () => { + // const respond = await request(app.getHttpServer()) + // .get(`/avatars/${AvatarId}`) + // .send(); + // expect(respond.body.message).toMatch(/^AuthenticationRequiredError: /); + // expect(respond.status).toBe(401); + // }); }); describe('get default avatar', () => { it('should get default avatar', async () => {