Skip to content

Commit 6232fb2

Browse files
triszt4ntriszt4n
authoredApr 28, 2022
Coding XP (#22)
·
v1.3.0v0.1.0
1 parent f7c888b commit 6232fb2

21 files changed

+153
-133
lines changed
 

‎.eslintrc.js

+3-6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@ module.exports = {
44
project: 'tsconfig.json',
55
sourceType: 'module',
66
},
7-
plugins: ['@typescript-eslint/eslint-plugin'],
8-
extends: [
9-
'plugin:@typescript-eslint/recommended',
10-
'plugin:prettier/recommended',
11-
],
7+
plugins: ['@typescript-eslint/eslint-plugin', 'prettier'],
8+
extends: ['plugin:@typescript-eslint/recommended', 'prettier'],
129
root: true,
1310
env: {
1411
node: true,
@@ -21,4 +18,4 @@ module.exports = {
2118
'@typescript-eslint/explicit-module-boundary-types': 'off',
2219
'@typescript-eslint/no-explicit-any': 'off',
2320
},
24-
};
21+
}

‎.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

‎.prettierrc

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
22
"singleQuote": true,
3-
"trailingComma": "all"
4-
}
3+
"trailingComma": "all",
4+
"semi": false,
5+
"tabWidth": 2,
6+
"endOfLine": "auto"
7+
}

‎.vscode/settings.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"editor.tabSize": 2,
3+
"editor.insertSpaces": true,
4+
"editor.renderWhitespace": "boundary",
5+
"editor.rulers": [140],
6+
"editor.formatOnSave": true,
7+
"files.encoding": "utf8",
8+
"files.trimTrailingWhitespace": true,
9+
"files.insertFinalNewline": true,
10+
"search.exclude": {
11+
"public/**": true,
12+
"node_modules/**": true
13+
},
14+
"editor.defaultFormatter": "esbenp.prettier-vscode",
15+
"editor.codeActionsOnSave": {
16+
"source.organizeImports": true,
17+
"source.formatDocument": true,
18+
"source.fixAll.eslint": true
19+
}
20+
}

‎src/app.controller.spec.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
import { Test, TestingModule } from '@nestjs/testing';
2-
import { AppController } from './app.controller';
3-
import { AppService } from './app.service';
1+
import { Test, TestingModule } from '@nestjs/testing'
2+
import { AppController } from './app.controller'
3+
import { AppService } from './app.service'
44

55
describe('AppController', () => {
6-
let appController: AppController;
6+
let appController: AppController
77

88
beforeEach(async () => {
99
const app: TestingModule = await Test.createTestingModule({
1010
controllers: [AppController],
1111
providers: [AppService],
12-
}).compile();
12+
}).compile()
1313

14-
appController = app.get<AppController>(AppController);
15-
});
14+
appController = app.get<AppController>(AppController)
15+
})
1616

1717
describe('root', () => {
1818
it('should return "Hello World!"', () => {
19-
expect(appController.getHello()).toBe('Hello World!');
20-
});
21-
});
22-
});
19+
expect(appController.getHello()).toBe('Hello World!')
20+
})
21+
})
22+
})

‎src/app.controller.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { Controller, Get } from '@nestjs/common';
2-
import { AppService } from './app.service';
1+
import { Controller, Get } from '@nestjs/common'
2+
import { AppService } from './app.service'
33

44
@Controller()
55
export class AppController {
66
constructor(private readonly appService: AppService) {}
77

88
@Get()
99
getHello(): string {
10-
return this.appService.getHello();
10+
return this.appService.getHello()
1111
}
1212
}

‎src/app.module.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Module } from '@nestjs/common';
2-
import { AppController } from './app.controller';
3-
import { AppService } from './app.service';
4-
import { UsersModule } from './users/users.module';
5-
import { PrismaModule } from './prisma/prisma.module';
1+
import { Module } from '@nestjs/common'
2+
import { AppController } from './app.controller'
3+
import { AppService } from './app.service'
4+
import { UsersModule } from './users/users.module'
5+
import { PrismaModule } from './prisma/prisma.module'
66

