Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server
1 result
Show changes
Commits on Source (6)
Hide whitespace changes
Inline Side-by-side
Showing
with 189 additions and 133 deletions
.gitlab-ci.yml
View file @ e9c77cb6
...@@ -12,6 +12,10 @@ build: ...@@ -12,6 +12,10 @@ build:
image: docker:18.09 image: docker:18.09
services: services:
- docker:18.09-dind - docker:18.09-dind
only:
- dev
- rec
- master
stage: build stage: build
script: script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
...@@ -32,12 +36,15 @@ deploy_dev: ...@@ -32,12 +36,15 @@ deploy_dev:
- docker system prune -a -f - docker system prune -a -f
code_analysis: code_analysis:
image: skilldlabs/sonar-scanner:3.4.0 image: skilldlabs/sonar-scanner:4.0.0
services: services:
- docker:18.09-dind - docker:18.09-dind
stage: sonar-analysis stage: sonar-analysis
only: only:
- dev - dev
before_script:
- export NODE_PATH=$NODE_PATH:`npm root -g`
- npm install -g typescript
script: script:
- > - >
sonar-scanner sonar-scanner
...@@ -48,3 +55,14 @@ code_analysis: ...@@ -48,3 +55,14 @@ code_analysis:
-Dsonar.host.url=${SONAR_URL} -Dsonar.host.url=${SONAR_URL}
-Dsonar.projectKey=${SONAR_PROJECT_KEY} -Dsonar.projectKey=${SONAR_PROJECT_KEY}
-Dsonar.login=${SONAR_TOKEN} -Dsonar.login=${SONAR_TOKEN}
mr:
image: docker:18.09
services:
- docker:18.09-dind
stage: build
only:
- merge_requests
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build .
package-lock.json
View file @ e9c77cb6
...@@ -3538,6 +3538,11 @@ ...@@ -3538,6 +3538,11 @@
"integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==", "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
"dev": true "dev": true
}, },
"class-transformer": {
"version": "0.3.1",
"resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.3.1.tgz",
"integrity": "sha512-cKFwohpJbuMovS8xVLmn8N2AUbAuc8pVo4zEfsUVo8qgECOogns1WVk/FkOZoxhOPTyTYFckuoH+13FO+MQ8GA=="
},
"class-utils": { "class-utils": {
"version": "0.3.6", "version": "0.3.6",
"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
......
package.json
View file @ e9c77cb6
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
"@nestjs/swagger": "^4.7.5", "@nestjs/swagger": "^4.7.5",
"@types/bcrypt": "^3.0.0", "@types/bcrypt": "^3.0.0",
"bcrypt": "^5.0.0", "bcrypt": "^5.0.0",
"class-transformer": "^0.3.1",
"class-validator": "^0.12.2", "class-validator": "^0.12.2",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"ejs": "^3.1.5", "ejs": "^3.1.5",
......
src/auth/auth.controller.spec.ts
View file @ e9c77cb6
import { JwtModule, JwtService } from '@nestjs/jwt'; import { JwtModule } from '@nestjs/jwt';
import { getModelToken } from '@nestjs/mongoose'; import { getModelToken } from '@nestjs/mongoose';
import { PassportModule } from '@nestjs/passport'; import { PassportModule } from '@nestjs/passport';
import { Test, TestingModule } from '@nestjs/testing'; import { Test, TestingModule } from '@nestjs/testing';
import { ConfigurationModule } from '../configuration/configuration.module'; import { ConfigurationModule } from '../configuration/configuration.module';
import { MailerModule } from '../mailer/mailer.module'; import { MailerModule } from '../mailer/mailer.module';
import { User } from '../users/user.schema'; import { User } from '../users/user.schema';
import { UsersModule } from '../users/users.module';
import { UsersService } from '../users/users.service'; import { UsersService } from '../users/users.service';
import { AuthController } from './auth.controller'; import { AuthController } from './auth.controller';
import { AuthService } from './auth.service'; import { AuthService } from './auth.service';
import { JwtStrategy } from './strategy/jwt.strategy';
describe('AuthController', () => { describe('AuthController', () => {
let controller: AuthController; let controller: AuthController;
......
src/auth/auth.service.spec.ts
View file @ e9c77cb6
...@@ -51,14 +51,14 @@ describe('AuthService', () => { ...@@ -51,14 +51,14 @@ describe('AuthService', () => {
email: 'jacques.dupont@mii.com', email: 'jacques.dupont@mii.com',
role: 0, role: 0,
}; };
const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; //NOSONAR
jest.spyOn(service, 'validateUser').mockImplementation(async (): Promise<any> => result); jest.spyOn(service, 'validateUser').mockImplementation(async (): Promise<any> => result);
expect(await service.validateUser(loginDto)).toBe(result); expect(await service.validateUser(loginDto)).toBe(result);
}); });
it('should not validateUser', async () => { it('should not validateUser', async () => {
const result = null; const result = null;
const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; //NOSONAR
jest.spyOn(service, 'validateUser').mockImplementation(async (): Promise<any> => result); jest.spyOn(service, 'validateUser').mockImplementation(async (): Promise<any> => result);
expect(await service.validateUser(loginDto)).toBe(result); expect(await service.validateUser(loginDto)).toBe(result);
}); });
...@@ -67,28 +67,28 @@ describe('AuthService', () => { ...@@ -67,28 +67,28 @@ describe('AuthService', () => {
describe('login', () => { describe('login', () => {
it('should login user jacques.dupont@mii.com', async () => { it('should login user jacques.dupont@mii.com', async () => {
const result = { username: ' jacques.dupont@mii.com', token: 'tok3n!1sfq' }; const result = { username: ' jacques.dupont@mii.com', token: 'tok3n!1sfq' };
const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; //NOSONAR
jest.spyOn(service, 'validateUser').mockImplementation(async (): Promise<{ username; token }> => result); jest.spyOn(service, 'validateUser').mockImplementation(async (): Promise<{ username; token }> => result);
expect(await service.validateUser(loginDto)).toBe(result); expect(await service.validateUser(loginDto)).toBe(result);
}); });
it('should not login jacques.dupont@mii.com, email not verified', async () => { it('should not login jacques.dupont@mii.com, email not verified', async () => {
const result = new HttpException('Invalid credentials', HttpStatus.UNAUTHORIZED); const result = new HttpException('Invalid credentials', HttpStatus.UNAUTHORIZED);
const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; //NOSONAR
jest.spyOn(service, 'validateUser').mockImplementation(async (): Promise<any> => result); jest.spyOn(service, 'validateUser').mockImplementation(async (): Promise<any> => result);
expect(await service.validateUser(loginDto)).toBe(result); expect(await service.validateUser(loginDto)).toBe(result);
}); });
it('should not login jacques.dupont@mii.com, bad password', async () => { it('should not login jacques.dupont@mii.com, bad password', async () => {
const result = new HttpException('Invalid credentials', HttpStatus.UNAUTHORIZED); const result = new HttpException('Invalid credentials', HttpStatus.UNAUTHORIZED);
const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; //NOSONAR
jest.spyOn(service, 'validateUser').mockImplementation(async (): Promise<any> => result); jest.spyOn(service, 'validateUser').mockImplementation(async (): Promise<any> => result);
expect(await service.validateUser(loginDto)).toBe(result); expect(await service.validateUser(loginDto)).toBe(result);
}); });
it('should not login jacques.dupont@mii.com, username does not exist', async () => { it('should not login jacques.dupont@mii.com, username does not exist', async () => {
const result = new HttpException('Invalid credentials', HttpStatus.UNAUTHORIZED); const result = new HttpException('Invalid credentials', HttpStatus.UNAUTHORIZED);
const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; //NOSONAR
jest.spyOn(service, 'validateUser').mockImplementation(async (): Promise<any> => result); jest.spyOn(service, 'validateUser').mockImplementation(async (): Promise<any> => result);
expect(await service.validateUser(loginDto)).toBe(result); expect(await service.validateUser(loginDto)).toBe(result);
}); });
......
src/main.ts
View file @ e9c77cb6
import { ValidationPipe } from '@nestjs/common';
import { NestFactory } from '@nestjs/core'; import { NestFactory } from '@nestjs/core';
import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger'; import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
import { AppModule } from './app.module'; import { AppModule } from './app.module';
async function bootstrap() { async function bootstrap() {
const app = await NestFactory.create(AppModule); const app = await NestFactory.create(AppModule);
app.useGlobalPipes(new ValidationPipe());
const options = new DocumentBuilder().setTitle('RAM').setDescription('RAM API description').setVersion('1.0').build(); const options = new DocumentBuilder().setTitle('RAM').setDescription('RAM API description').setVersion('1.0').build();
const document = SwaggerModule.createDocument(app, options); const document = SwaggerModule.createDocument(app, options);
SwaggerModule.setup('api', app, document); SwaggerModule.setup('api', app, document);
......
src/structures/dto/create-structure.dto.ts
View file @ e9c77cb6
import { Type } from 'class-transformer';
import { ArrayNotEmpty, IsNotEmpty, ValidateNested } from 'class-validator';
import { Address } from '../schemas/address.schema';
import { Week } from '../schemas/week.schema'; import { Week } from '../schemas/week.schema';
export class CreateStructureDto { export class CreateStructureDto {
id: number; id: number;
numero: number; numero: string;
dateDeCreation: string; createdAt: string;
derniereModification: string; updatedAt: string;
nomDeLusager: string;
votreStructureEstElle: string; @IsNotEmpty()
nomDeVotreStructure: string; structureRepresentation: string;
@IsNotEmpty()
structureName: string;
@ArrayNotEmpty()
structureType: string[];
@IsNotEmpty()
description: string; description: string;
activitesMaintenuesDansLeCadreDuConfinement: string;
n: string; @ValidateNested({ each: true })
voie: string; @Type(() => Address)
telephone: string; address: Address;
courriel: string;
siteWeb: string; @IsNotEmpty()
contactPhone: string;
@IsNotEmpty()
contactMail: string;
website: string;
facebook: string; facebook: string;
twitter: string; twitter: string;
instagram: string; instagram: string;
civilite: string; gender: string;
nom: string; contactName: string;
prenom: string; contactSurname: string;
fonction: string; fonction: string;
accessibilitePersonnesAMobiliteReduitePmr: string; lockdownActivity: string;
modalitesDacces: string[]; pmrAccess: boolean;
labelsEtQualifications: string[]; publicsAccompaniment: string[];
publicsAcceptes: string[]; proceduresAccompaniment: string[];
fermeturesExceptionnelles: string; @ArrayNotEmpty()
jaccompagneLesUsagersDansLeursDemarchesEnLigne: boolean; accessModality: string[];
accompagnementDesDemarches: string[];
autresAccompagnements: string; documentsMeeting: string;
lesCompetencesDeBase: string[]; labelsQualifications: string[];
accesAuxDroits: string[];
insertionSocialeEtProfessionnelle: string[]; @ArrayNotEmpty()
aideALaParentalite: string[]; publics: string[];
cultureEtSecuriteNumerique: string[];
wifiEnAccesLibre: boolean; nbComputers: number;
nbComputers: boolean; nbPrinters: number;
nombre: string; nbTablets: number;
tablettes: boolean; nbNumericTerminal: number;
bornesNumeriques: boolean; exceptionalClosures: string;
imprimantes: boolean; equipmentsAndServices: string[];
precisionsSiNecessaire: string;
statutJuridique: string;
appartenezVousAUnReseauDeMediation: string;
precisezLequel: string;
idDeLitemStructureDansDirectus: string;
statutDeLitemStructureDansDirectus: string;
idDeLitemOffreDansDirectus: string;
statut: string;
typeDeStructure: string[];
commune: string;
hours: Week; hours: Week;
equipmentsDetails: string;
equipmentsAccessType: string[];
baseSkills: string[];
accessRight: string[];
parentingHelp: string[];
socialAndProfessional: string[];
digitalCultureSecurity: string[];
coord: number[];
} }
src/structures/schemas/address.schema.ts 0 → 100644
View file @ e9c77cb6
import { SchemaFactory } from '@nestjs/mongoose';
import { IsNotEmpty } from 'class-validator';
export type AddressDocument = Address & Document;
export class Address {
numero: string;
@IsNotEmpty()
street: string;
@IsNotEmpty()
commune: string;
}
export const AddressSchema = SchemaFactory.createForClass(Address);
src/structures/schemas/structure.schema.ts
View file @ e9c77cb6
import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'; import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
import { Document } from 'mongoose'; import { Document } from 'mongoose';
import { Address } from './address.schema';
import { Week } from './week.schema'; import { Week } from './week.schema';
export type StructureDocument = Structure & Document; export type StructureDocument = Structure & Document;
...@@ -13,43 +14,36 @@ export class Structure { ...@@ -13,43 +14,36 @@ export class Structure {
numero: string; numero: string;
@Prop() @Prop()
dateDeCreation: string; createdAt: string;
@Prop() @Prop()
derniereModification: string; updatedAt: string;
@Prop() @Prop()
nomDeLusager: string; structureRepresentation: string;
@Prop() @Prop()
votreStructureEstElle: string; structureName: string;
@Prop() @Prop()
nomDeVotreStructure: string; structureType: string[];
@Prop() @Prop()
description: string; description: string;
@Prop() @Prop()
activitesMaintenuesDansLeCadreDuConfinement: string; lockdownActivity: string;
@Prop() @Prop()
n: string; address: Address;
@Prop() @Prop()
voie: string; contactPhone: string;
@Prop() @Prop()
address: string; contactMail: string;
@Prop()
telephone: string;
@Prop()
courriel: string;
@Prop() @Prop()
siteWeb: string; website: string;
@Prop() @Prop()
facebook: string; facebook: string;
...@@ -61,91 +55,76 @@ export class Structure { ...@@ -61,91 +55,76 @@ export class Structure {
instagram: string; instagram: string;
@Prop() @Prop()
civilite: string; gender: string;
@Prop() @Prop()
nom: string; contactName: string;
@Prop() @Prop()
prenom: string; contactSurname: string;
@Prop() @Prop()
fonction: string; fonction: string;
@Prop() @Prop()
accessibilitePersonnesAMobiliteReduitePmr: string; pmrAccess: boolean;
@Prop() @Prop()
modalitesDacces: string[]; accessModality: string[];
@Prop() @Prop()
labelsEtQualifications: string[]; documentsMeeting: string;
@Prop() @Prop()
publicsAcceptes: string[]; labelsQualifications: string[];
@Prop() @Prop()
fermeturesExceptionnelles: string; publics: string[];
@Prop() @Prop()
jaccompagneLesUsagersDansLeursDemarchesEnLigne: boolean; exceptionalClosures: string;
@Prop() @Prop()
accompagnementDesDemarches: string[]; publicsAccompaniment: string[];
@Prop() @Prop()
autresAccompagnements: string; proceduresAccompaniment: string[];
@Prop() @Prop()
lesCompetencesDeBase: string[]; baseSkills: string[];
@Prop() @Prop()
accesAuxDroits: string[]; accessRight: string[];
@Prop() @Prop()
insertionSocialeEtProfessionnelle: string[]; socialAndProfessional: string[];
@Prop() @Prop()
aideALaParentalite: string[]; parentingHelp: string[];
@Prop() @Prop()
cultureEtSecuriteNumerique: string[]; digitalCultureSecurity: string[];
@Prop() @Prop()
equipementsEtServicesProposes: string[]; equipmentsDetails: string;
@Prop() @Prop()
nbComputers: number; equipmentsAccessType: string[];
@Prop()
precisionsSiNecessaire: string;
@Prop() @Prop()
statutJuridique: string; equipmentsAndServices: string[];
@Prop() @Prop()
appartenezVousAUnReseauDeMediation: string; nbComputers: number;
@Prop()
precisezLequel: string;
@Prop()
idDeLitemStructureDansDirectus: string;
@Prop()
statutDeLitemStructureDansDirectus: string;
@Prop()
idDeLitemOffreDansDirectus: string;
@Prop() @Prop()
statut: string; nbPrinters: number;
@Prop() @Prop()
typeDeStructure: string[]; nbTablets: number;
@Prop() @Prop()
commune: string; nbNumericTerminal: number;
@Prop() @Prop()
hours: Week; hours: Week;
......
src/structures/structures.controller.ts
View file @ e9c77cb6
import { Body, Controller, Get, Param, Post, Query, Req } from '@nestjs/common'; import { Body, Controller, Get, Param, Post, Query } from '@nestjs/common';
import { CreateStructureDto } from './dto/create-structure.dto'; import { CreateStructureDto } from './dto/create-structure.dto';
import { QueryStructure } from './dto/query-structure.dto'; import { QueryStructure } from './dto/query-structure.dto';
import { Structure } from './schemas/structure.schema'; import { Structure } from './schemas/structure.schema';
...@@ -18,6 +18,11 @@ export class StructuresController { ...@@ -18,6 +18,11 @@ export class StructuresController {
return this.structureService.search(query.query, body ? body.filters : null); return this.structureService.search(query.query, body ? body.filters : null);
} }
@Post(':id')
public async update(@Param('id') id: number, @Body() body: CreateStructureDto) {
return this.structureService.update(id, body);
}
@Get() @Get()
public async findAll(): Promise<Structure[]> { public async findAll(): Promise<Structure[]> {
return this.structureService.findAll(); return this.structureService.findAll();
...@@ -26,18 +31,26 @@ export class StructuresController { ...@@ -26,18 +31,26 @@ export class StructuresController {
@Get('count') @Get('count')
public async countCategories(): Promise<Array<{ id: string; count: number }>> { public async countCategories(): Promise<Array<{ id: string; count: number }>> {
const data = await Promise.all([ const data = await Promise.all([
this.structureService.countByStructureKey('accesAuxDroits'), this.structureService.countByStructureKey('proceduresAccompaniment'),
this.structureService.countByStructureKey('aideALaParentalite'),
this.structureService.countByStructureKey('cultureEtSecuriteNumerique'), this.structureService.countByStructureKey('accessRight'),
this.structureService.countByStructureKey('insertionSocialeEtProfessionnelle'), this.structureService.countByStructureKey('baseSkills'),
this.structureService.countByStructureKey('accompagnementDesDemarches'), this.structureService.countByStructureKey('parentingHelp'),
this.structureService.countByStructureKey('labelsEtQualifications'), this.structureService.countByStructureKey('digitalCultureSecurity'),
this.structureService.countByStructureKey('publicsAcceptes'), this.structureService.countByStructureKey('socialAndProfessional'),
this.structureService.countByStructureKey('modalitesDacces'),
this.structureService.countByStructureKey('lesCompetencesDeBase'), this.structureService.countByStructureKey('publicsAccompaniment'),
this.structureService.countByStructureKey('equipementsEtServicesProposes'), this.structureService.countByStructureKey('labelsQualifications'),
this.structureService.countByStructureKey('publics'),
this.structureService.countByStructureKey('accessModality'),
this.structureService.countByStructureKey('equipmentsAndServices'),
]); ]);
// Return a concat of all arrays // Return a concat of all arrays
return data.reduce((a, b) => [...a, ...b]); return data.reduce((a, b) => [...a, ...b]);
} }
@Get(':id')
public async find(@Param('id') id: number) {
return this.structureService.findOne(id);
}
} }
src/structures/structures.service.ts
View file @ e9c77cb6
import { HttpService, Injectable } from '@nestjs/common'; import { HttpException, HttpService, Injectable, HttpStatus } from '@nestjs/common';
import { InjectModel } from '@nestjs/mongoose'; import { InjectModel } from '@nestjs/mongoose';
import { Model } from 'mongoose'; import { Model } from 'mongoose';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
...@@ -69,15 +69,25 @@ export class StructuresService { ...@@ -69,15 +69,25 @@ export class StructuresService {
return this.structureModel.find().exec(); return this.structureModel.find().exec();
} }
public async update(idStructure: number, structure: CreateStructureDto): Promise<Structure> {
const result = await this.structureModel.update({ id: idStructure }, structure);
if (!result) {
throw new HttpException('Invalid structure id', HttpStatus.BAD_REQUEST);
}
return structure;
}
public findOne(idParam: number): Promise<Structure> {
return this.structureModel.findOne({ id: idParam }).exec();
}
/** /**
* Get structures positions and add marker corresponding to those positons on the map * Get structures positions and add marker corresponding to those positons on the map
*/ */
private getStructurePosition(structure: Structure): Promise<Structure> { private getStructurePosition(structure: Structure): Promise<Structure> {
return new Promise((resolve) => { return new Promise((resolve) => {
this.getCoord(structure.n, structure.voie, structure.commune).subscribe( this.getCoord(structure.address.numero, structure.address.street, structure.address.commune).subscribe(
(res) => { (res) => {
const address = res.data.features[0]; const address = res.data.features[0];
structure.address = structure.voie + ' - ' + address.properties.postcode + ' ' + address.properties.city;
structure.coord = address.geometry.coordinates; structure.coord = address.geometry.coordinates;
resolve(structure); resolve(structure);
}, },
......
src/users/users.controller.spec.ts
View file @ e9c77cb6
import { HttpModule, HttpService } from '@nestjs/common'; import { HttpModule } from '@nestjs/common';
import { getModelToken } from '@nestjs/mongoose'; import { getModelToken } from '@nestjs/mongoose';
import { Test, TestingModule } from '@nestjs/testing'; import { Test, TestingModule } from '@nestjs/testing';
import { ConfigurationModule } from '../configuration/configuration.module'; import { ConfigurationModule } from '../configuration/configuration.module';
......
src/users/users.controller.ts
View file @ e9c77cb6
import { Body, Controller, Get, Param, Post, Query, Req, Request, UseGuards } from '@nestjs/common'; import { Body, Controller, Get, Param, Post, Query, Request, UseGuards } from '@nestjs/common';
import { ApiOperation, ApiParam, ApiResponse } from '@nestjs/swagger'; import { ApiOperation, ApiParam, ApiResponse } from '@nestjs/swagger';
import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard'; import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
import { PasswordChangeDto } from './change-password.dto'; import { PasswordChangeDto } from './change-password.dto';
......
src/users/users.service.spec.ts
View file @ e9c77cb6
...@@ -39,14 +39,14 @@ describe('UsersService', () => { ...@@ -39,14 +39,14 @@ describe('UsersService', () => {
email: 'jacques.dupont@mii.com', email: 'jacques.dupont@mii.com',
password: '$2a$12$vLQjJ9zAWyUwiXLeQDa6w.yazDArYIpf2WnQF1jRHOjBxADEjUEA3', password: '$2a$12$vLQjJ9zAWyUwiXLeQDa6w.yazDArYIpf2WnQF1jRHOjBxADEjUEA3',
}; };
const userDto: CreateUserDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; const userDto: CreateUserDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; //NOSONAR
jest.spyOn(service, 'create').mockImplementation(async (): Promise<User> => result); jest.spyOn(service, 'create').mockImplementation(async (): Promise<User> => result);
expect(await service.create(userDto)).toBe(result); expect(await service.create(userDto)).toBe(result);
}); });
it('User should not be created, already exist', async () => { it('User should not be created, already exist', async () => {
const result = new HttpException('User already exists', HttpStatus.BAD_REQUEST); const result = new HttpException('User already exists', HttpStatus.BAD_REQUEST);
const userDto: CreateUserDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; const userDto: CreateUserDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; //NOSONAR
jest.spyOn(service, 'create').mockImplementation(async (): Promise<any> => result); jest.spyOn(service, 'create').mockImplementation(async (): Promise<any> => result);
expect(await service.create(userDto)).toBe(result); expect(await service.create(userDto)).toBe(result);
}); });
...@@ -56,7 +56,7 @@ describe('UsersService', () => { ...@@ -56,7 +56,7 @@ describe('UsersService', () => {
'Weak password, it must contain ne lowercase alphabetical character, one uppercase alphabetical character, one numeric character, one special character and be eight characters or longer', 'Weak password, it must contain ne lowercase alphabetical character, one uppercase alphabetical character, one numeric character, one special character and be eight characters or longer',
HttpStatus.UNPROCESSABLE_ENTITY HttpStatus.UNPROCESSABLE_ENTITY
); );
const userDto: CreateUserDto = { email: 'jacques.dupont@mii.com', password: 'test' }; const userDto: CreateUserDto = { email: 'jacques.dupont@mii.com', password: 'test' }; //NOSONAR
jest.spyOn(service, 'create').mockImplementation(async (): Promise<any> => result); jest.spyOn(service, 'create').mockImplementation(async (): Promise<any> => result);
expect(await service.create(userDto)).toBe(result); expect(await service.create(userDto)).toBe(result);
}); });
...@@ -72,21 +72,21 @@ describe('UsersService', () => { ...@@ -72,21 +72,21 @@ describe('UsersService', () => {
password: '$2a$12$vLQjJ9zAWyUwiXLeQDa6w.yazDArYIpf2WnQF1jRHOjBxADEjUEA3', password: '$2a$12$vLQjJ9zAWyUwiXLeQDa6w.yazDArYIpf2WnQF1jRHOjBxADEjUEA3',
role: 0, role: 0,
}; };
const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!' }; //NOSONAR
jest.spyOn(service, 'findByLogin').mockImplementation(async (): Promise<User> => result); jest.spyOn(service, 'findByLogin').mockImplementation(async (): Promise<User> => result);
expect(await service.findByLogin(loginDto)).toBe(result); expect(await service.findByLogin(loginDto)).toBe(result);
}); });
it('user does not exist, should be unauthorized issue', async () => { it('user does not exist, should be unauthorized issue', async () => {
const result: HttpException = new HttpException('Invalid credentials', HttpStatus.UNAUTHORIZED); const result: HttpException = new HttpException('Invalid credentials', HttpStatus.UNAUTHORIZED);
const loginDto: LoginDto = { email: 'jean.dupont@mii.com', password: 'test1A!!' }; const loginDto: LoginDto = { email: 'jean.dupont@mii.com', password: 'test1A!!' }; //NOSONAR
jest.spyOn(service, 'findByLogin').mockImplementation(async (): Promise<any> => result); jest.spyOn(service, 'findByLogin').mockImplementation(async (): Promise<any> => result);
expect(await service.findByLogin(loginDto)).toBe(result); expect(await service.findByLogin(loginDto)).toBe(result);
}); });
it('wrong password, should be unauthorized issue', async () => { it('wrong password, should be unauthorized issue', async () => {
const result: HttpException = new HttpException('Invalid credentials', HttpStatus.UNAUTHORIZED); const result: HttpException = new HttpException('Invalid credentials', HttpStatus.UNAUTHORIZED);
const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!!' }; const loginDto: LoginDto = { email: 'jacques.dupont@mii.com', password: 'test1A!!!' }; //NOSONAR
jest.spyOn(service, 'findByLogin').mockImplementation(async (): Promise<any> => result); jest.spyOn(service, 'findByLogin').mockImplementation(async (): Promise<any> => result);
expect(await service.findByLogin(loginDto)).toBe(result); expect(await service.findByLogin(loginDto)).toBe(result);
}); });
......
src/users/users.service.ts
View file @ e9c77cb6
...@@ -47,7 +47,7 @@ export class UsersService { ...@@ -47,7 +47,7 @@ export class UsersService {
* @param password string * @param password string
*/ */
private isStrongPassword(password: string): boolean { private isStrongPassword(password: string): boolean {
const strongRegex = new RegExp('^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*])(?=.{8,})'); const strongRegex = new RegExp('^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*])(?=.{8,})'); //NOSONAR
return strongRegex.test(password); return strongRegex.test(password);
} }
......