diff --git a/src/api/public/me/me.controller.ts b/src/api/public/me/me.controller.ts index b445b0968..0ba65b013 100644 --- a/src/api/public/me/me.controller.ts +++ b/src/api/public/me/me.controller.ts @@ -27,6 +27,7 @@ import { ApiSecurity, ApiTags } from '@nestjs/swagger'; import { HistoryEntryDto } from '../../../history/history-entry.dto'; import { UserInfoDto } from '../../../users/user-info.dto'; import { NotInDBError } from '../../../errors/errors'; +import { Request } from 'express'; @ApiTags('me') @ApiSecurity('token') @@ -43,7 +44,7 @@ export class MeController { @UseGuards(TokenAuthGuard) @Get() - async getMe(@Req() req): Promise { + async getMe(@Req() req: Request): Promise { return this.usersService.toUserDto( await this.usersService.getUserByUsername(req.user.userName), ); @@ -51,7 +52,7 @@ export class MeController { @UseGuards(TokenAuthGuard) @Get('history') - async getUserHistory(@Req() req): Promise { + async getUserHistory(@Req() req: Request): Promise { const foundEntries = await this.historyService.getEntriesByUser(req.user); return await Promise.all( foundEntries.map( @@ -63,7 +64,7 @@ export class MeController { @UseGuards(TokenAuthGuard) @Put('history/:note') async updateHistoryEntry( - @Req() req, + @Req() req: Request, @Param('note') note: string, @Body() entryUpdateDto: HistoryEntryUpdateDto, ): Promise { @@ -87,7 +88,7 @@ export class MeController { @UseGuards(TokenAuthGuard) @Delete('history/:note') @HttpCode(204) - deleteHistoryEntry(@Req() req, @Param('note') note: string) { + deleteHistoryEntry(@Req() req: Request, @Param('note') note: string) { // ToDo: Check if user is allowed to delete note try { return this.historyService.deleteHistoryEntry(note, req.user); @@ -101,7 +102,7 @@ export class MeController { @UseGuards(TokenAuthGuard) @Get('notes') - async getMyNotes(@Req() req): Promise { + async getMyNotes(@Req() req: Request): Promise { const notes = this.notesService.getUserNotes(req.user); return await Promise.all( notes.map((note) => this.notesService.toNoteMetadataDto(note)), diff --git a/src/api/public/media/media.controller.ts b/src/api/public/media/media.controller.ts index 730f5c35a..28fff33c3 100644 --- a/src/api/public/media/media.controller.ts +++ b/src/api/public/media/media.controller.ts @@ -20,6 +20,7 @@ import { UseInterceptors, } from '@nestjs/common'; import { FileInterceptor } from '@nestjs/platform-express'; +import { Request } from 'express'; import { ClientError, MediaBackendError, @@ -48,7 +49,7 @@ export class MediaController { @Post() @UseInterceptors(FileInterceptor('file')) async uploadMedia( - @Req() req, + @Req() req: Request, @UploadedFile() file: MulterFile, @Headers('HedgeDoc-Note') noteId: string, ): Promise { @@ -80,7 +81,7 @@ export class MediaController { @UseGuards(TokenAuthGuard) @Delete(':filename') async deleteMedia( - @Req() req, + @Req() req: Request, @Param('filename') filename: string, ): Promise { const username = req.user.userName; diff --git a/src/api/public/notes/notes.controller.ts b/src/api/public/notes/notes.controller.ts index dc110a288..1caa35d35 100644 --- a/src/api/public/notes/notes.controller.ts +++ b/src/api/public/notes/notes.controller.ts @@ -41,6 +41,7 @@ import { RevisionMetadataDto } from '../../../revisions/revision-metadata.dto'; import { RevisionDto } from '../../../revisions/revision.dto'; import { PermissionsService } from '../../../permissions/permissions.service'; import { Note } from '../../../notes/note.entity'; +import { Request } from 'express'; @ApiTags('notes') @ApiSecurity('token') @@ -59,7 +60,7 @@ export class NotesController { @UseGuards(TokenAuthGuard) @Post() async createNote( - @Req() req, + @Req() req: Request, @MarkdownBody() text: string, ): Promise { // ToDo: provide user for createNoteDto @@ -75,7 +76,7 @@ export class NotesController { @UseGuards(TokenAuthGuard) @Get(':noteIdOrAlias') async getNote( - @Req() req, + @Req() req: Request, @Param('noteIdOrAlias') noteIdOrAlias: string, ): Promise { let note: Note; @@ -97,7 +98,7 @@ export class NotesController { @UseGuards(TokenAuthGuard) @Post(':noteAlias') async createNamedNote( - @Req() req, + @Req() req: Request, @Param('noteAlias') noteAlias: string, @MarkdownBody() text: string, ): Promise { @@ -120,7 +121,7 @@ export class NotesController { @UseGuards(TokenAuthGuard) @Delete(':noteIdOrAlias') async deleteNote( - @Req() req, + @Req() req: Request, @Param('noteIdOrAlias') noteIdOrAlias: string, ): Promise { try { @@ -143,7 +144,7 @@ export class NotesController { @UseGuards(TokenAuthGuard) @Put(':noteIdOrAlias') async updateNote( - @Req() req, + @Req() req: Request, @Param('noteIdOrAlias') noteIdOrAlias: string, @MarkdownBody() text: string, ): Promise { @@ -168,7 +169,7 @@ export class NotesController { @Get(':noteIdOrAlias/content') @Header('content-type', 'text/markdown') async getNoteContent( - @Req() req, + @Req() req: Request, @Param('noteIdOrAlias') noteIdOrAlias: string, ): Promise { try { @@ -188,7 +189,7 @@ export class NotesController { @UseGuards(TokenAuthGuard) @Get(':noteIdOrAlias/metadata') async getNoteMetadata( - @Req() req, + @Req() req: Request, @Param('noteIdOrAlias') noteIdOrAlias: string, ): Promise { try { @@ -211,7 +212,7 @@ export class NotesController { @UseGuards(TokenAuthGuard) @Put(':noteIdOrAlias/metadata/permissions') async updateNotePermissions( - @Req() req, + @Req() req: Request, @Param('noteIdOrAlias') noteIdOrAlias: string, @Body() updateDto: NotePermissionsUpdateDto, ): Promise { @@ -234,7 +235,7 @@ export class NotesController { @UseGuards(TokenAuthGuard) @Get(':noteIdOrAlias/revisions') async getNoteRevisions( - @Req() req, + @Req() req: Request, @Param('noteIdOrAlias') noteIdOrAlias: string, ): Promise { try { @@ -259,7 +260,7 @@ export class NotesController { @UseGuards(TokenAuthGuard) @Get(':noteIdOrAlias/revisions/:revisionId') async getNoteRevision( - @Req() req, + @Req() req: Request, @Param('noteIdOrAlias') noteIdOrAlias: string, @Param('revisionId') revisionId: number, ): Promise { diff --git a/src/auth/mock-auth.guard.ts b/src/auth/mock-auth.guard.ts index 5f1e40c6b..fc6d166ef 100644 --- a/src/auth/mock-auth.guard.ts +++ b/src/auth/mock-auth.guard.ts @@ -7,6 +7,7 @@ import { ExecutionContext, Injectable } from '@nestjs/common'; import { UsersService } from '../users/users.service'; import { User } from '../users/user.entity'; +import { Request } from 'express'; @Injectable() export class MockAuthGuard { @@ -14,7 +15,7 @@ export class MockAuthGuard { constructor(private usersService: UsersService) {} async canActivate(context: ExecutionContext) { - const req = context.switchToHttp().getRequest(); + const req: Request = context.switchToHttp().getRequest(); if (!this.user) { // this assures that we can create the user 'hardcoded', if we need them before any calls are made or // create them on the fly when the first call to the api is made