Skip to content

Commit 8b82738

Browse files
VMihalovVMihalov
committed
feature: update package versions and do small fixes
1 parent ef4cf80 commit 8b82738

File tree

21 files changed

+3849
-5136
lines changed

21 files changed

+3849
-5136
lines changed

‎generators/app/templates/package-lock.json‎

Lines changed: 3695 additions & 5025 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎generators/app/templates/package.json‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@
2323
"docs": "typedoc --options typedoc.json"
2424
},
2525
"dependencies": {
26-
"@liaoliaots/nestjs-redis": "6.0.0",
27-
"@nestjs/common": "8.3.1",
28-
"@nestjs/config": "1.2.0",
29-
"@nestjs/core": "8.3.1",
30-
"@nestjs/jwt": "8.0.0",
31-
"@nestjs/passport": "8.2.1",
32-
"@nestjs/platform-express": "8.3.1",
33-
"@nestjs/swagger": "5.2.0",
34-
"@nestjs/testing": "8.3.1",
26+
"@liaoliaots/nestjs-redis": "8.2.1",
27+
"@nestjs/common": "8.4.7",
28+
"@nestjs/config": "2.1.0",
29+
"@nestjs/core": "8.4.7",
30+
"@nestjs/jwt": "8.0.1",
31+
"@nestjs/passport": "8.2.2",
32+
"@nestjs/platform-express": "8.4.7",
33+
"@nestjs/swagger": "5.2.1",
34+
"@nestjs/testing": "8.4.7",
3535
"bcryptjs": "2.4.3",
3636
"class-transformer": "0.5.1",
3737
"class-validator": "0.13.2",
3838
"connect-mongodb-session": "3.1.1",
39-
"express": "4.17.3",
40-
"express-session": "1.17.2",
41-
"husky": "7.0.4",
42-
"ioredis": "4.28.5",
39+
"express": "4.18.1",
40+
"express-session": "1.17.3",
41+
"husky": "8.0.1",
42+
"ioredis": "5.0.6",
4343
"lodash": "4.17.21",
4444
"module-alias": "2.2.2",
4545
"nestjs-redis": "1.3.3",
@@ -49,36 +49,36 @@
4949
"passport-local": "1.0.0",
5050
"reflect-metadata": "0.1.13",
5151
"rimraf": "3.0.2",
52-
"rxjs": "7.5.4",
53-
"swagger-ui-express": "4.3.0"
52+
"rxjs": "7.5.5",
53+
"swagger-ui-express": "4.4.0"
5454
},
5555
"devDependencies": {
56-
"@nestjs/cli": "8.2.1",
57-
"@nestjs/schematics": "8.0.6",
56+
"@nestjs/cli": "8.2.6",
57+
"@nestjs/schematics": "8.0.11",
5858
"@types/bcryptjs": "2.4.2",
5959
"@types/express": "4.17.13",
60-
"@types/jest": "27.4.0",
61-
"@types/lodash": "4.14.178",
62-
"@types/node": "17.0.18",
60+
"@types/jest": "28.1.3",
61+
"@types/lodash": "4.14.182",
62+
"@types/node": "18.0.0",
6363
"@types/passport-jwt": "3.0.6",
6464
"@types/passport-local": "1.0.34",
65-
"@types/supertest": "2.0.11",
66-
"@typescript-eslint/eslint-plugin": "5.12.0",
67-
"@typescript-eslint/parser": "5.12.0",
65+
"@types/supertest": "2.0.12",
66+
"@typescript-eslint/eslint-plugin": "5.29.0",
67+
"@typescript-eslint/parser": "5.29.0",
6868
"cz-conventional-changelog": "3.3.0",
69-
"eslint": "8.9.0",
69+
"eslint": "8.18.0",
7070
"eslint-config-airbnb-base": "15.0.0",
71-
"eslint-config-airbnb-typescript": "16.1.0",
72-
"eslint-config-prettier": "8.3.0",
73-
"eslint-plugin-import": "2.25.4",
74-
"jest": "27.5.1",
75-
"prettier": "2.5.1",
76-
"supertest": "6.2.2",
77-
"ts-jest": "27.1.3",
78-
"ts-loader": "9.2.6",
79-
"ts-node": "10.5.0",
80-
"tsconfig-paths": "3.12.0",
81-
"typescript": "4.5.5"
71+
"eslint-config-airbnb-typescript": "17.0.0",
72+
"eslint-config-prettier": "8.5.0",
73+
"eslint-plugin-import": "2.26.0",
74+
"jest": "28.1.1",
75+
"prettier": "2.7.1",
76+
"supertest": "6.2.3",
77+
"ts-jest": "28.0.5",
78+
"ts-loader": "9.3.0",
79+
"ts-node": "10.8.1",
80+
"tsconfig-paths": "3.14.1",
81+
"typescript": "4.7.4"
8282
},
8383
"jest": {
8484
"moduleNameMapper": {

‎generators/auth/dependencies/dependencies.json‎

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"common": {
3-
"general": { "@nestjs/passport": "8.0.1", "passport": "0.4.1" },
3+
"general": { "@nestjs/passport": "8.2.2", "passport": "0.6.0" },
44
"dev": {}
55
},
66
"jwt": {
77
"hasSessionsStorage": false,
88
"general": {
99
"passport-local": "1.0.0",
10-
"@nestjs/jwt": "8.0.0",
10+
"@nestjs/jwt": "8.0.1",
1111
"passport-jwt": "4.0.0",
1212
"nestjs-redis": "git+https://github.com/GyanendroKh/nestjs-redis.git#nest8-fix",
13-
"ioredis": "4.27.7"
13+
"ioredis": "5.0.6"
1414
},
1515
"dev": { "@types/passport-local": "1.0.34", "@types/passport-jwt": "3.0.6" }
1616
},
@@ -19,46 +19,42 @@
1919
"general": {
2020
"redis": {
2121
"passport-google-oauth20": "2.0.0",
22-
"express-session": "1.17.1",
23-
"cookie-parser": "1.4.5",
24-
"connect-redis": "6.0.0",
22+
"express-session": "1.17.3",
23+
"cookie-parser": "1.4.6",
24+
"connect-redis": "6.1.3",
2525
"redis": "3.1.2"
2626
},
2727
"mongodb": {
2828
"passport-google-oauth20": "2.0.0",
29-
"express-session": "1.17.2",
30-
"cookie-parser": "1.4.5",
31-
"connect-mongodb-session": "3.0.0",
32-
"mongodb": "4.1.0"
29+
"express-session": "1.17.3",
30+
"cookie-parser": "1.4.6",
31+
"connect-mongodb-session": "3.1.1",
32+
"mongodb": "4.7.0"
3333
},
3434
"mysql": {
3535
"passport-google-oauth20": "2.0.0",
36-
"express-session": "1.17.2",
37-
"express-mysql-session": "2.1.6"
36+
"express-session": "1.17.3",
37+
"express-mysql-session": "2.1.8"
3838
}
3939
},
4040
"dev": {
4141
"redis": {
42-
"@types/passport-google-oauth20": "2.0.9",
42+
"@types/passport-google-oauth20": "2.0.11",
4343
"@types/passport-local": "1.0.34",
4444
"@types/connect-flash": "0.0.37",
45-
"@types/express-handlebars": "5.3.1",
4645
"@types/express-session": "1.17.4",
47-
"@types/redis": "2.8.31",
48-
"@types/connect-redis": "0.0.17"
46+
"@types/connect-redis": "0.0.18"
4947
},
5048
"mongodb": {
51-
"@types/passport-google-oauth20": "2.0.9",
49+
"@types/passport-google-oauth20": "2.0.11",
5250
"@types/passport-local": "1.0.34",
5351
"@types/connect-flash": "0.0.37",
54-
"@types/express-handlebars": "5.3.1",
5552
"@types/express-session": "1.17.4"
5653
},
5754
"mysql": {
58-
"@types/passport-google-oauth20": "2.0.9",
55+
"@types/passport-google-oauth20": "2.0.11",
5956
"@types/passport-local": "1.0.34",
6057
"@types/connect-flash": "0.0.37",
61-
"@types/express-handlebars": "5.3.1",
6258
"@types/express-session": "1.17.4"
6359
}
6460
}
@@ -68,53 +64,49 @@
6864
"general": {
6965
"redis": {
7066
"passport-local": "1.0.0",
71-
"express-session": "1.17.2",
72-
"hbs": "4.1.2",
73-
"express-handlebars": "5.3.3",
74-
"cookie-parser": "1.4.5",
67+
"express-session": "1.17.3",
68+
"hbs": "4.2.0",
69+
"express-handlebars": "6.0.6",
70+
"cookie-parser": "1.4.6",
7571
"connect-redis": "6.0.0",
7672
"connect-flash": "0.1.1",
7773
"redis": "3.1.2"
7874
},
7975
"mongodb": {
8076
"passport-local": "1.0.0",
8177
"express-session": "1.17.2",
82-
"hbs": "4.1.2",
83-
"express-handlebars": "5.3.3",
84-
"cookie-parser": "1.4.5",
78+
"hbs": "4.2.0",
79+
"express-handlebars": "6.0.6",
80+
"cookie-parser": "1.4.6",
8581
"connect-mongodb-session": "3.0.0",
8682
"connect-flash": "0.1.1",
8783
"mongodb": "4.1.0"
8884
},
8985
"mysql": {
9086
"passport-local": "1.0.0",
9187
"express-session": "1.17.2",
92-
"hbs": "4.1.2",
93-
"express-handlebars": "5.3.3",
94-
"cookie-parser": "1.4.5",
88+
"hbs": "4.2.0",
89+
"express-handlebars": "6.0.6",
90+
"cookie-parser": "1.4.6",
9591
"connect-flash": "0.1.1",
96-
"express-mysql-session": "2.1.6"
92+
"express-mysql-session": "2.1.8"
9793
}
9894
},
9995
"dev": {
10096
"redis": {
10197
"@types/passport-local": "1.0.34",
10298
"@types/connect-flash": "0.0.37",
103-
"@types/express-handlebars": "5.3.1",
10499
"@types/express-session": "1.17.4",
105-
"@types/redis": "2.8.31",
106-
"@types/connect-redis": "0.0.17"
100+
"@types/connect-redis": "0.0.18"
107101
},
108102
"mongodb": {
109103
"@types/passport-local": "1.0.34",
110104
"@types/connect-flash": "0.0.37",
111-
"@types/express-handlebars": "5.3.1",
112105
"@types/express-session": "1.17.4"
113106
},
114107
"mysql": {
115108
"@types/passport-local": "1.0.34",
116109
"@types/connect-flash": "0.0.37",
117-
"@types/express-handlebars": "5.3.1",
118110
"@types/express-session": "1.17.4"
119111
}
120112
}

‎generators/auth/templates/mongodb/oauth2/src/modules/v1/auth/auth.controller.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,15 @@ export default class AuthController {
7777
@UseGuards(IsLoggedGuard)
7878
@Delete('logout')
7979
@HttpCode(204)
80-
async logout(@Req() req: ExpressRequest): Promise<{}> {
81-
await req.logout();
80+
public logout(@Req() req: ExpressRequest): Promise<void> {
81+
return new Promise((resolve, reject) => {
82+
req.logout((error: any) => {
83+
if (error) {
84+
reject(error);
85+
}
8286

83-
return {};
87+
resolve();
88+
});
89+
});
8490
}
8591
}

‎generators/auth/templates/mongodb/oauth2/src/modules/v1/users/users.repository.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Model, Query, Types } from 'mongoose';
1+
import { Model, Types } from 'mongoose';
22
import { Injectable } from '@nestjs/common';
33
import { InjectModel } from '@nestjs/mongoose';
44

@@ -47,11 +47,11 @@ export default class UsersRepository {
4747
}).exec();
4848
}
4949