77
@Module({
88
imports: [UsersModule, PrismaModule],

‎src/app.service.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Injectable } from '@nestjs/common';
1+
import { Injectable } from '@nestjs/common'
22

33
@Injectable()
44
export class AppService {
55
getHello(): string {
6-
return 'Hello World!';
6+
return 'Hello World!'
77
}
88
}

‎src/auth/auth.controller.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Controller, Get, UseGuards, Request, Logger } from '@nestjs/common';
2-
import { AuthGuard } from '@nestjs/passport';
1+
import { Controller, Get, UseGuards, Request, Logger } from '@nestjs/common'
2+
import { AuthGuard } from '@nestjs/passport'
33

44
@Controller('auth')
55
export class AuthController {
6-
private readonly logger = new Logger(AuthController.name);
6+
private readonly logger = new Logger(AuthController.name)
77

88
@Get('login')
99
@UseGuards(AuthGuard('authsch'))
@@ -12,6 +12,6 @@ export class AuthController {
1212
@Get('callback')
1313
@UseGuards(AuthGuard('authsch'))
1414
async oauthRedirect(@Request() req) {
15-
return req.user;
15+
return req.user
1616
}
1717
}

‎src/auth/auth.module.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Module } from '@nestjs/common';
2-
import { UsersModule } from 'src/users/users.module';
3-
import { AuthController } from './auth.controller';
4-
import { HttpModule } from '@nestjs/axios';
5-
import { AuthschStrategy } from './authsch.strategy';
6-
import { PassportModule } from '@nestjs/passport';
1+
import { Module } from '@nestjs/common'
2+
import { UsersModule } from 'src/users/users.module'
3+
import { AuthController } from './auth.controller'
4+
import { HttpModule } from '@nestjs/axios'
5+
import { AuthschStrategy } from './authsch.strategy'
6+
import { PassportModule } from '@nestjs/passport'
77

88
@Module({
99
imports: [

‎src/auth/authsch.strategy.ts

+19-21
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { HttpService } from '@nestjs/axios';
2-
import { Injectable } from '@nestjs/common';
3-
import { PassportStrategy } from '@nestjs/passport';
4-
import { Strategy } from 'passport-oauth2';
5-
import { firstValueFrom } from 'rxjs';
6-
import { UsersService } from 'src/users/users.service';
7-
import { OAuthUser } from './oauthuser';
1+
import { HttpService } from '@nestjs/axios'
2+
import { Injectable } from '@nestjs/common'
3+
import { PassportStrategy } from '@nestjs/passport'
4+
import { Strategy } from 'passport-oauth2'
5+
import { firstValueFrom } from 'rxjs'
6+
import { UsersService } from 'src/users/users.service'
7+
import { OAuthUser } from './oauthuser'
88

9-
const AUTH_SCH_URL = 'https://auth.sch.bme.hu';
9+
const AUTH_SCH_URL = 'https://auth.sch.bme.hu'
1010

1111
@Injectable()
1212
export class AuthschStrategy extends PassportStrategy(Strategy, 'authsch') {
@@ -22,7 +22,7 @@ export class AuthschStrategy extends PassportStrategy(Strategy, 'authsch') {
2222
callbackURL: '/auth/callback',
2323
scope: ['basic', 'sn', 'givenName', 'mail'], // ?? niifEduPersonAttendedCourse = hallgatott tárgyak
2424
// Hallgató által jelenleg hallgatott kurzusok kódjai. Példa: "BMEVIAUA218;BMEVIIIA316"
25-
});
25+
})
2626
}
2727

2828
async validate(accessToken: string): Promise<any> {
@@ -32,22 +32,20 @@ export class AuthschStrategy extends PassportStrategy(Strategy, 'authsch') {
3232
`${AUTH_SCH_URL}/api/profile?access_token=${accessToken}`,
3333
),
3434
)
35-
).data;
35+
).data
3636

3737
const user = await this.usersService.findByAuthSchId(
3838
responseUser.internal_id,
39-
);
40-
if (user) return user;
39+
)
40+
if (user) return user
4141
else {
42-
const newUser = await this.usersService.create(
43-
{
44-
authSchId: responseUser.internal_id,
45-
firstName: responseUser.givenName,
46-
lastName: responseUser.sn,
47-
email: responseUser.mail
48-
}
49-
);
50-
return newUser;
42+
const newUser = await this.usersService.create({
43+
authSchId: responseUser.internal_id,
44+
firstName: responseUser.givenName,
45+
lastName: responseUser.sn,
46+
email: responseUser.mail,
47+
})
48+
return newUser
5149
}
5250
}
5351
}

