mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-15 23:54:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use Req decorator instead of Request

Browse source 
This avoids a clash with the Request type from express

Signed-off-by: David Mehren <git@herrmehren.de>
This commit is contained in:
David Mehren 2021-02-23 21:20:01 +01:00
parent e4ba59f154
commit a5d922b5f8
No known key found for this signature in database
GPG key ID: 185982BA4C42B7C3
3 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/api/public/me/me.controller.ts
View file

@ -14,7 +14,7 @@ import {
Param,
Put,
UseGuards,
Request,
Req,
} from '@nestjs/common';
import { HistoryEntryUpdateDto } from '../../../history/history-entry-update.dto';
import { HistoryService } from '../../../history/history.service';
@ -43,7 +43,7 @@ export class MeController {
@UseGuards(TokenAuthGuard)
@Get()
async getMe(@Request() req): Promise<UserInfoDto> {
async getMe(@Req() req): Promise<UserInfoDto> {
return this.usersService.toUserDto(
await this.usersService.getUserByUsername(req.user.userName),
);
@ -51,7 +51,7 @@ export class MeController {
@UseGuards(TokenAuthGuard)
@Get('history')
async getUserHistory(@Request() req): Promise<HistoryEntryDto[]> {
async getUserHistory(@Req() req): Promise<HistoryEntryDto[]> {
const foundEntries = await this.historyService.getEntriesByUser(req.user);
return await Promise.all(
foundEntries.map(
@ -63,7 +63,7 @@ export class MeController {
@UseGuards(TokenAuthGuard)
@Put('history/:note')
async updateHistoryEntry(
@Request() req,
@Req() req,
@Param('note') note: string,
@Body() entryUpdateDto: HistoryEntryUpdateDto,
): Promise<HistoryEntryDto> {
@ -87,7 +87,7 @@ export class MeController {
@UseGuards(TokenAuthGuard)
@Delete('history/:note')
@HttpCode(204)
deleteHistoryEntry(@Request() req, @Param('note') note: string) {
deleteHistoryEntry(@Req() req, @Param('note') note: string) {
// ToDo: Check if user is allowed to delete note
try {
return this.historyService.deleteHistoryEntry(note, req.user);
@ -101,7 +101,7 @@ export class MeController {
@UseGuards(TokenAuthGuard)
@Get('notes')
async getMyNotes(@Request() req): Promise<NoteMetadataDto[]> {
async getMyNotes(@Req() req): Promise<NoteMetadataDto[]> {
const notes = this.notesService.getUserNotes(req.user);
return await Promise.all(
notes.map((note) => this.notesService.toNoteMetadataDto(note)),