50-
public getAll(): Query<UserDocument[], UserDocument> {
50+
public getAll(): Promise<UserDocument[]> {
5151
return this.usersModel.find().exec();
5252
}
5353

54-
public getVerifiedUsers(): Query<UserDocument[], UserDocument> {
54+
public getVerifiedUsers(): Promise<UserDocument[]> {
5555
return this.usersModel.find({ verified: true }).exec();
5656
}
5757
}

‎generators/auth/templates/mongodb/oauth2/src/modules/v1/users/users.service.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Query, Types } from 'mongoose';
1+
import { Types } from 'mongoose';
22
import { Injectable } from '@nestjs/common';
33

44
import { User, UserDocument } from '@v1/users/schemas/users.schema';
@@ -48,7 +48,7 @@ export default class UsersService {
4848
return foundUser;
4949
}
5050

51-
getAllVerified(): Query<UserDocument[], UserDocument> {
51+
getAllVerified(): Promise<UserDocument[]> {
5252
return this.usersRepository.getVerifiedUsers();
5353
}
5454
}

‎generators/auth/templates/mongodb/passportLocal/src/_mongodb-main.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import 'module-alias/register';
33

44
import flash from 'connect-flash';
5-
import exphbs from 'express-handlebars';
5+
import { engine } from 'express-handlebars';
66
import passport from 'passport';
77
import session from 'express-session';
88

