Skip to content

Commit 2ece8ed

Browse files
committed
refactor locks to external repo and update configuration file and code across repos
Change-Type: minor
1 parent 04b3751 commit 2ece8ed

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

conf/agile-idm-core-conf.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
//{"target":{"type":"user"},"locks":[{"path":"hasId","args":["$owner"]}]
2+
//path of agile-security
3+
var path = process.cwd();
4+
25
module.exports = {
36
"storage": {
47
"dbName": "database_"
@@ -7,8 +10,12 @@ module.exports = {
710
module_name: "agile-upfront-leveldb",
811
type: "external",
912
dbName: "database_",
10-
collection: "policies",
13+
collection: "policies"
1114
},
15+
upfront_locks: path+ "/node_modules/agile-upfront-locks/Locks",
16+
upfront_actions: path + "/node_modules/agile-upfront-locks/Actions",
17+
/*upfront_locks: __dirname + "/../node_modules/agile-upfront-locks/Locks",
18+
upfront_actions: __dirname + "/../node_modules/agile-upfront-locks/Actions",*/
1219
"policies": {
1320
"create_entity_policy": [
1421
// actions of an actor are not restricted a priori
@@ -339,7 +346,7 @@ module.exports = {
339346
"required": ["name"]
340347
}, {
341348
"id": "/user",
342-
"additionalProperties": false,
349+
"additionalProperties": true,
343350
"type": "object",
344351
"properties": {
345352
"user_name": {

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
},
1010
"dependencies": {
1111
"agile-audit": "git+https://github.com/Agile-IoT/agile-audit.git#v0.1.0",
12-
"agile-idm-core": "git+https://github.com/Agile-IoT/agile-idm-core.git#v1.2.11",
12+
"agile-idm-core": "git+https://github.com/Agile-IoT/agile-idm-core.git#v1.3.1",
1313
"agile-idm-entity-storage": "git+https://github.com/Agile-IoT/agile-idm-entity-storage#v1.0.3",
14-
"agile-policies": "git+https://github.com/Agile-IoT/agile-policies.git#v0.2.2",
14+
"agile-policies": "git+https://github.com/Agile-IoT/agile-policies.git#v0.3.0",
1515
"bcrypt": "^1.0.2",
1616
"body-parser": "1.x",
1717
"clone": "1.0.2",
@@ -69,4 +69,4 @@
6969
],
7070
"author": "nopbyte",
7171
"license": "MIT"
72-
}
72+
}

rpi-conf/agile-idm-core-conf.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
var path = process.cwd();
12
module.exports = {
23
"storage": {
34
"dbName": "/root/idm.db/database_"
@@ -8,6 +9,8 @@ module.exports = {
89
dbName: "/root/idm.db/database_",
910
collection: "policies",
1011
},
12+
upfront_locks: path+ "/node_modules/agile-upfront-locks/Locks",
13+
upfront_actions: path + "/node_modules/agile-upfront-locks/Actions",
1114
"policies": {
1215
"create_entity_policy": [
1316
// actions of an actor are not restricted a priori

0 commit comments

Comments
 (0)