@movalib/movalib-commons 1.1.37 → 1.1.39

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/dist/src/helpers/Enums.d.ts +11 -7
  2. package/dist/src/helpers/Enums.js +11 -7
  3. package/dist/src/models/Customer.d.ts +2 -1
  4. package/dist/src/models/User.d.ts +8 -4
  5. package/dist/src/models/User.js +19 -4
  6. package/package.json +1 -1
  7. package/src/helpers/Enums.ts +11 -7
  8. package/src/models/Customer.ts +2 -1
  9. package/src/models/User.ts +25 -6
package/dist/src/helpers/Enums.d.ts CHANGED
@@ -134,24 +134,28 @@ export declare enum MovaAppType {
134
134
  ADMIN = "ADMIN"
135
135
  }
136
136
  export declare enum RoleType {
137
+ /**
138
+ * Utilisateur de la plateforme
139
+ */
140
+ USER = "ROLE_USER",
137
141
  /**
138
142
  * Client du centre auto (automobiliste)
139
143
  */
140
- CUSTOMER = "CUSTOMER",
144
+ GARAGE_CUSTOMER = "ROLE_GARAGE_CUSTOMER",
141
145
  /**
142
146
  * Technicien du centre auto
143
147
  */
144
- TECHNICIAN = "GARAGE_LEADER",
148
+ GARAGE_TECHNICIAN = "ROLE_GARAGE_TECHNICIAN",
145
149
  /**
146
- * Chef d'atelier
150
+ * Administrateur du centre auto (propriétaire ou dirigeant)
147
151
  */
148
- GARAGE_LEADER = "GARAGE_LEADER",
152
+ GARAGE_ADMIN = "ROLE_GARAGE_ADMIN",
149
153
  /**
150
- * Administrateur du centre auto (propriétaire ou dirigeant)
154
+ * Force vente Movalib
151
155
  */
152
- GARAGE_ADMIN = "ADMINISTRATOR",
156
+ SALES = "ROLE_SALES",
153
157
  /**
154
158
  * Super-Administrateur (team Movalib)
155
159
  */
156
- MOVALIB_ADMIN = "MOVALIB_ADMIN"
160
+ SUPER_ADMIN = "ROLE_SUPER_ADMIN"
157
161
  }
package/dist/src/helpers/Enums.js CHANGED
@@ -154,24 +154,28 @@ var MovaAppType;
154
154
  })(MovaAppType = exports.MovaAppType || (exports.MovaAppType = {}));
155
155
  var RoleType;
156
156
  (function (RoleType) {
157
+ /**
158
+ * Utilisateur de la plateforme
159
+ */
160
+ RoleType["USER"] = "ROLE_USER";
157
161
  /**
158
162
  * Client du centre auto (automobiliste)
159
163
  */
160
- RoleType["CUSTOMER"] = "CUSTOMER";
164
+ RoleType["GARAGE_CUSTOMER"] = "ROLE_GARAGE_CUSTOMER";
161
165
  /**
162
166
  * Technicien du centre auto
163
167
  */
164
- RoleType["TECHNICIAN"] = "GARAGE_LEADER";
168
+ RoleType["GARAGE_TECHNICIAN"] = "ROLE_GARAGE_TECHNICIAN";
165
169
  /**
166
- * Chef d'atelier
170
+ * Administrateur du centre auto (propriétaire ou dirigeant)
167
171
  */
168
- RoleType["GARAGE_LEADER"] = "GARAGE_LEADER";
172
+ RoleType["GARAGE_ADMIN"] = "ROLE_GARAGE_ADMIN";
169
173
  /**
170
- * Administrateur du centre auto (propriétaire ou dirigeant)
174
+ * Force vente Movalib
171
175
  */
172
- RoleType["GARAGE_ADMIN"] = "ADMINISTRATOR";
176
+ RoleType["SALES"] = "ROLE_SALES";
173
177
  /**
174
178
  * Super-Administrateur (team Movalib)
175
179
  */
176
- RoleType["MOVALIB_ADMIN"] = "MOVALIB_ADMIN";
180
+ RoleType["SUPER_ADMIN"] = "ROLE_SUPER_ADMIN";
177
181
  })(RoleType = exports.RoleType || (exports.RoleType = {}));
package/dist/src/models/Customer.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import Address from "./Address";
2
+ import Role from "./Role";
2
3
  import User from "./User";
3
4
  import Vehicle from "./Vehicle";
