Skip to content
This repository was archived by the owner on Sep 3, 2022. It is now read-only.

Commit 2c23b37

Browse files
committed
Added user roles
1 parent 1444cf7 commit 2c23b37

5 files changed

Lines changed: 56 additions & 2 deletions

File tree

.gitignore

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# compiled output
2+
/dist
3+
/node_modules
4+
5+
# Logs
6+
logs
7+
*.log
8+
npm-debug.log*
9+
yarn-debug.log*
10+
yarn-error.log*
11+
lerna-debug.log*
12+
13+
# Ignore files related to API keys
14+
.env
15+
16+
# OS
17+
.DS_Store
18+
19+
# Tests
20+
/coverage
21+
/.nyc_output
22+
23+
# IDEs and editors
24+
/.idea
25+
.project
26+
.classpath
27+
.c9/
28+
*.launch
29+
.settings/
30+
*.sublime-workspace
31+
32+
# IDE - VSCode
33+
.vscode/*
34+
!.vscode/settings.json
35+
!.vscode/tasks.json
36+
!.vscode/launch.json
37+
!.vscode/extensions.json

backend/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# compiled output
22
/dist
33
/node_modules
4+
5+
# Ignore files related to API keys
46
.env
57

68
# Logs

backend/src/shared/user-roles.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export enum UserRoles {
2+
'TEST' = 'Test',
3+
'EDUCATION' = 'Education',
4+
'COMMERCIAL' = 'Commercial',
5+
}

backend/src/users/dto/update-user.dto.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import {
55
IsNotEmpty,
66
IsOptional,
77
IsBoolean,
8+
IsEnum,
89
} from 'class-validator';
10+
import { UserRoles } from '../../shared/user-roles';
911

1012
export class UpdateUserDto {
1113
@ApiModelPropertyOptional()
@@ -30,4 +32,10 @@ export class UpdateUserDto {
3032
@IsNotEmpty()
3133
@IsOptional()
3234
readonly verified?: boolean;
35+
36+
@ApiModelPropertyOptional()
37+
@IsNotEmpty()
38+
@IsEnum(UserRoles)
39+
@IsOptional()
40+
readonly role: UserRoles;
3341
}

backend/src/users/user.entity.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import {
77
} from 'typeorm';
88
import { IsEmail } from 'class-validator';
99
import * as bcrypt from 'bcrypt';
10-
11-
const passwordHashedRegex = RegExp('\\$2[ayb]$[d]{2}$[./A-Za-z0-9]{53}');
10+
import { UserRoles } from '../shared/user-roles';
1211

1312
@Entity('user')
1413
export class UserEntity {
@@ -28,6 +27,9 @@ export class UserEntity {
2827
@Column()
2928
verified: boolean = false;
3029

30+
@Column()
31+
role: UserRoles = UserRoles.TEST;
32+
3133
@BeforeInsert()
3234
@BeforeUpdate()
3335
async hashPassword() {

0 commit comments

Comments
 (0)