‎src/auth/oauthuser.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export interface OAuthUser {
2-
sn: string;
3-
givenName: string;
4-
internal_id: string;
5-
mail: string;
2+
sn: string
3+
givenName: string
4+
internal_id: string
5+
mail: string
66
}

‎src/main.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { NestFactory } from '@nestjs/core';
2-
import { AppModule } from './app.module';
3-
import 'dotenv/config';
1+
import { NestFactory } from '@nestjs/core'
2+
import { AppModule } from './app.module'
3+
import 'dotenv/config'
44

55
async function bootstrap() {
6-
const app = await NestFactory.create(AppModule);
7-
await app.listen(process.env.APP_PORT || 3000);
6+
const app = await NestFactory.create(AppModule)
7+
await app.listen(process.env.APP_PORT || 3000)
88
}
9-
bootstrap();
9+
bootstrap()

‎src/prisma/prisma.module.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Module } from '@nestjs/common';
2-
import { PrismaService } from './prisma.service';
1+
import { Module } from '@nestjs/common'
2+
import { PrismaService } from './prisma.service'
33

44
@Module({
55
providers: [PrismaService],
6-
exports: [PrismaService]
6+
exports: [PrismaService],
77
})
88
export class PrismaModule {}

‎src/prisma/prisma.service.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import { INestApplication, Injectable, OnModuleInit } from '@nestjs/common';
2-
import { PrismaClient } from '@prisma/client';
1+
import { INestApplication, Injectable, OnModuleInit } from '@nestjs/common'
2+
import { PrismaClient } from '@prisma/client'
33

44
@Injectable()
55
export class PrismaService extends PrismaClient implements OnModuleInit {
66
async onModuleInit() {
7-
await this.$connect();
7+
await this.$connect()
88
}
99

1010
async enableShutdownHooks(app: INestApplication) {
1111
this.$on('beforeExit', async () => {
12-
await app.close();
13-
});
12+
await app.close()
13+
})
1414
}
15-
}
15+
}

‎src/users/users.controller.spec.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
import { Test, TestingModule } from '@nestjs/testing';
2-
import { UsersController } from './users.controller';
3-
import { UsersService } from './users.service';
1+
import { Test, TestingModule } from '@nestjs/testing'
2+
import { UsersController } from './users.controller'
3+
import { UsersService } from './users.service'
44

55
describe('UsersController', () => {
6-
let controller: UsersController;
6+
let controller: UsersController
77

88
beforeEach(async () => {
99
const module: TestingModule = await Test.createTestingModule({
1010
controllers: [UsersController],
1111
providers: [UsersService],
12-
}).compile();
12+
}).compile()
1313

14-
controller = module.get<UsersController>(UsersController);
15-
});
14+
controller = module.get<UsersController>(UsersController)
15+
})
1616

1717
it('should be defined', () => {
18-
expect(controller).toBeDefined();
19-
});
20-
});
18+
expect(controller).toBeDefined()
19+
})
20+
})

‎src/users/users.controller.ts

+12-9
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,39 @@ import {
66
Patch,
77
Param,
88
Delete,
9-
} from '@nestjs/common';
10-
import { UsersService } from './users.service';
11-
import { Prisma } from '@prisma/client';
9+
} from '@nestjs/common'
10+
import { UsersService } from './users.service'
11+
import { Prisma } from '@prisma/client'
1212

