Merge pull request #38 from lujakob/update-nestjs-7

Update nestjs version 7

Author: lujakob

package-lock.json

@@ -23,39 +23,39 @@
   },
   "homepage": "https://github.com/lujakob/nestjs-realworld-example-app#readme",
   "dependencies": {
-    "@nestjs/common": "^6.11.7",
-    "@nestjs/core": "^6.11.7",
-    "@nestjs/microservices": "^6.11.7",
-    "@nestjs/platform-express": "^6.11.7",
-    "@nestjs/swagger": "^3.1.0",
-    "@nestjs/testing": "^6.11.7",
-    "@nestjs/typeorm": "^6.3.1",
-    "@nestjs/websockets": "^6.11.7",
-    "argon2": "^0.26.0",
+    "@nestjs/common": "^7.0.5",
+    "@nestjs/core": "^7.0.5",
+    "@nestjs/microservices": "^7.0.5",
+    "@nestjs/platform-express": "^7.0.5",
+    "@nestjs/swagger": "^4.4.0",
+    "@nestjs/testing": "^7.0.5",
+    "@nestjs/typeorm": "^7.0.0",
+    "@nestjs/websockets": "^7.0.5",
+    "argon2": "^0.26.1",
     "class-transformer": "^0.2.3",
-    "class-validator": "^0.9.1",
+    "class-validator": "^0.11.1",
     "crypto": "^1.0.1",
-    "crypto-js": "^3.3.0",
+    "crypto-js": "^4.0.0",
     "jsonwebtoken": "^8.5.1",
     "mysql": "^2.18.1",
     "passport-jwt": "^4.0.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^6.5.4",
     "slug": "^1.1.0",
-    "swagger-ui-express": "^4.1.3",
-    "typeorm": "^0.2.22",
-    "typescript": "^3.7.5"
+    "swagger-ui-express": "^4.1.4",
+    "typeorm": "^0.2.24",
+    "typescript": "^3.8.3"
   },
   "devDependencies": {
-    "@types/jest": "^23.3.13",
-    "@types/node": "^10.17.15",
+    "@types/jest": "^25.1.4",
+    "@types/node": "^13.9.3",
     "atob": ">=2.1.0",
     "deep-extend": ">=0.5.1",
     "extend": ">=3.0.2",
-    "jest": "^24.9.0",
+    "jest": "^25.1.0",
     "nodemon": "^1.19.4",
     "supertest": "^3.4.2",
-    "ts-jest": "^24.3.0",
-    "ts-node": "^8.6.2"
+    "ts-jest": "^25.2.1",
+    "ts-node": "^8.8.1"
   }
 }

package.json

@@ -7,28 +7,27 @@ import { CommentsRO } from './article.interface';
 import { User } from '../user/user.decorator';
 
 import {
-  ApiUseTags,
   ApiBearerAuth,
   ApiResponse,
-  ApiOperation,
+  ApiOperation, ApiTags,
 } from '@nestjs/swagger';
 
 @ApiBearerAuth()