4
5
  export default class Customer extends User {
@@ -7,7 +8,7 @@ export default class Customer extends User {
7
8
  key: string;
8
9
  value: number;
9
10
  }[];
10
- constructor(id: string, roles: string[] | undefined, firstname: string | undefined, lastname: string | undefined, avatar: string | undefined, addresses: Address[] | undefined, vehicles: Vehicle[], email: string | undefined, turnover: {
11
+ constructor(id: string, roles: Role[] | undefined, firstname: string | undefined, lastname: string | undefined, avatar: string | undefined, addresses: Address[] | undefined, vehicles: Vehicle[], email: string | undefined, turnover: {
11
12
  key: string;
12
13
  value: number;
13
14
  }[]);
package/dist/src/models/User.d.ts CHANGED
@@ -1,9 +1,10 @@
1
1
  import { Gender } from "../helpers/Enums";
2
2
  import Address from './Address';
3
+ import Role from "./Role";
3
4
  import Vehicle from "./Vehicle";
4
5
  export default class User {
5
6
  id: string;
6
- roles: string[];
7
+ roles: Role[];
7
8
  firstname: string;
8
9
  lastname: string;
9
10
  avatar: string;
@@ -15,8 +16,11 @@ export default class User {
15
16
  addresses?: Address[];
16
17
  phoneNumber?: string;
17
18
  vehicles?: Vehicle[];
18
- constructor(id: string, roles: string[], firstname?: string, lastname?: string, avatar?: string, email?: string, password?: string, created?: Date, gender?: Gender, birthDate?: Date, addresses?: Address[], phoneNumber?: string, vehicles?: Vehicle[]);
19
+ constructor(id: string, roles: Role[], firstname?: string, lastname?: string, avatar?: string, email?: string, password?: string, created?: Date, gender?: Gender, birthDate?: Date, addresses?: Address[], phoneNumber?: string, vehicles?: Vehicle[]);
19
20
  static getFirstLetter: (user: User) => string;
20
- static isCustomer: (user: User) => boolean;
21
- static isTechnician: (user: User) => boolean;
21
+ static isGarageCustomer: (user: User) => boolean;
22
+ static isGarageTechnician: (user: User) => boolean;
23
+ static isGarageAdmin: (user: User) => boolean;
24
+ static isSales: (user: User) => boolean;
25
+ static isSuperAdmin: (user: User) => boolean;
22
26
  }
package/dist/src/models/User.js CHANGED
@@ -27,15 +27,30 @@ var User = /** @class */ (function () {
27
27
  var firstLetter = user.lastname[0].toUpperCase();
28
28
  return /[0-9]/.test(firstLetter) ? '0-9' : firstLetter;
29
29
  };
30
- User.isCustomer = function (user) {
30
+ User.isGarageCustomer = function (user) {
31
31
  if (!user || !user.roles)
32
32
  return false;
33
- return Boolean(user.roles.find(function (r) { return r = Enums_1.RoleType.CUSTOMER; }));
33
+ return Boolean(user.roles.find(function (r) { return r.name === Enums_1.RoleType.GARAGE_CUSTOMER; }));
34
34
  };
35
- User.isTechnician = function (user) {
35
+ User.isGarageTechnician = function (user) {
36
36
  if (!user || !user.roles)
37
37
  return false;
38
- return Boolean(user.roles.find(function (r) { return r = Enums_1.RoleType.TECHNICIAN; }));
38
+ return Boolean(user.roles.find(function (r) { return r.name === Enums_1.RoleType.GARAGE_TECHNICIAN; }));
39
+ };
40
+ User.isGarageAdmin = function (user) {
41
+ if (!user || !user.roles)
42
+ return false;
43
+ return Boolean(user.roles.find(function (r) { return r.name === Enums_1.RoleType.GARAGE_ADMIN; }));
44
+ };
45
+ User.isSales = function (user) {
46
+ if (!user || !user.roles)
47
+ return false;
48
+ return Boolean(user.roles.find(function (r) { return r.name === Enums_1.RoleType.SALES; }));
49
+ };
50
+ User.isSuperAdmin = function (user) {
51
+ if (!user || !user.roles)
52
+ return false;
53
+ return Boolean(user.roles.find(function (r) { return r.name === Enums_1.RoleType.SUPER_ADMIN; }));
39
54
  };
40
55
  return User;
41
56
  }());
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@movalib/movalib-commons",
3
- "version": "1.1.37",
3
+ "version": "1.1.39",
4
4
  "description": "Bibliothèque d'objets communs à l'ensemble des projets React de Movalib",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/helpers/Enums.ts CHANGED
@@ -150,24 +150,28 @@ export enum MovaAppType {
150
150
  }
151
151
 
152
152
  export enum RoleType {
153
+ /**
154
+ * Utilisateur de la plateforme
155
+ */
156
+ USER = "ROLE_USER",
153
157
  /**
154
158
  * Client du centre auto (automobiliste)
155
159
  */
156
- CUSTOMER = "CUSTOMER",
160
+ GARAGE_CUSTOMER = "ROLE_GARAGE_CUSTOMER",
157
161
  /**
158
162
  * Technicien du centre auto
159
163
  */
160
- TECHNICIAN = "GARAGE_LEADER",
164
+ GARAGE_TECHNICIAN = "ROLE_GARAGE_TECHNICIAN",
161
165
  /**
162
- * Chef d'atelier
166
+ * Administrateur du centre auto (propriétaire ou dirigeant)
163
167
  */
164
- GARAGE_LEADER = "GARAGE_LEADER",
168
+ GARAGE_ADMIN = "ROLE_GARAGE_ADMIN",
165
169
  /**
166
- * Administrateur du centre auto (propriétaire ou dirigeant)
170
+ * Force vente Movalib
167
171
  */
168
- GARAGE_ADMIN = "ADMINISTRATOR",
172
+ SALES = "ROLE_SALES",
169
173
  /**
170
174
  * Super-Administrateur (team Movalib)
171
175
  */
172
- MOVALIB_ADMIN = "MOVALIB_ADMIN",
176
+ SUPER_ADMIN = "ROLE_SUPER_ADMIN",
173
177
  }
package/src/models/Customer.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import Address from "./Address";
2
+ import Role from "./Role";
2
3
  import User from "./User";
3
4
  import Vehicle from "./Vehicle";
4
5
 
@@ -11,7 +12,7 @@ export default class Customer extends User {
11
12
 
12
13
  constructor(
13
14
  id: string,
14
- roles: string[] = [],
15
+ roles: Role[] = [],
15
16
  firstname: string = '',
16
17
  lastname: string = '',
17
18
  avatar: string = '',
package/src/models/User.ts CHANGED
@@ -1,12 +1,13 @@
1
1
  import { Gender, RoleType } from "../helpers/Enums";
2
2
  import Address from './Address';
3
+ import Role from "./Role";
3
4
  import Vehicle from "./Vehicle";
4
5
 
5
6
  export default class User {
6
7
 
7
8
  // Properties
8
9
  id: string;
9
- roles: string[];
10
+ roles: Role[];
10
11
  firstname: string;
11
12
  lastname: string;
12
13
  avatar: string;
@@ -21,7 +22,7 @@ export default class User {
21
22
 
22
23
  constructor(
23
24
  id: string,
24
- roles: string[],
25
+ roles: Role[],
25
26
  firstname: string = '',
26
27
  lastname: string = '',
27
28
  avatar: string = '',
@@ -55,15 +56,33 @@ export default class User {
55
56
  return /[0-9]/.test(firstLetter) ? '0-9' : firstLetter;
56
57
  }
57
58
 
58
- static isCustomer = (user: User) : boolean => {
59
+ static isGarageCustomer = (user: User) : boolean => {
59
60
  if(!user || !user.roles) return false;
60
61
 
61
- return Boolean(user.roles.find(r => r = RoleType.CUSTOMER));
62
+ return Boolean(user.roles.find(r => r.name === RoleType.GARAGE_CUSTOMER));
62
63
  }
63
64
 
64
- static isTechnician = (user: User) : boolean => {
65
+ static isGarageTechnician = (user: User) : boolean => {
65
66
  if(!user || !user.roles) return false;
66
67
 
67
- return Boolean(user.roles.find(r => r = RoleType.TECHNICIAN));
68
+ return Boolean(user.roles.find(r => r.name === RoleType.GARAGE_TECHNICIAN));
69
+ }
70
+
71
+ static isGarageAdmin = (user: User) : boolean => {
72
+ if(!user || !user.roles) return false;
73
+
74
+ return Boolean(user.roles.find(r => r.name === RoleType.GARAGE_ADMIN));
75
+ }
76
+
77
+ static isSales = (user: User) : boolean => {
78
+ if(!user || !user.roles) return false;
79
+
80
+ return Boolean(user.roles.find(r => r.name === RoleType.SALES));
81
+ }
82
+
83
+ static isSuperAdmin = (user: User) : boolean => {
84
+ if(!user || !user.roles) return false;
85
+
86
+ return Boolean(user.roles.find(r => r.name === RoleType.SUPER_ADMIN));
68
87
  }
69
88
  }