@saihu/common 1.4.1 → 1.4.2
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.
|
@@ -1,22 +1,19 @@
|
|
|
1
|
-
export interface AuthUser {
|
|
2
|
-
sub: string;
|
|
3
|
-
mobile: string;
|
|
4
|
-
name: string;
|
|
5
|
-
roles?: (string | number)[];
|
|
6
|
-
orgId?: string | number;
|
|
7
|
-
[k: string]: unknown;
|
|
8
|
-
}
|
|
9
1
|
export interface BaseAuthUser {
|
|
10
2
|
sub: string;
|
|
11
3
|
userType: 'STAFF' | 'CUSTOMER';
|
|
12
4
|
[k: string]: unknown;
|
|
13
5
|
}
|
|
14
|
-
export interface
|
|
6
|
+
export interface AuthUser extends BaseAuthUser {
|
|
15
7
|
userType: 'STAFF';
|
|
16
8
|
mobile: string;
|
|
17
9
|
name: string;
|
|
18
|
-
roles: (string | number)[];
|
|
19
10
|
orgId: string | number;
|
|
11
|
+
roles: string[];
|
|
12
|
+
perms: string[];
|
|
13
|
+
dataScope: string;
|
|
14
|
+
shopIds: number[];
|
|
15
|
+
deptId: string | null;
|
|
16
|
+
activePositionId?: string;
|
|
20
17
|
}
|
|
21
18
|
export interface CustomerAuthUser extends BaseAuthUser {
|
|
22
19
|
userType: 'CUSTOMER';
|
|
@@ -25,5 +22,5 @@ export interface CustomerAuthUser extends BaseAuthUser {
|
|
|
25
22
|
phone?: string;
|
|
26
23
|
memberLevel?: number;
|
|
27
24
|
}
|
|
28
|
-
export type AppAuthUser =
|
|
25
|
+
export type AppAuthUser = AuthUser | CustomerAuthUser;
|
|
29
26
|
//# sourceMappingURL=auth.types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.types.d.ts","sourceRoot":"","sources":["../../src/auth/auth.types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"auth.types.d.ts","sourceRoot":"","sources":["../../src/auth/auth.types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,OAAO,GAAG,UAAU,CAAC;IAC/B,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,QAAS,SAAQ,YAAY;IAC5C,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IAGvB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAGhB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAGtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACpD,QAAQ,EAAE,UAAU,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,gBAAgB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rbac.guard.d.ts","sourceRoot":"","sources":["../../src/auth/rbac.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,gBAAgB,EAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAwB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE7E,qBACa,SAAU,YAAW,WAAW;IAEzC,OAAO,CAAC,SAAS;IACa,OAAO,CAAC,SAAS;gBADvC,SAAS,EAAE,SAAS,EACU,SAAS,EAAE,mBAAmB;IAEhE,WAAW,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"rbac.guard.d.ts","sourceRoot":"","sources":["../../src/auth/rbac.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,gBAAgB,EAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAwB,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE7E,qBACa,SAAU,YAAW,WAAW;IAEzC,OAAO,CAAC,SAAS;IACa,OAAO,CAAC,SAAS;gBADvC,SAAS,EAAE,SAAS,EACU,SAAS,EAAE,mBAAmB;IAEhE,WAAW,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAiB3D"}
|
package/dist/auth/rbac.guard.js
CHANGED
|
@@ -26,10 +26,7 @@ let RbacGuard = class RbacGuard {
|
|
|
26
26
|
var _a, _b, _c, _d, _e, _f;
|
|
27
27
|
const h = ctx.getHandler(), c = ctx.getClass();
|
|
28
28
|
const reqPerms = (_a = this.reflector.getAllAndOverride(decorators_1.PERMS_KEY, [h, c])) !== null && _a !== void 0 ? _a : [];
|
|
29
|
-
const reqRoles = (_b = this.reflector.getAllAndOverride(decorators_1.ROLES_KEY, [
|
|
30
|
-
h,
|
|
31
|
-
c,
|
|
32
|
-
])) !== null && _b !== void 0 ? _b : [];
|
|
29
|
+
const reqRoles = (_b = this.reflector.getAllAndOverride(decorators_1.ROLES_KEY, [h, c])) !== null && _b !== void 0 ? _b : [];
|
|
33
30
|
if (!reqPerms.length && !reqRoles.length)
|
|
34
31
|
return true;
|
|
35
32
|
const req = ctx.switchToHttp().getRequest();
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export interface PermissionEvaluator {
|
|
2
|
-
hasRoles?(user: any, required:
|
|
2
|
+
hasRoles?(user: any, required: string[]): Promise<boolean> | boolean;
|
|
3
3
|
hasPerms?(user: any, required: string[]): Promise<boolean> | boolean;
|
|
4
4
|
}
|
|
5
5
|
export declare const PERMISSION_EVALUATOR: unique symbol;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rbac.interface.d.ts","sourceRoot":"","sources":["../../src/auth/rbac.interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"rbac.interface.d.ts","sourceRoot":"","sources":["../../src/auth/rbac.interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IACrE,QAAQ,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;CACtE;AACD,eAAO,MAAM,oBAAoB,eAAiC,CAAC"}
|