asv-hlps 1.2.97 → 1.3.0

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 (7) hide show
  1. package/lib/cjs/auth.js +3 -3
  2. package/lib/cjs/user.d.ts +1 -1
  3. package/lib/cjs/user.js +6 -7
  4. package/lib/esm/auth.js +3 -3
  5. package/lib/esm/user.d.ts +1 -1
  6. package/lib/esm/user.js +6 -7
  7. 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) ? ["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)
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)) {
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/user.d.ts CHANGED
@@ -6,7 +6,7 @@ export declare const inGrp: (grps: string[], user: User | UserNotarial) => boole
6
6
  export declare const inSteGrp: (grps: string[], user: User | UserNotarial) => boolean;
7
7
  export declare const hasRole: (roles: string[], role: UserRole) => boolean;
8
8
  export declare const isBillPeriod: (user: User | UserNotarial, period: string) => boolean;
9
- export declare const isStaffSte: (steNames: string[], user: User | UserNotarial) => boolean;
9
+ export declare const isStaffSte: (steNames: string[], steName: string) => boolean;
10
10
  export declare const getFullname: (user: User | UserNotarial) => string;
11
11
  export declare const entryDesignationUser: (user: User | UserNotarial) => string;
12
12
  export declare const secureUser: (user: any, username: string, heads: any) => void;
package/lib/cjs/user.js CHANGED
@@ -52,13 +52,12 @@ const isBillPeriod = (user, period) => {
52
52
  return user.periodBill.toLowerCase() === period ? true : false;
53
53
  };
54
54
  exports.isBillPeriod = isBillPeriod;
55
- // export const isStaffSte = (user: User | UserNotarial, steNames: string|string[]) => {
56
- const isStaffSte = (steNames, user) => {
57
- /* if(!Array.isArray(steNames)) {
58
- return (user.ste.name.toLowerCase() === steNames.toLowerCase());
59
- } */
60
- // return [...steNames].includes(user.ste.name.toLowerCase()) ? true : false;
61
- return [...steNames].includes(user.ste.name.toLowerCase());
55
+ /* export const isStaffSte = (steNames: string[], user: User | UserNotarial) => {
56
+
57
+ return [...steNames].includes(user.ste.name.toLowerCase());
58
+ }; */
59
+ const isStaffSte = (steNames, steName) => {
60
+ return [...steNames].includes(steName.toLowerCase());
62
61
  };
63
62
  exports.isStaffSte = isStaffSte;
64
63
  const getFullname = (user) => {
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) ? ["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)
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)) {
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/user.d.ts CHANGED
@@ -6,7 +6,7 @@ export declare const inGrp: (grps: string[], user: User | UserNotarial) => boole
6
6
  export declare const inSteGrp: (grps: string[], user: User | UserNotarial) => boolean;
7
7
  export declare const hasRole: (roles: string[], role: UserRole) => boolean;
8
8
  export declare const isBillPeriod: (user: User | UserNotarial, period: string) => boolean;
9
- export declare const isStaffSte: (steNames: string[], user: User | UserNotarial) => boolean;
9
+ export declare const isStaffSte: (steNames: string[], steName: string) => boolean;
10
10
  export declare const getFullname: (user: User | UserNotarial) => string;
11
11
  export declare const entryDesignationUser: (user: User | UserNotarial) => string;
12
12
  export declare const secureUser: (user: any, username: string, heads: any) => void;
package/lib/esm/user.js CHANGED
@@ -19,13 +19,12 @@ export const hasRole = (roles, role) => {
19
19
  export const isBillPeriod = (user, period) => {
20
20
  return user.periodBill.toLowerCase() === period ? true : false;
21
21
  };
22
- // export const isStaffSte = (user: User | UserNotarial, steNames: string|string[]) => {
23
- export const isStaffSte = (steNames, user) => {
24
- /* if(!Array.isArray(steNames)) {
25
- return (user.ste.name.toLowerCase() === steNames.toLowerCase());
26
- } */
27
- // return [...steNames].includes(user.ste.name.toLowerCase()) ? true : false;
28
- return [...steNames].includes(user.ste.name.toLowerCase());
22
+ /* export const isStaffSte = (steNames: string[], user: User | UserNotarial) => {
23
+
24
+ return [...steNames].includes(user.ste.name.toLowerCase());
25
+ }; */
26
+ export const isStaffSte = (steNames, steName) => {
27
+ return [...steNames].includes(steName.toLowerCase());
29
28
  };
30
29
  export const getFullname = (user) => {
31
30
  const gender = user.gender ? user.gender.abr.trim() : "";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "asv-hlps",
3
- "version": "1.2.97",
3
+ "version": "1.3.0",
4
4
  "description": "helpers",
5
5
  "main": "./lib/cjs/index.js",
6
6
  "module": "./lib/esm/index.js",