@midwayjs/casbin 3.19.2 → 4.0.0-alpha.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.
- package/dist/adapter.js +14 -14
- package/dist/auth.guard.js +3 -3
- package/dist/configuration.js +2 -2
- package/dist/constants.js +3 -3
- package/dist/decorator.js +1 -1
- package/dist/enforcer.service.js +2 -2
- package/package.json +7 -7
package/dist/adapter.js
CHANGED
|
@@ -39,24 +39,24 @@ class BaseAdapter {
|
|
|
39
39
|
async removePolicy(sec, ptype, rule) {
|
|
40
40
|
const filteredPolicies = this.policies.filter(policy => {
|
|
41
41
|
let flag = true;
|
|
42
|
-
flag
|
|
42
|
+
flag &&= ptype === policy.ptype;
|
|
43
43
|
if (rule.length > 0) {
|
|
44
|
-
flag
|
|
44
|
+
flag &&= rule[0] === policy.v0;
|
|
45
45
|
}
|
|
46
46
|
if (rule.length > 1) {
|
|
47
|
-
flag
|
|
47
|
+
flag &&= rule[1] === policy.v1;
|
|
48
48
|
}
|
|
49
49
|
if (rule.length > 2) {
|
|
50
|
-
flag
|
|
50
|
+
flag &&= rule[2] === policy.v2;
|
|
51
51
|
}
|
|
52
52
|
if (rule.length > 3) {
|
|
53
|
-
flag
|
|
53
|
+
flag &&= rule[3] === policy.v3;
|
|
54
54
|
}
|
|
55
55
|
if (rule.length > 4) {
|
|
56
|
-
flag
|
|
56
|
+
flag &&= rule[4] === policy.v4;
|
|
57
57
|
}
|
|
58
58
|
if (rule.length > 5) {
|
|
59
|
-
flag
|
|
59
|
+
flag &&= rule[5] === policy.v5;
|
|
60
60
|
}
|
|
61
61
|
return !flag;
|
|
62
62
|
});
|
|
@@ -77,24 +77,24 @@ class BaseAdapter {
|
|
|
77
77
|
rule.push(...fieldValues);
|
|
78
78
|
const filteredPolicies = this.policies.filter(policy => {
|
|
79
79
|
let flag = true;
|
|
80
|
-
flag
|
|
80
|
+
flag &&= ptype === policy.ptype;
|
|
81
81
|
if (rule.length > 0 && rule[0]) {
|
|
82
|
-
flag
|
|
82
|
+
flag &&= rule[0] === policy.v0;
|
|
83
83
|
}
|
|
84
84
|
if (rule.length > 1 && rule[1]) {
|
|
85
|
-
flag
|
|
85
|
+
flag &&= rule[1] === policy.v1;
|
|
86
86
|
}
|
|
87
87
|
if (rule.length > 2 && rule[2]) {
|
|
88
|
-
flag
|
|
88
|
+
flag &&= rule[2] === policy.v2;
|
|
89
89
|
}
|
|
90
90
|
if (rule.length > 3 && rule[3]) {
|
|
91
|
-
flag
|
|
91
|
+
flag &&= rule[3] === policy.v3;
|
|
92
92
|
}
|
|
93
93
|
if (rule.length > 4 && rule[4]) {
|
|
94
|
-
flag
|
|
94
|
+
flag &&= rule[4] === policy.v4;
|
|
95
95
|
}
|
|
96
96
|
if (rule.length > 5 && rule[5]) {
|
|
97
|
-
flag
|
|
97
|
+
flag &&= rule[5] === policy.v5;
|
|
98
98
|
}
|
|
99
99
|
return !flag;
|
|
100
100
|
});
|
package/dist/auth.guard.js
CHANGED
|
@@ -16,7 +16,7 @@ const enforcer_service_1 = require("./enforcer.service");
|
|
|
16
16
|
const constants_1 = require("./constants");
|
|
17
17
|
let AuthGuard = AuthGuard_1 = class AuthGuard {
|
|
18
18
|
async canActivate(context, supplierClz, methodName) {
|
|
19
|
-
const permissions =
|
|
19
|
+
const permissions = core_1.MetadataManager.getMetadata(constants_1.PERMISSIONS_METADATA_KEY, supplierClz, methodName);
|
|
20
20
|
if (!permissions) {
|
|
21
21
|
return true;
|
|
22
22
|
}
|
|
@@ -63,6 +63,7 @@ let AuthGuard = AuthGuard_1 = class AuthGuard {
|
|
|
63
63
|
return true;
|
|
64
64
|
}
|
|
65
65
|
};
|
|
66
|
+
exports.AuthGuard = AuthGuard;
|
|
66
67
|
__decorate([
|
|
67
68
|
(0, core_1.Inject)(),
|
|
68
69
|
__metadata("design:type", enforcer_service_1.CasbinEnforcerService)
|
|
@@ -71,8 +72,7 @@ __decorate([
|
|
|
71
72
|
(0, core_1.Config)('casbin'),
|
|
72
73
|
__metadata("design:type", Object)
|
|
73
74
|
], AuthGuard.prototype, "casbinConfig", void 0);
|
|
74
|
-
AuthGuard = AuthGuard_1 = __decorate([
|
|
75
|
+
exports.AuthGuard = AuthGuard = AuthGuard_1 = __decorate([
|
|
75
76
|
(0, core_1.Guard)()
|
|
76
77
|
], AuthGuard);
|
|
77
|
-
exports.AuthGuard = AuthGuard;
|
|
78
78
|
//# sourceMappingURL=auth.guard.js.map
|
package/dist/configuration.js
CHANGED
|
@@ -14,7 +14,8 @@ let CasbinConfiguration = class CasbinConfiguration {
|
|
|
14
14
|
await container.getAsync(enforcer_service_1.CasbinEnforcerService);
|
|
15
15
|
}
|
|
16
16
|
};
|
|
17
|
-
CasbinConfiguration =
|
|
17
|
+
exports.CasbinConfiguration = CasbinConfiguration;
|
|
18
|
+
exports.CasbinConfiguration = CasbinConfiguration = __decorate([
|
|
18
19
|
(0, core_1.Configuration)({
|
|
19
20
|
namespace: 'casbin',
|
|
20
21
|
importConfigs: [
|
|
@@ -26,5 +27,4 @@ CasbinConfiguration = __decorate([
|
|
|
26
27
|
],
|
|
27
28
|
})
|
|
28
29
|
], CasbinConfiguration);
|
|
29
|
-
exports.CasbinConfiguration = CasbinConfiguration;
|
|
30
30
|
//# sourceMappingURL=configuration.js.map
|
package/dist/constants.js
CHANGED
|
@@ -8,13 +8,13 @@ var AuthActionVerb;
|
|
|
8
8
|
AuthActionVerb["UPDATE"] = "update";
|
|
9
9
|
AuthActionVerb["DELETE"] = "delete";
|
|
10
10
|
AuthActionVerb["READ"] = "read";
|
|
11
|
-
})(AuthActionVerb
|
|
11
|
+
})(AuthActionVerb || (exports.AuthActionVerb = AuthActionVerb = {}));
|
|
12
12
|
var AuthPossession;
|
|
13
13
|
(function (AuthPossession) {
|
|
14
14
|
AuthPossession["ANY"] = "any";
|
|
15
15
|
AuthPossession["OWN"] = "own";
|
|
16
16
|
AuthPossession["OWN_ANY"] = "own|any";
|
|
17
|
-
})(AuthPossession
|
|
17
|
+
})(AuthPossession || (exports.AuthPossession = AuthPossession = {}));
|
|
18
18
|
var AuthAction;
|
|
19
19
|
(function (AuthAction) {
|
|
20
20
|
AuthAction["CREATE_ANY"] = "create:any";
|
|
@@ -25,5 +25,5 @@ var AuthAction;
|
|
|
25
25
|
AuthAction["DELETE_OWN"] = "delete:own";
|
|
26
26
|
AuthAction["READ_ANY"] = "read:any";
|
|
27
27
|
AuthAction["READ_OWN"] = "read:own";
|
|
28
|
-
})(AuthAction
|
|
28
|
+
})(AuthAction || (exports.AuthAction = AuthAction = {}));
|
|
29
29
|
//# sourceMappingURL=constants.js.map
|
package/dist/decorator.js
CHANGED
|
@@ -16,7 +16,7 @@ function UsePermission(...permissions) {
|
|
|
16
16
|
}
|
|
17
17
|
return item;
|
|
18
18
|
});
|
|
19
|
-
|
|
19
|
+
core_1.MetadataManager.defineMetadata(constants_1.PERMISSIONS_METADATA_KEY, perms, target, propertyKey);
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
22
|
exports.UsePermission = UsePermission;
|
package/dist/enforcer.service.js
CHANGED
|
@@ -29,6 +29,7 @@ let CasbinEnforcerService = class CasbinEnforcerService {
|
|
|
29
29
|
return this.instance;
|
|
30
30
|
}
|
|
31
31
|
};
|
|
32
|
+
exports.CasbinEnforcerService = CasbinEnforcerService;
|
|
32
33
|
__decorate([
|
|
33
34
|
(0, core_1.Config)('casbin'),
|
|
34
35
|
__metadata("design:type", Object)
|
|
@@ -43,10 +44,9 @@ __decorate([
|
|
|
43
44
|
__metadata("design:paramtypes", []),
|
|
44
45
|
__metadata("design:returntype", Promise)
|
|
45
46
|
], CasbinEnforcerService.prototype, "init", null);
|
|
46
|
-
CasbinEnforcerService = __decorate([
|
|
47
|
+
exports.CasbinEnforcerService = CasbinEnforcerService = __decorate([
|
|
47
48
|
(0, core_1.Provide)(),
|
|
48
49
|
(0, core_1.Scope)(core_1.ScopeEnum.Singleton)
|
|
49
50
|
], CasbinEnforcerService);
|
|
50
|
-
exports.CasbinEnforcerService = CasbinEnforcerService;
|
|
51
51
|
(0, core_1.delegateTargetAllPrototypeMethod)(CasbinEnforcerService, casbin_1.Enforcer);
|
|
52
52
|
//# sourceMappingURL=enforcer.service.js.map
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@midwayjs/casbin",
|
|
3
3
|
"description": "midway casbin component",
|
|
4
|
-
"version": "
|
|
4
|
+
"version": "4.0.0-alpha.1",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "index.d.ts",
|
|
7
7
|
"files": [
|
|
@@ -10,9 +10,9 @@
|
|
|
10
10
|
"index.d.ts"
|
|
11
11
|
],
|
|
12
12
|
"devDependencies": {
|
|
13
|
-
"@midwayjs/core": "^
|
|
14
|
-
"@midwayjs/koa": "^
|
|
15
|
-
"@midwayjs/mock": "^
|
|
13
|
+
"@midwayjs/core": "^4.0.0-alpha.1",
|
|
14
|
+
"@midwayjs/koa": "^4.0.0-alpha.1",
|
|
15
|
+
"@midwayjs/mock": "^4.0.0-alpha.1"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"casbin": "5.32.0"
|
|
@@ -26,8 +26,8 @@
|
|
|
26
26
|
"license": "MIT",
|
|
27
27
|
"scripts": {
|
|
28
28
|
"build": "tsc",
|
|
29
|
-
"test": "node
|
|
30
|
-
"cov": "node
|
|
29
|
+
"test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
|
|
30
|
+
"cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit",
|
|
31
31
|
"ci": "npm run test",
|
|
32
32
|
"lint": "mwts check"
|
|
33
33
|
},
|
|
@@ -38,5 +38,5 @@
|
|
|
38
38
|
"type": "git",
|
|
39
39
|
"url": "https://github.com/midwayjs/midway.git"
|
|
40
40
|
},
|
|
41
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
|
|
42
42
|
}
|