users. e2e tests added

pashidlos · pashidlos · commit 5d800f4f1af9 · 2020-05-23T22:19:45.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json",
-    "docker:build_api": "jest && docker build -t visualregressiontracker/api:$npm_package_version -f ./Dockerfile . && docker push visualregressiontracker/api:$npm_package_version",
+    "docker:build_api": "npm run test && npm run test:e2e && docker build -t visualregressiontracker/api:$npm_package_version -f ./Dockerfile . && docker push visualregressiontracker/api:$npm_package_version",
     "docker:build_migration": "docker build -t visualregressiontracker/migration:0.0.2 -f ./prisma/Dockerfile ./prisma"
   },
   "dependencies": {
@@ -53,6 +53,7 @@
     "@nestjs/schematics": "^7.0.0",
     "@nestjs/testing": "^7.0.0",
     "@prisma/cli": "^2.0.0-beta.5",
+    "@types/bcryptjs": "^2.4.2",
     "@types/express": "^4.17.3",
     "@types/jest": "25.1.4",
     "@types/node": "^13.9.1",
@@ -61,6 +62,7 @@
     "@types/pixelmatch": "^5.1.0",
     "@types/pngjs": "^3.4.2",
     "@types/supertest": "^2.0.8",
+    "@types/uuid-apikey": "^1.4.0",
     "@typescript-eslint/eslint-plugin": "^2.23.0",
     "@typescript-eslint/parser": "^2.23.0",
     "eslint": "^6.8.0",
diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
@@ -20,8 +20,8 @@ export class AuthService {
     return uuidAPIKey.create({ noDashes: true }).apiKey;
   }
 
-  async compare(password1: string, password2: string): Promise<boolean> {
-    return await compare(password1, password2);
+  async compare(password: string, hashedPassword: string): Promise<boolean> {
+    return await compare(password, hashedPassword);
   }
 
   signToken(user: User): string {
diff --git a/src/auth/jwt.strategy.ts b/src/auth/jwt.strategy.ts
@@ -3,7 +3,7 @@ import { PassportStrategy } from '@nestjs/passport';
 import { Injectable, HttpException, HttpStatus } from '@nestjs/common';
 import { JwtPayload } from './jwt-payload.model';
 import { ConfigService } from '@nestjs/config';
-import { PrismaService } from 'src/prisma/prisma.service';
+import { PrismaService } from '../prisma/prisma.service';
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy) {
diff --git a/src/builds/builds.module.ts b/src/builds/builds.module.ts
@@ -1,9 +1,9 @@
 import { Module } from '@nestjs/common';
 import { BuildsService } from './builds.service';
 import { BuildsController } from './builds.controller';
-import { UsersModule } from 'src/users/users.module';
-import { PrismaService } from 'src/prisma/prisma.service';
-import { TestRunsModule } from 'src/test-runs/test-runs.module';
+import { UsersModule } from '../users/users.module';
+import { PrismaService } from '../prisma/prisma.service';
+import { TestRunsModule } from '../test-runs/test-runs.module';
 
 @Module({
   imports: [UsersModule, TestRunsModule],
diff --git a/src/projects/projects.module.ts b/src/projects/projects.module.ts
@@ -1,9 +1,9 @@
 import { Module } from '@nestjs/common';
 import { ProjectsService } from './projects.service';
 import { ProjectsController } from './projects.controller';
-import { BuildsModule } from 'src/builds/builds.module';
-import { TestVariationsModule } from 'src/test-variations/test-variations.module';
-import { PrismaService } from 'src/prisma/prisma.service';
+import { BuildsModule } from '../builds/builds.module';
+import { TestVariationsModule } from '../test-variations/test-variations.module';
+import { PrismaService } from '../prisma/prisma.service';
 
 @Module({
   imports: [BuildsModule, TestVariationsModule],
diff --git a/src/test-runs/test-runs.module.ts b/src/test-runs/test-runs.module.ts
@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TestRunsService } from './test-runs.service';
-import { SharedModule } from 'src/shared/shared.module';
-import { PrismaService } from 'src/prisma/prisma.service';
+import { SharedModule } from '../shared/shared.module';
+import { PrismaService } from '../prisma/prisma.service';
 import { TestRunsController } from './test-runs.controller';
 
 @Module({
diff --git a/src/test-variations/test-variations.module.ts b/src/test-variations/test-variations.module.ts
@@ -1,8 +1,7 @@
 import { Module } from '@nestjs/common';
 import { TestVariationsService } from './test-variations.service';
 import { TestVariationsController } from './test-variations.controller';
-import { TestRunsModule } from 'src/test-runs/test-runs.module';
-import { PrismaService } from 'src/prisma/prisma.service';
+import { PrismaService } from '../prisma/prisma.service';
 
 @Module({
   providers: [TestVariationsService, PrismaService],
diff --git a/src/test/test.module.ts b/src/test/test.module.ts
@@ -1,10 +1,10 @@
 import { Module } from '@nestjs/common';
 import { TestService } from './test.service';
 import { TestController } from './test.controller';
-import { TestRunsModule } from 'src/test-runs/test-runs.module';
-import { TestVariationsModule } from 'src/test-variations/test-variations.module';
-import { UsersModule } from 'src/users/users.module';
-import { PrismaService } from 'src/prisma/prisma.service';
+import { TestRunsModule } from '../test-runs/test-runs.module';
+import { TestVariationsModule } from '../test-variations/test-variations.module';
+import { UsersModule } from '../users/users.module';
+import { PrismaService } from '../prisma/prisma.service';
 
 @Module({
   imports: [TestRunsModule, TestVariationsModule, UsersModule],
diff --git a/src/users/users.controller.ts b/src/users/users.controller.ts
@@ -49,24 +49,14 @@ export class UsersController {
         return this.usersService.changePassword(user, password)
     }
 
-    @Get(':id')
-    @ApiParam({ name: 'id', required: true })
-    @ApiOkResponse({ type: UserDto })
-    @ApiBearerAuth()
-    @UseGuards(JwtAuthGuard)
-    get(@Param('id', new ParseUUIDPipe()) id: string): Promise<UserDto> {
-        return this.usersService.get(id);
-    }
-
-    @Put(':id')
-    @ApiParam({ name: 'id', required: true })
+    @Put()
     @ApiOkResponse({ type: UserLoginResponseDto })
     @ApiBearerAuth()
     @UseGuards(JwtAuthGuard)
-    updated(
-        @Param('id', new ParseUUIDPipe()) id: string,
+    update(
+        @CurrentUser() user: User,
         @Body() updateUserDto: UpdateUserDto
     ): Promise<UserLoginResponseDto> {
-        return this.usersService.update(id, updateUserDto);
+        return this.usersService.update(user.id, updateUserDto);
     }
 }
diff --git a/src/users/users.module.ts b/src/users/users.module.ts
@@ -1,8 +1,8 @@
 import { Module } from '@nestjs/common';
 import { UsersService } from './users.service';
-import { PrismaService } from 'src/prisma/prisma.service';
+import { PrismaService } from '../prisma/prisma.service';
 import { UsersController } from './users.controller';
-import { AuthModule } from 'src/auth/auth.module';
+import { AuthModule } from '../auth/auth.module';
 
 @Module({
   imports: [AuthModule],
diff --git a/src/users/users.service.ts b/src/users/users.service.ts
@@ -67,8 +67,12 @@ export class UsersService {
     }
   }
 
+  async findOne(id: string): Promise<User> {
+    return this.prismaService.user.findOne({ where: { id } })
+  }
+
   async get(id: string): Promise<UserDto> {
-    const user = await this.prismaService.user.findOne({ where: { id } })
+    const user = await this.findOne(id)
     return new UserDto(user)
   }
 
diff --git a/test/app.e2e-spec.ts b/test/app.e2e-spec.ts
diff --git a/test/preconditions.ts b/test/preconditions.ts
@@ -0,0 +1,30 @@
+import { INestApplication } from '@nestjs/common';
+import { UsersService } from 'src/users/users.service';
+import { UserLoginRequestDto } from 'src/users/dto/user-login-request.dto';
+import uuidAPIKey from 'uuid-apikey';
+import request, { Test } from 'supertest';
+import { CreateUserDto } from 'src/users/dto/user-create.dto';
+
+export const generateUser = (password: string = '123456'): { email: string, password: string, firstName: string, lastName: string } => ({
+    email: `${uuidAPIKey.create().uuid}@example.com'`,
+    password,
+    firstName: 'fName',
+    lastName: 'lName',
+})
+
+export const requestWithAuth = (app: INestApplication, method: 'post' | 'get' | 'put' | 'delete', url: string, body = {}, token: string): Test =>
+    request(app.getHttpServer())
+    [method](url)
+        .set('Authorization', 'Bearer ' + token)
+        .send(body)
+
+// export const haveUserCreated = (usersService: UsersService, password: string = '123456') => {
+//     return usersService.create({
+//         email: `${uuidAPIKey.create().uuid}@example.com'`,
+//         password,
+//         firstName: 'fName',
+//         lastName: 'lName',
+//     })
+// }
+
+// export const haveUserLogged = (usersService: UsersService, user: UserLoginRequestDto) => usersService.login(user)
diff --git a/test/users.e2e-spec.ts b/test/users.e2e-spec.ts
@@ -0,0 +1,127 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { INestApplication } from '@nestjs/common';
+import request from 'supertest';
+import { AppModule } from '../src/app.module';
+import uuidAPIKey from 'uuid-apikey';
+import { UsersService } from '../src/users/users.service';
+import { CreateUserDto } from '../src/users/dto/user-create.dto';
+import { UserLoginRequestDto } from '../src/users/dto/user-login-request.dto';
+import { compareSync } from 'bcryptjs';
+import { requestWithAuth, generateUser } from './preconditions';
+
+describe('Users (e2e)', () => {
+  let app: INestApplication;
+  let usersService: UsersService;
+
+  beforeAll(async () => {
+    const moduleFixture: TestingModule = await Test.createTestingModule({
+      imports: [AppModule],
+    }).compile();
+
+    app = moduleFixture.createNestApplication();
+    usersService = moduleFixture.get<UsersService>(UsersService)
+    await app.init();
+  });
+
+  afterAll(async () => {
+    await app.close();
+  });
+
+  it('POST /register', () => {
+    const user: CreateUserDto = {
+      email: `${uuidAPIKey.create().uuid}@example.com'`,
+      password: '123456',
+      firstName: 'fName',
+      lastName: 'lName',
+    }
+    return request(app.getHttpServer())
+      .post('/users/register')
+      .send(user)
+      .expect(201)
+      .expect(res => {
+        expect(res.body.email).toBe(user.email);
+        expect(res.body.firstName).toBe(user.firstName);
+        expect(res.body.lastName).toBe(user.lastName);
+        expect(res.body.apiKey).not.toBeNull();
+      })
+  });
+
+  it('POST /login', async () => {
+    const password = '123456'
+    const user = await usersService.create(generateUser(password))
+    const loginData: UserLoginRequestDto = {
+      email: user.email,
+      password
+    }
+
+    return request(app.getHttpServer())
+      .post('/users/login')
+      .send(loginData)
+      .expect(201)
+      .expect(res => {
+        expect(res.body.id).toBe(user.id);
+        expect(res.body.email).toBe(user.email);
+        expect(res.body.firstName).toBe(user.firstName);
+        expect(res.body.lastName).toBe(user.lastName);
+        expect(res.body.apiKey).toBe(user.apiKey);
+        expect(res.body.token).not.toBeNull();
+      })
+  });
+
+  it('GET /newApiKey', async () => {
+    const password = '123456'
+    const user = await usersService.create(generateUser(password))
+    const loggedUser = await usersService.login({
+      email: user.email,
+      password
+    })
+
+    const res = await requestWithAuth(app, 'get', '/users/newApiKey', {}, loggedUser.token)
+      .expect(200)
+
+    const newUser = await usersService.findOne(user.id)
+    expect(res.text).not.toBe(user.apiKey);
+    expect(res.text).toBe(newUser.apiKey);
+  });
+
+  it('PUT /password', async () => {
+    const newPassword = 'newPassword'
+    const password = '123456'
+    const user = await usersService.create(generateUser(password))
+    const loggedUser = await usersService.login({
+      email: user.email,
+      password
+    })
+
+    await requestWithAuth(app, 'put', '/users/password', { password: newPassword }, loggedUser.token)
+      .expect(200)
+
+    const newUser = await usersService.findOne(user.id)
+    expect(compareSync(newPassword, newUser.password)).toBe(true);
+  });
+
+  it('PUT /', async () => {
+    const password = '123456'
+    const user = await usersService.create(generateUser(password))
+    const editedUser = {
+      email: `${uuidAPIKey.create().uuid}@example.com'`,
+      firstName: 'EDITEDfName',
+      lastName: 'EDITEDlName',
+    }
+
+    const loggedUser = await usersService.login({
+      email: user.email,
+      password
+    })
+
+    const res = await requestWithAuth(app, 'put', '/users', editedUser, loggedUser.token)
+      .expect(200)
+
+    expect(res.body.id).toBe(user.id);
+    expect(res.body.email).toBe(editedUser.email);
+    expect(res.body.firstName).toBe(editedUser.firstName);
+    expect(res.body.lastName).toBe(editedUser.lastName);
+    expect(res.body.apiKey).toBe(user.apiKey);
+    expect(res.body.token).not.toBeNull();
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ export class AuthService {`
`20`	`20`	`return uuidAPIKey.create({ noDashes: true }).apiKey;`
`21`	`21`	`}`
`22`	`22`
`23`		`- async compare(password1: string, password2: string): Promise<boolean> {`
`24`		`- return await compare(password1, password2);`
	`23`	`+ async compare(password: string, hashedPassword: string): Promise<boolean> {`
	`24`	`+ return await compare(password, hashedPassword);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`signToken(user: User): string {`