Merge branch '5.3.0'

kamilmysliwiec · kamilmysliwiec · commit 7a4b0e64ad02 · 2018-08-31T13:18:21.000+02:00
diff --git a/integration/graphql/package.json b/integration/graphql/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@nestjs/common": "^5.1.0",
     "@nestjs/core": "^5.1.0",
-    "@nestjs/graphql": "^3.0.0",
+    "@nestjs/graphql": "^5.0.0",
     "apollo-server-express": "^2.0.4",
     "graphql": "^0.13.2",
     "graphql-tools": "^2.11.0",
diff --git a/sample/12-graphql-apollo/package-lock.json b/sample/12-graphql-apollo/package-lock.json
diff --git a/sample/12-graphql-apollo/package.json b/sample/12-graphql-apollo/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@nestjs/common": "^5.1.0",
     "@nestjs/core": "^5.1.0",
-    "@nestjs/graphql": "^3.0.0",
+    "@nestjs/graphql": "^5.0.0",
     "apollo-server-express": "^2.0.4",
     "graphql": "^0.13.2",
     "graphql-subscriptions": "^0.5.6",
diff --git a/sample/19-auth/package-lock.json b/sample/19-auth/package-lock.json
diff --git a/sample/19-auth/package.json b/sample/19-auth/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@nestjs/common": "^5.1.0",
     "@nestjs/core": "^5.1.0",
-    "@nestjs/jwt": "0.1.1",
-    "@nestjs/passport": "^1.1.0",
+    "@nestjs/jwt": "^0.1.3",
+    "@nestjs/passport": "^5.0.0",
     "passport": "^0.4.0",
     "passport-http-bearer": "^1.0.1",
     "passport-jwt": "^4.0.0",
diff --git a/sample/19-auth/src/auth/auth.controller.ts b/sample/19-auth/src/auth/auth.controller.ts
@@ -14,6 +14,7 @@ export class AuthController {
   @Get('data')
   @UseGuards(AuthGuard())
   findAll() {
-    // this route is restricted
+    // This route is restricted by AuthGuard
+    // JWT strategy
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ export class AuthController {`
`14`	`14`	`@Get('data')`
`15`	`15`	`@UseGuards(AuthGuard())`
`16`	`16`	`findAll() {`
`17`		`- // this route is restricted`
	`17`	`+ // This route is restricted by AuthGuard`
	`18`	`+ // JWT strategy`
`18`	`19`	`}`
`19`	`20`	`}`