@@ -30,7 +30,7 @@ async function bootstrap() {
3030

3131
const viewsPath = join(__dirname, '../public/views');
3232

33-
app.engine('.hbs', exphbs({
33+
app.engine('.hbs', engine({
3434
extname: '.hbs',
3535
defaultLayout: 'main',
3636
helpers: {

‎generators/auth/templates/mongodb/passportLocal/src/_mysql-main.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import 'module-alias/register';
33

44
import flash from 'connect-flash';
5-
import exphbs from 'express-handlebars';
5+
import { engine } from 'express-handlebars';
66
import passport from 'passport';
77
import session from 'express-session';
88

@@ -30,7 +30,7 @@ async function bootstrap() {
3030

3131
const viewsPath = join(__dirname, '../public/views');
3232

33-
app.engine('.hbs', exphbs({
33+
app.engine('.hbs', engine({
3434
extname: '.hbs',
3535
defaultLayout: 'main',
3636
helpers: {

‎generators/auth/templates/mongodb/passportLocal/src/_redis-main.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'module-alias/register';
55
import flash from 'connect-flash';
66
import redisStore from 'connect-redis';
77
import redis from 'redis';
8-
import exphbs from 'express-handlebars';
8+
import { engine } from 'express-handlebars';
99
import passport from 'passport';
1010
import session from 'express-session';
1111

@@ -31,7 +31,7 @@ async function bootstrap() {
3131

3232
const viewsPath = join(__dirname, '../public/views');
3333

34-
app.engine('.hbs', exphbs({
34+
app.engine('.hbs', engine({
3535
extname: '.hbs',
3636
defaultLayout: 'main',
3737
helpers: {

‎generators/auth/templates/mongodb/passportLocal/src/modules/v1/auth/auth.controller.ts‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,16 @@ export default class AuthController {
6868
@ApiInternalServerErrorResponse({ description: 'Internal error' })
6969
@Get('/logout')
7070
@Redirect('/v1/auth/login')
71-
public logout(@Request() req: ExpressRequest): void {
72-
req.logout();
71+
public logout(@Request() req: ExpressRequest): Promise<void> {
72+
return new Promise((resolve, reject) => {
73+
req.logout((error: any) => {
74+
if (error) {
75+
reject(error);
76+
}
77+
78+
resolve();
79+
});
80+
});
7381
}
7482

7583
@ApiCookieAuth()

0 commit comments

Comments
 (0)