-@ApiUseTags('articles')
+@ApiTags('articles')
 @Controller('articles')
 export class ArticleController {
 
   constructor(private readonly articleService: ArticleService) {}
 
-  @ApiOperation({ title: 'Get all articles' })
+  @ApiOperation({ summary: 'Get all articles' })
   @ApiResponse({ status: 200, description: 'Return all articles.'})
   @Get()
   async findAll(@Query() query): Promise<ArticlesRO> {
     return await this.articleService.findAll(query);
   }
 
 
-  @ApiOperation({ title: 'Get article feed' })
+  @ApiOperation({ summary: 'Get article feed' })
   @ApiResponse({ status: 200, description: 'Return article feed.'})
   @ApiResponse({ status: 403, description: 'Forbidden.' })
   @Get('feed')
@@ -46,15 +45,15 @@ export class ArticleController {
     return await this.articleService.findComments(slug);
   }
 
-  @ApiOperation({ title: 'Create article' })
+  @ApiOperation({ summary: 'Create article' })
   @ApiResponse({ status: 201, description: 'The article has been successfully created.'})
   @ApiResponse({ status: 403, description: 'Forbidden.' })
   @Post()
   async create(@User('id') userId: number, @Body('article') articleData: CreateArticleDto) {
     return this.articleService.create(userId, articleData);
   }
 
-  @ApiOperation({ title: 'Update article' })
+  @ApiOperation({ summary: 'Update article' })
   @ApiResponse({ status: 201, description: 'The article has been successfully updated.'})
   @ApiResponse({ status: 403, description: 'Forbidden.' })
   @Put(':slug')
@@ -63,23 +62,23 @@ export class ArticleController {
     return this.articleService.update(params.slug, articleData);
   }
 
-  @ApiOperation({ title: 'Delete article' })
+  @ApiOperation({ summary: 'Delete article' })
   @ApiResponse({ status: 201, description: 'The article has been successfully deleted.'})
   @ApiResponse({ status: 403, description: 'Forbidden.' })
   @Delete(':slug')
   async delete(@Param() params) {
     return this.articleService.delete(params.slug);
   }
 
-  @ApiOperation({ title: 'Create comment' })
+  @ApiOperation({ summary: 'Create comment' })
   @ApiResponse({ status: 201, description: 'The comment has been successfully created.'})
   @ApiResponse({ status: 403, description: 'Forbidden.' })
   @Post(':slug/comments')
   async createComment(@Param('slug') slug, @Body('comment') commentData: CreateCommentDto) {
     return await this.articleService.addComment(slug, commentData);
   }
 
-  @ApiOperation({ title: 'Delete comment' })
+  @ApiOperation({ summary: 'Delete comment' })
   @ApiResponse({ status: 201, description: 'The article has been successfully deleted.'})
   @ApiResponse({ status: 403, description: 'Forbidden.' })
   @Delete(':slug/comments/:id')
@@ -88,15 +87,15 @@ export class ArticleController {
     return await this.articleService.deleteComment(slug, id);
   }
 
-  @ApiOperation({ title: 'Favorite article' })
+  @ApiOperation({ summary: 'Favorite article' })
   @ApiResponse({ status: 201, description: 'The article has been successfully favorited.'})
   @ApiResponse({ status: 403, description: 'Forbidden.' })
   @Post(':slug/favorite')
   async favorite(@User('id') userId: number, @Param('slug') slug) {
     return await this.articleService.favorite(userId, slug);
   }
 
-  @ApiOperation({ title: 'Unfavorite article' })
+  @ApiOperation({ summary: 'Unfavorite article' })
   @ApiResponse({ status: 201, description: 'The article has been successfully unfavorited.'})
   @ApiResponse({ status: 403, description: 'Forbidden.' })
   @Delete(':slug/favorite')

src/article/article.controller.ts

@@ -5,12 +5,11 @@ import { ProfileRO } from './profile.interface';
 import { User } from '../user/user.decorator';
 
 import {
-  ApiUseTags,
-  ApiBearerAuth,
+  ApiBearerAuth, ApiTags,
 } from '@nestjs/swagger';
 
 @ApiBearerAuth()
-@ApiUseTags('profiles')
+@ApiTags('profiles')
 @Controller('profiles')
 export class ProfileController {
 

src/profile/profile.controller.ts

@@ -1,7 +1,7 @@
 import {PipeTransform, ArgumentMetadata, BadRequestException, HttpStatus, Injectable} from '@nestjs/common';
 import { validate } from 'class-validator';
 import { plainToClass } from 'class-transformer';
-import {HttpException} from "@nestjs/common/exceptions/http.exception";
+import { HttpException } from '@nestjs/common/exceptions/http.exception';
 
 @Injectable()
 export class ValidationPipe implements PipeTransform<any> {

src/shared/pipes/validation.pipe.ts

@@ -4,12 +4,11 @@ import { TagEntity } from './tag.entity';
 import { TagService } from './tag.service';
 
 import {
-  ApiUseTags,
-  ApiBearerAuth,
+  ApiBearerAuth, ApiTags,
 } from '@nestjs/swagger';
 
 @ApiBearerAuth()
-@ApiUseTags('tags')
+@ApiTags('tags')
 @Controller('tags')
 export class TagController {
 

src/tag/tag.controller.ts

@@ -1,20 +1,18 @@
 import { Get, Post, Body, Put, Delete, Param, Controller, UsePipes } from '@nestjs/common';
 import { Request } from 'express';
 import { UserService } from './user.service';
-import { UserEntity } from './user.entity';
 import { UserRO } from './user.interface';
 import { CreateUserDto, UpdateUserDto, LoginUserDto } from './dto';
 import { HttpException } from '@nestjs/common/exceptions/http.exception';
 import { User } from './user.decorator';
 import { ValidationPipe } from '../shared/pipes/validation.pipe';
 
 import {
-  ApiUseTags,
-  ApiBearerAuth
+  ApiBearerAuth, ApiTags
 } from '@nestjs/swagger';
 
 @ApiBearerAuth()
-@ApiUseTags('user')
+@ApiTags('user')
 @Controller()
 export class UserController {
 

src/user/user.controller.ts

@@ -1,8 +1,9 @@
-import { createParamDecorator } from '@nestjs/common';
+import { createParamDecorator, ExecutionContext } from '@nestjs/common';
 import { SECRET } from '../config';
 import * as jwt from 'jsonwebtoken';
 
-export const User = createParamDecorator((data, req) => {
+export const User = createParamDecorator((data: any, ctx: ExecutionContext) => {
+  const req = ctx.switchToHttp().getRequest();
   // if route is protected, there is a user set in auth.middleware
   if (!!req.user) {
     return !!data ? req.user[data] : req.user;
@@ -14,5 +15,4 @@ export const User = createParamDecorator((data, req) => {
     const decoded: any = jwt.verify(token[1], SECRET);
     return !!data ? decoded[data] : decoded.user;
   }
-
 });