1313
@Controller('users')
1414
export class UsersController {
1515
constructor(private readonly usersService: UsersService) {}
1616

1717
@Post()
1818
create(@Body() createUserDto: Prisma.UserCreateInput) {
19-
return this.usersService.create(createUserDto);
19+
return this.usersService.create(createUserDto)
2020
}
2121

2222
@Get()
2323
findAll() {
24-
return this.usersService.findAll();
24+
return this.usersService.findAll()
2525
}
2626

2727
@Get(':id')
2828
findOne(@Param('id') id: string) {
29-
return this.usersService.findOne(Number(id));
29+
return this.usersService.findOne(Number(id))
3030
}
3131

3232
@Patch(':id')
33-
update(@Param('id') id: string, @Body() updateUserDto: Prisma.UserUpdateInput) {
34-
return this.usersService.update(Number(id), updateUserDto);
33+
update(
34+
@Param('id') id: string,
35+
@Body() updateUserDto: Prisma.UserUpdateInput,
36+
) {
37+
return this.usersService.update(Number(id), updateUserDto)
3538
}
3639

3740
@Delete(':id')
3841
remove(@Param('id') id: string) {
39-
return this.usersService.remove(Number(id));
42+
return this.usersService.remove(Number(id))
4043
}
4144
}

‎src/users/users.module.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { Module } from '@nestjs/common';
2-
import { UsersService } from './users.service';
3-
import { UsersController } from './users.controller';
4-
import { PrismaModule } from 'src/prisma/prisma.module';
1+
import { Module } from '@nestjs/common'
2+
import { UsersService } from './users.service'
3+
import { UsersController } from './users.controller'
4+
import { PrismaModule } from 'src/prisma/prisma.module'
55

66
@Module({
77
imports: [PrismaModule],
88
controllers: [UsersController],
9-
providers: [UsersService]
9+
providers: [UsersService],
1010
})
1111
export class UsersModule {}

‎src/users/users.service.spec.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import { Test, TestingModule } from '@nestjs/testing';
2-
import { UsersService } from './users.service';
1+
import { Test, TestingModule } from '@nestjs/testing'
2+
import { UsersService } from './users.service'
33

44
describe('UsersService', () => {
5-
let service: UsersService;
5+
let service: UsersService
66

77
beforeEach(async () => {
88
const module: TestingModule = await Test.createTestingModule({
99
providers: [UsersService],
10-
}).compile();
10+
}).compile()
1111

12-
service = module.get<UsersService>(UsersService);
13-
});
12+
service = module.get<UsersService>(UsersService)
13+
})
1414

1515
it('should be defined', () => {
16-
expect(service).toBeDefined();
17-
});
18-
});
16+
expect(service).toBeDefined()
17+
})
18+
})

‎src/users/users.service.ts

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { Injectable } from '@nestjs/common';
1+
import { Injectable } from '@nestjs/common'
22
import { User, Prisma } from '@prisma/client'
3-
import { PrismaService } from '../prisma/prisma.service';
3+
import { PrismaService } from '../prisma/prisma.service'
44

55
@Injectable()
66
export class UsersService {
77
constructor(private prisma: PrismaService) {}
88

99
async create(data: Prisma.UserCreateInput): Promise<User> {
10-
return this.prisma.user.create({ data });
10+
return this.prisma.user.create({ data })
1111
}
1212

1313
async findAll(): Promise<User[]> {
@@ -19,16 +19,14 @@ export class UsersService {
1919
}
2020

2121
async findByAuthSchId(authSchId: string): Promise<User> {
22-
return this.prisma.user.findUnique({ where: { authSchId: authSchId } });
22+
return this.prisma.user.findUnique({ where: { authSchId: authSchId } })
2323
}
2424

25-
async update(id: number,
26-
data: Prisma.UserUpdateInput
27-
): Promise<User> {
28-
return this.prisma.user.update({ data, where: {id: id } });
25+
async update(id: number, data: Prisma.UserUpdateInput): Promise<User> {
26+
return this.prisma.user.update({ data, where: { id: id } })
2927
}
3028

3129
async remove(id: number): Promise<User> {
32-
return this.prisma.user.delete({where: { id: id }});
30+
return this.prisma.user.delete({ where: { id: id } })
3331
}
3432
}

‎test/app.e2e-spec.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
import { Test, TestingModule } from '@nestjs/testing';
2-
import { INestApplication } from '@nestjs/common';
3-
import * as request from 'supertest';
4-
import { AppModule } from './../src/app.module';
1+
import { Test, TestingModule } from '@nestjs/testing'
2+
import { INestApplication } from '@nestjs/common'
3+
import * as request from 'supertest'
4+
import { AppModule } from './../src/app.module'
55

66
describe('AppController (e2e)', () => {
7-
let app: INestApplication;
7+
let app: INestApplication
88

99
beforeEach(async () => {
1010
const moduleFixture: TestingModule = await Test.createTestingModule({
1111
imports: [AppModule],
12-
}).compile();
12+
}).compile()
1313

14-
app = moduleFixture.createNestApplication();
15-
await app.init();
16-
});
14+
app = moduleFixture.createNestApplication()
15+
await app.init()
16+
})
1717

1818
it('/ (GET)', () => {
1919
return request(app.getHttpServer())
2020
.get('/')
2121
.expect(200)
22-
.expect('Hello World!');
23-
});
24-
});
22+
.expect('Hello World!')
23+
})
24+
})

0 commit comments

Comments
 (0)
Please sign in to comment.