asv-hlps 1.2.98 → 1.3.1

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/lib/cjs/auth.js +3 -3
  2. package/lib/cjs/models/entities/users/UserTitr.d.ts +1 -1
  3. package/lib/cjs/user.d.ts +11 -2
  4. package/lib/cjs/user.js +3 -2
  5. package/lib/esm/auth.js +3 -3
  6. package/lib/esm/models/entities/users/UserTitr.d.ts +1 -1
  7. package/lib/esm/user.d.ts +11 -2
  8. package/lib/esm/user.js +3 -2
  9. package/package.json +1 -1
package/lib/cjs/auth.js CHANGED
@@ -24,7 +24,7 @@ const getAuth = (authUser, authSte, param) => {
24
24
  } */
25
25
  if (((_a = param === null || param === void 0 ? void 0 : param.roles) === null || _a === void 0 ? void 0 : _a.length) > 0) {
26
26
  // return isStaffSte(authSte, authUser) && ["sadm", ...param.roles].includes(authUser.role.code.toLowerCase());
27
- return (0, user_1.isStaffSte)(authSte, authUser.ste) ? ["sadm", ...param.roles].includes(authUser.role.code.toLowerCase()) : false;
27
+ return (0, user_1.isStaffSte)(authSte, authUser.ste.name) ? ["sadm", ...param.roles].includes(authUser.role.code.toLowerCase()) : false;
28
28
  // ------ multi roles ------
29
29
  // return param?.roles?.length ? this.checkRoles(["sadm", ...param.roles]) : false;
30
30
  // }
@@ -32,7 +32,7 @@ const getAuth = (authUser, authSte, param) => {
32
32
  // ------ staff ------
33
33
  if (param === null || param === void 0 ? void 0 : param.staff) {
34
34
  // return isStaffSte(authSte, authUser) && ["sadm", ...param.roles].includes(authUser.role.code.toLowerCase());
35
- return ((_b = param === null || param === void 0 ? void 0 : param.staff.roles) === null || _b === void 0 ? void 0 : _b.length) && (0, user_1.isStaffSte)(authSte, authUser.ste)
35
+ return ((_b = param === null || param === void 0 ? void 0 : param.staff.roles) === null || _b === void 0 ? void 0 : _b.length) && (0, user_1.isStaffSte)(authSte, authUser.ste.name)
36
36
  ? ["sadm", ...param.roles].includes(authUser.role.code.toLowerCase())
37
37
  : false;
38
38
  // ------ multi roles ------
@@ -41,7 +41,7 @@ const getAuth = (authUser, authSte, param) => {
41
41
  }
42
42
  // ------ client ------
43
43
  if (param === null || param === void 0 ? void 0 : param.client) {
44
- if (!(0, user_1.isStaffSte)(authSte, authUser.ste)) {
44
+ if (!(0, user_1.isStaffSte)(authSte, authUser.ste.name)) {
45
45
  if (param.client.roles && !param.client.steGrps) {
46
46
  return param.client.roles.length && ["ceo", ...param === null || param === void 0 ? void 0 : param.client.roles].includes(authUser.role.code.toLowerCase());
47
47
  }
package/lib/cjs/models/entities/users/UserTitr.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  export interface UserTitr {
2
2
  id: number;
3
3
  name: string;
4
- shortname: string;
4
+ shortname?: string;
5
5
  }
package/lib/cjs/user.d.ts CHANGED
@@ -1,13 +1,21 @@
1
+ import { Gender } from "./models/entities/users/Gender";
1
2
  import { Ste } from "./models/entities/users/Ste";
2
3
  import { User } from "./models/entities/users/User";
3
4
  import { UserNotarial } from "./models/entities/users/UserNotatial";
4
5
  import { UserRole } from "./models/entities/users/UserRole";
6
+ import { UserTitr } from "./models/entities/users/UserTitr";
7
+ interface FullnameType {
8
+ firstname: string;
9
+ lastname: string;
10
+ gender: Gender;
11
+ titr?: UserTitr;
12
+ }
5
13
  export declare const inGrp: (grps: string[], user: User | UserNotarial) => boolean;
6
14
  export declare const inSteGrp: (grps: string[], user: User | UserNotarial) => boolean;
7
15
  export declare const hasRole: (roles: string[], role: UserRole) => boolean;
8
16
  export declare const isBillPeriod: (user: User | UserNotarial, period: string) => boolean;
9
- export declare const isStaffSte: (steNames: string[], ste: Ste) => boolean;
10
- export declare const getFullname: (user: User | UserNotarial) => string;
17
+ export declare const isStaffSte: (steNames: string[], steName: string) => boolean;
18
+ export declare const getFullname: <T extends FullnameType>(user: T) => string;
11
19
  export declare const entryDesignationUser: (user: User | UserNotarial) => string;
12
20
  export declare const secureUser: (user: any, username: string, heads: any) => void;
13
21
  export declare const secureUserPassword: (user: any, heads: any) => void;
@@ -15,3 +23,4 @@ export declare const userGrpCode: (user: User | UserNotarial) => string;
15
23
  export declare const userCoef: (user: User | UserNotarial) => number;
16
24
  export declare const labelSteName: (ste: Ste, size?: number, tabs?: string[]) => string;
17
25
  export declare const getSteShortname: (ste: Ste, steGrpNames: string[]) => string;
26
+ export {};
package/lib/cjs/user.js CHANGED
@@ -56,10 +56,11 @@ exports.isBillPeriod = isBillPeriod;
56
56
 
57
57
  return [...steNames].includes(user.ste.name.toLowerCase());
58
58
  }; */
59
- const isStaffSte = (steNames, ste) => {
60
- return [...steNames].includes(ste.name.toLowerCase());
59
+ const isStaffSte = (steNames, steName) => {
60
+ return [...steNames].includes(steName.toLowerCase());
61
61
  };
62
62
  exports.isStaffSte = isStaffSte;
63
+ // export const getFullname = (user: User | UserNotarial) => {
63
64
  const getFullname = (user) => {
64
65
  const gender = user.gender ? user.gender.abr.trim() : "";
65
66
  const titr = user.titr ? user.titr.shortname.trim() : "";
package/lib/esm/auth.js CHANGED
@@ -21,7 +21,7 @@ const getAuth = (authUser, authSte, param) => {
21
21
  } */
22
22
  if (((_a = param === null || param === void 0 ? void 0 : param.roles) === null || _a === void 0 ? void 0 : _a.length) > 0) {
23
23
  // return isStaffSte(authSte, authUser) && ["sadm", ...param.roles].includes(authUser.role.code.toLowerCase());
24
- return isStaffSte(authSte, authUser.ste) ? ["sadm", ...param.roles].includes(authUser.role.code.toLowerCase()) : false;
24
+ return isStaffSte(authSte, authUser.ste.name) ? ["sadm", ...param.roles].includes(authUser.role.code.toLowerCase()) : false;
25
25
  // ------ multi roles ------
26
26
  // return param?.roles?.length ? this.checkRoles(["sadm", ...param.roles]) : false;
27
27
  // }
@@ -29,7 +29,7 @@ const getAuth = (authUser, authSte, param) => {
29
29
  // ------ staff ------
30
30
  if (param === null || param === void 0 ? void 0 : param.staff) {
31
31
  // return isStaffSte(authSte, authUser) && ["sadm", ...param.roles].includes(authUser.role.code.toLowerCase());
32
- return ((_b = param === null || param === void 0 ? void 0 : param.staff.roles) === null || _b === void 0 ? void 0 : _b.length) && isStaffSte(authSte, authUser.ste)
32
+ return ((_b = param === null || param === void 0 ? void 0 : param.staff.roles) === null || _b === void 0 ? void 0 : _b.length) && isStaffSte(authSte, authUser.ste.name)
33
33
  ? ["sadm", ...param.roles].includes(authUser.role.code.toLowerCase())
34
34
  : false;
35
35
  // ------ multi roles ------
@@ -38,7 +38,7 @@ const getAuth = (authUser, authSte, param) => {
38
38
  }
39
39
  // ------ client ------
40
40
  if (param === null || param === void 0 ? void 0 : param.client) {
41
- if (!isStaffSte(authSte, authUser.ste)) {
41
+ if (!isStaffSte(authSte, authUser.ste.name)) {
42
42
  if (param.client.roles && !param.client.steGrps) {
43
43
  return param.client.roles.length && ["ceo", ...param === null || param === void 0 ? void 0 : param.client.roles].includes(authUser.role.code.toLowerCase());
44
44
  }
package/lib/esm/models/entities/users/UserTitr.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  export interface UserTitr {
2
2
  id: number;
3
3
  name: string;
4
- shortname: string;
4
+ shortname?: string;
5
5
  }
package/lib/esm/user.d.ts CHANGED
@@ -1,13 +1,21 @@
1
+ import { Gender } from "./models/entities/users/Gender";
1
2
  import { Ste } from "./models/entities/users/Ste";
2
3
  import { User } from "./models/entities/users/User";
3
4
  import { UserNotarial } from "./models/entities/users/UserNotatial";
4
5
  import { UserRole } from "./models/entities/users/UserRole";
6
+ import { UserTitr } from "./models/entities/users/UserTitr";
7
+ interface FullnameType {
8
+ firstname: string;
9
+ lastname: string;
10
+ gender: Gender;
11
+ titr?: UserTitr;
12
+ }
5
13
  export declare const inGrp: (grps: string[], user: User | UserNotarial) => boolean;
6
14
  export declare const inSteGrp: (grps: string[], user: User | UserNotarial) => boolean;
7
15
  export declare const hasRole: (roles: string[], role: UserRole) => boolean;
8
16
  export declare const isBillPeriod: (user: User | UserNotarial, period: string) => boolean;
9
- export declare const isStaffSte: (steNames: string[], ste: Ste) => boolean;
10
- export declare const getFullname: (user: User | UserNotarial) => string;
17
+ export declare const isStaffSte: (steNames: string[], steName: string) => boolean;
18
+ export declare const getFullname: <T extends FullnameType>(user: T) => string;
11
19
  export declare const entryDesignationUser: (user: User | UserNotarial) => string;
12
20
  export declare const secureUser: (user: any, username: string, heads: any) => void;
13
21
  export declare const secureUserPassword: (user: any, heads: any) => void;
@@ -15,3 +23,4 @@ export declare const userGrpCode: (user: User | UserNotarial) => string;
15
23
  export declare const userCoef: (user: User | UserNotarial) => number;
16
24
  export declare const labelSteName: (ste: Ste, size?: number, tabs?: string[]) => string;
17
25
  export declare const getSteShortname: (ste: Ste, steGrpNames: string[]) => string;
26
+ export {};
package/lib/esm/user.js CHANGED
@@ -23,9 +23,10 @@ export const isBillPeriod = (user, period) => {
23
23
 
24
24
  return [...steNames].includes(user.ste.name.toLowerCase());
25
25
  }; */
26
- export const isStaffSte = (steNames, ste) => {
27
- return [...steNames].includes(ste.name.toLowerCase());
26
+ export const isStaffSte = (steNames, steName) => {
27
+ return [...steNames].includes(steName.toLowerCase());
28
28
  };
29
+ // export const getFullname = (user: User | UserNotarial) => {
29
30
  export const getFullname = (user) => {
30
31
  const gender = user.gender ? user.gender.abr.trim() : "";
31
32
  const titr = user.titr ? user.titr.shortname.trim() : "";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "asv-hlps",
3
- "version": "1.2.98",
3
+ "version": "1.3.1",
4
4
  "description": "helpers",
5
5
  "main": "./lib/cjs/index.js",
6
6
  "module": "./lib/esm/index.js",