@dracul/audit-backend 1.23.5 → 1.24.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.
- package/lib/custom/modulesPermissions.js +1 -4
- package/lib/graphql/index.js +19 -16
- package/lib/graphql/resolvers/AuditResolvers.js +18 -3
- package/lib/graphql/types/AuditTypes.graphql +5 -1
- package/lib/index.js +2 -10
- package/lib/models/AuditModel.js +0 -3
- package/lib/services/AuditService.js +2 -16
- package/package.json +23 -27
|
@@ -4,8 +4,5 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
|
-
|
|
8
7
|
var _AuditPermissions = require("../permissions/AuditPermissions.js");
|
|
9
|
-
|
|
10
|
-
var _default = [_AuditPermissions.AUDIT_CREATE, _AuditPermissions.AUDIT_MENU, _AuditPermissions.AUDIT_SHOW];
|
|
11
|
-
exports.default = _default;
|
|
8
|
+
var _default = exports.default = [_AuditPermissions.AUDIT_CREATE, _AuditPermissions.AUDIT_MENU, _AuditPermissions.AUDIT_SHOW];
|
package/lib/graphql/index.js
CHANGED
|
@@ -1,22 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.types = exports.resolvers = void 0;
|
|
7
|
+
var _path = _interopRequireDefault(require("path"));
|
|
8
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
9
|
+
const {
|
|
10
|
+
loadFilesSync
|
|
11
|
+
} = require('@graphql-tools/load-files');
|
|
5
12
|
const {
|
|
6
|
-
|
|
7
|
-
mergeTypes,
|
|
13
|
+
mergeTypeDefs,
|
|
8
14
|
mergeResolvers
|
|
9
|
-
} = require('
|
|
10
|
-
|
|
15
|
+
} = require('@graphql-tools/merge');
|
|
11
16
|
|
|
12
|
-
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
});
|
|
17
|
+
//TYPES
|
|
18
|
+
const typesArray = loadFilesSync(_path.default.join(__dirname, './types'), {
|
|
19
|
+
extensions: ['graphql']
|
|
20
|
+
});
|
|
21
|
+
const types = exports.types = mergeTypeDefs(typesArray);
|
|
16
22
|
|
|
17
|
-
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
types,
|
|
21
|
-
resolvers
|
|
22
|
-
};
|
|
23
|
+
//RESOLVERS
|
|
24
|
+
const resolversArray = loadFilesSync(_path.default.join(__dirname, './resolvers'));
|
|
25
|
+
const resolvers = exports.resolvers = mergeResolvers(resolversArray);
|
|
@@ -3,18 +3,16 @@
|
|
|
3
3
|
const {
|
|
4
4
|
findAudit,
|
|
5
5
|
fetchAudit,
|
|
6
|
+
createAudit,
|
|
6
7
|
paginateAudit
|
|
7
8
|
} = require("../../services/AuditService.js");
|
|
8
|
-
|
|
9
9
|
const {
|
|
10
10
|
AUDIT_SHOW
|
|
11
11
|
} = require("../../permissions/AuditPermissions.js");
|
|
12
|
-
|
|
13
12
|
const {
|
|
14
13
|
AuthenticationError,
|
|
15
14
|
ForbiddenError
|
|
16
15
|
} = require("apollo-server-express");
|
|
17
|
-
|
|
18
16
|
const resolvers = {
|
|
19
17
|
Query: {
|
|
20
18
|
findAudit: (_, {
|
|
@@ -50,6 +48,23 @@ const resolvers = {
|
|
|
50
48
|
if (!rbac.isAllowed(user.id, AUDIT_SHOW)) throw new ForbiddenError("Not Authorized");
|
|
51
49
|
return paginateAudit(pageNumber, itemsPerPage, search, filters, orderBy, orderDesc);
|
|
52
50
|
}
|
|
51
|
+
},
|
|
52
|
+
Mutation: {
|
|
53
|
+
createAudit: (_, {
|
|
54
|
+
action,
|
|
55
|
+
resource,
|
|
56
|
+
description
|
|
57
|
+
}, {
|
|
58
|
+
user
|
|
59
|
+
}) => {
|
|
60
|
+
if (!user) throw new AuthenticationError("Unauthenticated");
|
|
61
|
+
return createAudit(user, {
|
|
62
|
+
user: user.id,
|
|
63
|
+
action,
|
|
64
|
+
resource,
|
|
65
|
+
description
|
|
66
|
+
});
|
|
67
|
+
}
|
|
53
68
|
}
|
|
54
69
|
};
|
|
55
70
|
module.exports = resolvers;
|
|
@@ -17,4 +17,8 @@ type Query {
|
|
|
17
17
|
findAudit(id:ID!): Audit
|
|
18
18
|
fetchAudit: [Audit]
|
|
19
19
|
paginateAudit( pageNumber: Int, itemsPerPage: Int, search: String, filters: [FilterInput],orderBy: String, orderDesc: Boolean): AuditPaginated
|
|
20
|
-
}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
type Mutation {
|
|
23
|
+
createAudit(action: String!, resource: String!, description: String): Audit
|
|
24
|
+
}
|
package/lib/index.js
CHANGED
|
@@ -40,19 +40,11 @@ Object.defineProperty(exports, "types", {
|
|
|
40
40
|
return _index.types;
|
|
41
41
|
}
|
|
42
42
|
});
|
|
43
|
-
|
|
44
43
|
var _index = require("./graphql/index.js");
|
|
45
|
-
|
|
46
44
|
var permissions = _interopRequireWildcard(require("./permissions/AuditPermissions.js"));
|
|
47
|
-
|
|
48
45
|
exports.permissions = permissions;
|
|
49
|
-
|
|
50
46
|
var _AuditModel = _interopRequireDefault(require("./models/AuditModel.js"));
|
|
51
|
-
|
|
52
47
|
var _AuditService = require("./services/AuditService.js");
|
|
53
|
-
|
|
54
48
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
55
|
-
|
|
56
|
-
function
|
|
57
|
-
|
|
58
|
-
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
49
|
+
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
50
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
package/lib/models/AuditModel.js
CHANGED
|
@@ -3,11 +3,8 @@
|
|
|
3
3
|
const {
|
|
4
4
|
mongoose
|
|
5
5
|
} = require('@dracul/common-backend');
|
|
6
|
-
|
|
7
6
|
const mongoosePaginate = require('mongoose-paginate-v2');
|
|
8
|
-
|
|
9
7
|
const uniqueValidator = require('mongoose-unique-validator');
|
|
10
|
-
|
|
11
8
|
const Schema = mongoose.Schema;
|
|
12
9
|
const AuditSchema = new Schema({
|
|
13
10
|
user: {
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
const Audit = require('../models/AuditModel.js');
|
|
4
|
-
|
|
5
4
|
const {
|
|
6
5
|
UserInputError
|
|
7
6
|
} = require('apollo-server-express');
|
|
8
|
-
|
|
9
7
|
const findAudit = async function (id) {
|
|
10
8
|
return new Promise((resolve, reject) => {
|
|
11
9
|
Audit.findOne({
|
|
@@ -13,17 +11,14 @@ const findAudit = async function (id) {
|
|
|
13
11
|
}).populate('user').exec((err, res) => err ? reject(err) : resolve(res));
|
|
14
12
|
});
|
|
15
13
|
};
|
|
16
|
-
|
|
17
14
|
const fetchAudit = async function () {
|
|
18
15
|
return new Promise((resolve, reject) => {
|
|
19
16
|
Audit.find({}).populate('user').exec((err, res) => err ? reject(err) : resolve(res));
|
|
20
17
|
});
|
|
21
18
|
};
|
|
22
|
-
|
|
23
19
|
const paginateAudit = function (pageNumber = 1, itemsPerPage = 5, search = null, filters = null, orderBy = null, orderDesc = false) {
|
|
24
20
|
function qs(search, filters) {
|
|
25
21
|
let qs = {};
|
|
26
|
-
|
|
27
22
|
if (search) {
|
|
28
23
|
qs = {
|
|
29
24
|
$or: [{
|
|
@@ -34,10 +29,8 @@ const paginateAudit = function (pageNumber = 1, itemsPerPage = 5, search = null,
|
|
|
34
29
|
}]
|
|
35
30
|
};
|
|
36
31
|
}
|
|
37
|
-
|
|
38
32
|
return qs;
|
|
39
33
|
}
|
|
40
|
-
|
|
41
34
|
function qsFilter(filters) {
|
|
42
35
|
if (filters) {
|
|
43
36
|
const qsFilter = {};
|
|
@@ -52,14 +45,12 @@ const paginateAudit = function (pageNumber = 1, itemsPerPage = 5, search = null,
|
|
|
52
45
|
[operator]: value
|
|
53
46
|
});
|
|
54
47
|
break;
|
|
55
|
-
|
|
56
48
|
case 'action':
|
|
57
49
|
value && (qsFilter.action = {
|
|
58
50
|
[operator]: value,
|
|
59
51
|
$options: "i"
|
|
60
52
|
});
|
|
61
53
|
break;
|
|
62
|
-
|
|
63
54
|
case 'resource':
|
|
64
55
|
value && (qsFilter.resource = {
|
|
65
56
|
[operator]: value,
|
|
@@ -71,14 +62,13 @@ const paginateAudit = function (pageNumber = 1, itemsPerPage = 5, search = null,
|
|
|
71
62
|
return qsFilter;
|
|
72
63
|
}
|
|
73
64
|
}
|
|
74
|
-
|
|
75
65
|
function getSort(orderBy, orderDesc) {
|
|
76
66
|
return orderBy ? (orderDesc ? '-' : '') + orderBy : null;
|
|
77
67
|
}
|
|
78
|
-
|
|
79
68
|
const populate = ['user'];
|
|
80
69
|
const sort = getSort(orderBy, orderDesc);
|
|
81
|
-
const query = {
|
|
70
|
+
const query = {
|
|
71
|
+
...qs(search),
|
|
82
72
|
...qsFilter(filters)
|
|
83
73
|
};
|
|
84
74
|
const params = {
|
|
@@ -97,7 +87,6 @@ const paginateAudit = function (pageNumber = 1, itemsPerPage = 5, search = null,
|
|
|
97
87
|
}).catch(err => reject(err));
|
|
98
88
|
});
|
|
99
89
|
};
|
|
100
|
-
|
|
101
90
|
const createAudit = async function (authUser, {
|
|
102
91
|
user,
|
|
103
92
|
action,
|
|
@@ -119,15 +108,12 @@ const createAudit = async function (authUser, {
|
|
|
119
108
|
inputErrors: error.errors
|
|
120
109
|
}));
|
|
121
110
|
}
|
|
122
|
-
|
|
123
111
|
return rejects(error);
|
|
124
112
|
}
|
|
125
|
-
|
|
126
113
|
doc.populate('user').execPopulate(() => resolve(doc));
|
|
127
114
|
});
|
|
128
115
|
});
|
|
129
116
|
};
|
|
130
|
-
|
|
131
117
|
module.exports = {
|
|
132
118
|
createAudit,
|
|
133
119
|
fetchAudit,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dracul/audit-backend",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.24.0",
|
|
4
4
|
"description": "Audit Backend",
|
|
5
5
|
"author": "Cristian Incarnato <cristian.cdi@gmail.com>",
|
|
6
6
|
"homepage": "https://github.com/draculjs/modular-framework#readme",
|
|
@@ -25,44 +25,40 @@
|
|
|
25
25
|
"url": "https://github.com/draculjs/modular-framework/issues"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@dracul/common-backend": "^1.
|
|
29
|
-
"@dracul/logger-backend": "^1.
|
|
30
|
-
"@dracul/notification-backend": "^1.
|
|
31
|
-
"@dracul/settings-backend": "^1.
|
|
32
|
-
"@dracul/user-backend": "^1.
|
|
33
|
-
"apollo-server-express": "^2.12.0",
|
|
34
|
-
"dayjs": "^1.10.7",
|
|
35
|
-
"dotenv": "^16.0.3",
|
|
36
|
-
"merge-graphql-schemas": "^1.7.8",
|
|
37
|
-
"mongoose": "^5.9.19",
|
|
38
|
-
"mongoose-paginate-v2": "^1.3.6",
|
|
39
|
-
"mongoose-softdelete": "1.1.0",
|
|
40
|
-
"mongoose-unique-validator": "^2.0.3"
|
|
28
|
+
"@dracul/common-backend": "^1.24.0",
|
|
29
|
+
"@dracul/logger-backend": "^1.24.0",
|
|
30
|
+
"@dracul/notification-backend": "^1.24.0",
|
|
31
|
+
"@dracul/settings-backend": "^1.24.0",
|
|
32
|
+
"@dracul/user-backend": "^1.24.0"
|
|
41
33
|
},
|
|
42
34
|
"peerDependencies": {
|
|
35
|
+
"@graphql-tools/load-files": "^7.0.0",
|
|
36
|
+
"@graphql-tools/merge": "^9.0.0",
|
|
43
37
|
"apollo-server-errors": "^2.5.0",
|
|
38
|
+
"apollo-server-express": "^2.12.0",
|
|
39
|
+
"dayjs": "^1.10.7",
|
|
44
40
|
"graphql": "^15.8.0",
|
|
45
41
|
"graphql-tools": "^8.2.0",
|
|
46
|
-
"
|
|
47
|
-
"mongoose": "
|
|
48
|
-
"mongoose-paginate-v2": "^1.6.3",
|
|
42
|
+
"mongoose": "5.13.21",
|
|
43
|
+
"mongoose-paginate-v2": "^1.7.4",
|
|
49
44
|
"mongoose-softdelete": "1.1.0",
|
|
50
45
|
"mongoose-unique-validator": "^2.0.3"
|
|
51
46
|
},
|
|
52
47
|
"devDependencies": {
|
|
53
|
-
"@babel/cli": "^7.
|
|
54
|
-
"@babel/core": "^7.
|
|
55
|
-
"@babel/node": "^7.
|
|
56
|
-
"@babel/plugin-transform-runtime": "^7.
|
|
57
|
-
"@babel/preset-env": "^7.
|
|
48
|
+
"@babel/cli": "^7.23.0",
|
|
49
|
+
"@babel/core": "^7.23.3",
|
|
50
|
+
"@babel/node": "^7.22.19",
|
|
51
|
+
"@babel/plugin-transform-runtime": "^7.23.3",
|
|
52
|
+
"@babel/preset-env": "^7.23.3",
|
|
53
|
+
"@graphql-tools/load-files": "^7.0.0",
|
|
54
|
+
"@graphql-tools/merge": "^9.0.0",
|
|
58
55
|
"graphql": "^15.8.0",
|
|
59
56
|
"graphql-tools": "^8.2.0",
|
|
60
|
-
"jest": "^
|
|
61
|
-
"
|
|
62
|
-
"mongoose": "
|
|
63
|
-
"mongoose-paginate-v2": "^1.6.3",
|
|
57
|
+
"jest": "^29.7.0",
|
|
58
|
+
"mongoose": "5.13.21",
|
|
59
|
+
"mongoose-paginate-v2": "^1.7.4",
|
|
64
60
|
"mongoose-softdelete": "1.1.0",
|
|
65
61
|
"mongoose-unique-validator": "^2.0.3"
|
|
66
62
|
},
|
|
67
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "3f8ab8b3031155a9da0b80798239df5f0042765e"
|
|
68
64
|
}
|