Skip to content

Commit 3d94d62

Browse files
committed
fix build
1 parent d309b96 commit 3d94d62

File tree

10 files changed

+24
-15
lines changed

10 files changed

+24
-15
lines changed

src/middlewares/auth.middleware.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { Injectable, NestMiddleware } from '@nestjs/common';
2-
import { Request, Response, NextFunction } from 'express';
2+
import { Response, NextFunction } from 'express';
33
import * as jwt from 'express-jwt';
44
import { expressJwtSecret } from 'jwks-rsa';
5+
import { Request } from '🧙‍♂️/types/request';
56
import Config from '../config';
67

78
const secret = expressJwtSecret({

src/modules/admin/__tests__/mentors.controller.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { UnauthorizedException, BadRequestException } from '@nestjs/common';
22
import { Test } from '@nestjs/testing';
3+
import { Request } from '🧙‍♂️/types/request';
34
import { MentorsController } from '../../mentors/mentors.controller';
45
import { UsersService } from '../../common/users.service';
56
import { EmailService } from '../../email/email.service';
@@ -8,7 +9,6 @@ import { User } from '../../common/interfaces/user.interface';
89
import { Application } from '../../common/interfaces/application.interface';
910
import { MentorFiltersDto } from '../../common/dto/mentorfilters.dto';
1011
import { ApplicationDto } from '../../common/dto/application.dto';
11-
import { Request } from 'express';
1212

1313
class ServiceMock {}
1414

src/modules/admin/admin.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
Req,
77
} from '@nestjs/common';
88
import { ApiOperation, ApiUseTags } from '@nestjs/swagger';
9-
import { Request } from 'express';
9+
import { Request } from '🧙‍♂️/types/request';
1010
import { MentorsService } from '../common/mentors.service';
1111
import { MentorshipsService } from '../mentorships/mentorships.service';
1212
import { EmailService } from '../email/email.service';

src/modules/lists/__tests__/favorites.controller.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { BadRequestException, UnauthorizedException } from '@nestjs/common';
22
import { Test } from '@nestjs/testing';
3-
import { Request } from 'express';
3+
import { Request } from '🧙‍♂️/types/request';
44
import { FavoritesController } from '../favorites.controller';
55
import { ListsService } from '../lists.service';
66
import { List } from '../interfaces/list.interface';

src/modules/lists/__tests__/lists.controller.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { BadRequestException, UnauthorizedException } from '@nestjs/common';
22
import { Test } from '@nestjs/testing';
3-
import { Request } from 'express';
3+
import { Request } from '🧙‍♂️/types/request';
44
import { ListsController } from '../lists.controller';
55
import { ListsService } from '../lists.service';
66
import { List } from '../interfaces/list.interface';

src/modules/lists/favorites.controller.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
ValidationPipe,
1111
} from '@nestjs/common';
1212
import { ApiBearerAuth, ApiOperation, ApiUseTags } from '@nestjs/swagger';
13-
import { Request } from 'express';
13+
import { Request } from '🧙‍♂️/types/request';
1414
import { Role, User } from '../common/interfaces/user.interface';
1515
import { List } from './interfaces/list.interface';
1616
import { UsersService } from '../common/users.service';
@@ -101,11 +101,11 @@ export class FavoritesController {
101101
} else {
102102
let listDto: ListDto;
103103

104-
if (list.mentors.find(item => item._id.equals(mentor._id))) {
104+
if (list.mentors.find((item) => item._id.equals(mentor._id))) {
105105
// If the mentor exist in the list we need to remove it
106106
listDto = new ListDto({
107107
_id: list._id,
108-
mentors: list.mentors.filter(item => !item._id.equals(mentor._id)),
108+
mentors: list.mentors.filter((item) => !item._id.equals(mentor._id)),
109109
});
110110
} else {
111111
// If the mentor doesn't exist in the list we need to add it

src/modules/lists/lists.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
Put,
1414
} from '@nestjs/common';
1515
import { ApiBearerAuth, ApiOperation, ApiUseTags } from '@nestjs/swagger';
16-
import { Request } from 'express';
16+
import { Request } from '🧙‍♂️/types/request';
1717
import { Role, User } from '../common/interfaces/user.interface';
1818
import { List } from './interfaces/list.interface';
1919
import { UsersService } from '../common/users.service';

src/modules/users/users.controller.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import { ListsService } from '../lists/lists.service';
3939
import { filterImages } from '../../utils/mimes';
4040
import { MentorshipsService } from '../mentorships/mentorships.service';
4141
import { Status } from '../mentorships/interfaces/mentorship.interface';
42+
import { AccessTokenUser } from '🧙‍♂️/types/request';
4243

4344
@ApiUseTags('/users')
4445
@ApiBearerAuth()

src/utils/request.d.ts renamed to src/types/request.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { Request as ExpressReqeust } from 'express';
2+
13
interface AccessTokenUser {
24
iss: string;
35
sub: string;
@@ -10,8 +12,6 @@ interface AccessTokenUser {
1012
email_verified: boolean;
1113
}
1214

13-
declare module 'express-serve-static-core' {
14-
interface Request {
15-
user?: AccessTokenUser;
16-
}
15+
export interface Request extends ExpressReqeust {
16+
user?: AccessTokenUser;
1717
}

tsconfig.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,18 @@
99
"sourceMap": true,
1010
"outDir": "./dist",
1111
"baseUrl": "./",
12-
"resolveJsonModule": true
12+
"resolveJsonModule": true,
13+
"skipLibCheck": true,
14+
"paths": {
15+
"🧙‍♂️/types/*": ["src/types/*"]
16+
}
1317
},
18+
"include": [
19+
"src/**/*"
20+
],
1421
"files": [
1522
"src/main.ts",
16-
"src/utils/request.d.ts"
23+
"src/types/request.d.ts"
1724
],
1825
"exclude": ["node_modules"]
1926
}

0 commit comments

Comments
 (0)