directus 9.23.3 → 9.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/dist/app.js +15 -15
- package/dist/auth/drivers/ldap.js +22 -22
- package/dist/auth/drivers/local.js +7 -7
- package/dist/auth/drivers/oauth2.js +27 -25
- package/dist/auth/drivers/openid.js +32 -30
- package/dist/auth/drivers/saml.js +10 -10
- package/dist/auth.js +4 -3
- package/dist/cache.js +16 -11
- package/dist/cli/commands/bootstrap/index.js +5 -4
- package/dist/cli/utils/create-db-connection.js +1 -1
- package/dist/cli/utils/create-env/index.js +1 -1
- package/dist/constants.d.ts +1 -0
- package/dist/constants.js +6 -5
- package/dist/controllers/activity.js +10 -10
- package/dist/controllers/assets.js +19 -18
- package/dist/controllers/auth.js +16 -16
- package/dist/controllers/collections.js +11 -11
- package/dist/controllers/dashboards.js +11 -11
- package/dist/controllers/extensions.js +3 -3
- package/dist/controllers/fields.js +17 -17
- package/dist/controllers/files.js +18 -17
- package/dist/controllers/flows.js +13 -13
- package/dist/controllers/folders.js +11 -11
- package/dist/controllers/graphql.js +6 -6
- package/dist/controllers/items.js +19 -19
- package/dist/controllers/notifications.js +11 -11
- package/dist/controllers/operations.js +11 -11
- package/dist/controllers/panels.js +11 -11
- package/dist/controllers/permissions.js +11 -11
- package/dist/controllers/presets.js +11 -11
- package/dist/controllers/relations.js +11 -11
- package/dist/controllers/revisions.js +3 -3
- package/dist/controllers/roles.js +11 -11
- package/dist/controllers/schema.js +5 -5
- package/dist/controllers/server.js +7 -7
- package/dist/controllers/settings.js +2 -2
- package/dist/controllers/shares.js +14 -14
- package/dist/controllers/users.js +16 -16
- package/dist/controllers/utils.js +7 -7
- package/dist/controllers/webhooks.js +11 -11
- package/dist/database/helpers/fn/types.d.ts +0 -1
- package/dist/database/helpers/fn/types.js +0 -2
- package/dist/database/helpers/index.d.ts +3 -3
- package/dist/database/index.js +5 -5
- package/dist/database/migrations/20210805B-change-image-metadata-structure.js +15 -15
- package/dist/database/migrations/run.js +1 -1
- package/dist/database/run-ast.js +6 -6
- package/dist/database/system-data/collections/index.js +2 -2
- package/dist/database/system-data/fields/index.js +3 -3
- package/dist/env.js +1 -1
- package/dist/exceptions/database/dialects/mssql.js +2 -2
- package/dist/exceptions/database/dialects/mysql.js +6 -6
- package/dist/exceptions/database/record-not-unique.d.ts +1 -1
- package/dist/extensions.js +10 -10
- package/dist/flows.js +33 -31
- package/dist/logger.d.ts +1 -0
- package/dist/logger.js +32 -32
- package/dist/mailer.js +16 -16
- package/dist/messenger.js +4 -4
- package/dist/middleware/authenticate.d.ts +1 -1
- package/dist/middleware/authenticate.js +2 -2
- package/dist/middleware/cache.js +11 -11
- package/dist/middleware/collection-exists.js +4 -4
- package/dist/middleware/cors.js +8 -8
- package/dist/middleware/error-handler.js +2 -2
- package/dist/middleware/extract-token.js +3 -3
- package/dist/middleware/get-permissions.js +1 -1
- package/dist/middleware/graphql.js +12 -6
- package/dist/middleware/rate-limiter-global.js +5 -5
- package/dist/middleware/rate-limiter-ip.js +2 -2
- package/dist/middleware/respond.js +16 -16
- package/dist/middleware/sanitize-query.js +1 -1
- package/dist/middleware/schema.js +1 -1
- package/dist/middleware/use-collection.js +1 -1
- package/dist/middleware/validate-batch.js +1 -1
- package/dist/operations/exec/index.js +2 -2
- package/dist/rate-limiter.js +1 -1
- package/dist/request/validate-ip.js +2 -2
- package/dist/server.js +4 -4
- package/dist/services/activity.js +14 -14
- package/dist/services/assets.js +6 -6
- package/dist/services/authentication.js +9 -9
- package/dist/services/collections.js +9 -9
- package/dist/services/fields.js +5 -5
- package/dist/services/files.js +18 -18
- package/dist/services/graphql/index.js +170 -116
- package/dist/services/import-export.js +6 -6
- package/dist/services/items.js +6 -6
- package/dist/services/mail/index.js +5 -5
- package/dist/services/meta.js +1 -0
- package/dist/services/notifications.js +4 -4
- package/dist/services/relations.js +4 -4
- package/dist/services/revisions.js +3 -3
- package/dist/services/roles.js +5 -5
- package/dist/services/server.js +27 -27
- package/dist/services/shares.js +9 -9
- package/dist/services/specifications.js +5 -3
- package/dist/services/users.d.ts +1 -5
- package/dist/services/users.js +24 -27
- package/dist/storage/register-locations.js +1 -1
- package/dist/utils/apply-diff.js +12 -12
- package/dist/utils/apply-query.js +3 -2
- package/dist/utils/dynamic-import.js +1 -1
- package/dist/utils/generate-hash.js +1 -1
- package/dist/utils/get-ast-from-query.js +2 -2
- package/dist/utils/get-auth-providers.js +1 -1
- package/dist/utils/get-cache-headers.js +3 -3
- package/dist/utils/get-collection-from-alias.js +1 -0
- package/dist/utils/get-column-path.js +2 -1
- package/dist/utils/get-default-value.js +1 -1
- package/dist/utils/get-ip-from-req.js +2 -2
- package/dist/utils/get-permissions.js +11 -11
- package/dist/utils/get-schema.js +5 -5
- package/dist/utils/get-snapshot-diff.js +1 -1
- package/dist/utils/is-url-allowed.js +5 -2
- package/dist/utils/parse-image-metadata.js +3 -3
- package/dist/utils/reduce-schema.js +5 -5
- package/dist/utils/sanitize-query.js +26 -26
- package/dist/utils/should-skip-cache.js +13 -4
- package/dist/utils/strip-function.js +1 -1
- package/dist/utils/telemetry.d.ts +1 -0
- package/dist/utils/telemetry.js +30 -0
- package/dist/utils/validate-keys.js +1 -1
- package/dist/utils/validate-query.js +1 -1
- package/dist/utils/validate-storage.js +8 -8
- package/dist/webhooks.js +2 -2
- package/package.json +13 -13
- package/dist/utils/redact-header-cookies.d.ts +0 -1
- package/dist/utils/redact-header-cookies.js +0 -11
- package/dist/utils/track.d.ts +0 -1
- package/dist/utils/track.js +0 -81
- /package/dist/{utils/redact-header-cookies.test.d.ts → logger.test.d.ts} +0 -0
|
@@ -30,11 +30,11 @@ router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
30
30
|
try {
|
|
31
31
|
if (Array.isArray(req.body)) {
|
|
32
32
|
const items = await service.readMany(savedKeys, req.sanitizedQuery);
|
|
33
|
-
res.locals
|
|
33
|
+
res.locals['payload'] = { data: items };
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
36
36
|
const item = await service.readOne(savedKeys[0], req.sanitizedQuery);
|
|
37
|
-
res.locals
|
|
37
|
+
res.locals['payload'] = { data: item };
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
catch (error) {
|
|
@@ -56,7 +56,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
56
56
|
});
|
|
57
57
|
const records = await service.readByQuery(req.sanitizedQuery);
|
|
58
58
|
const meta = await metaService.getMetaForQuery(req.collection, req.sanitizedQuery);
|
|
59
|
-
res.locals
|
|
59
|
+
res.locals['payload'] = { data: records || null, meta };
|
|
60
60
|
return next();
|
|
61
61
|
});
|
|
62
62
|
router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
|
|
@@ -66,8 +66,8 @@ router.get('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
66
66
|
accountability: req.accountability,
|
|
67
67
|
schema: req.schema,
|
|
68
68
|
});
|
|
69
|
-
const record = await service.readOne(req.params
|
|
70
|
-
res.locals
|
|
69
|
+
const record = await service.readOne(req.params['pk'], req.sanitizedQuery);
|
|
70
|
+
res.locals['payload'] = { data: record || null };
|
|
71
71
|
return next();
|
|
72
72
|
}), respond_1.respond);
|
|
73
73
|
router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -88,7 +88,7 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
|
|
|
88
88
|
}
|
|
89
89
|
try {
|
|
90
90
|
const result = await service.readMany(keys, req.sanitizedQuery);
|
|
91
|
-
res.locals
|
|
91
|
+
res.locals['payload'] = { data: result };
|
|
92
92
|
}
|
|
93
93
|
catch (error) {
|
|
94
94
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -103,10 +103,10 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
103
103
|
accountability: req.accountability,
|
|
104
104
|
schema: req.schema,
|
|
105
105
|
});
|
|
106
|
-
const primaryKey = await service.updateOne(req.params
|
|
106
|
+
const primaryKey = await service.updateOne(req.params['pk'], req.body);
|
|
107
107
|
try {
|
|
108
108
|
const item = await service.readOne(primaryKey, req.sanitizedQuery);
|
|
109
|
-
res.locals
|
|
109
|
+
res.locals['payload'] = { data: item || null };
|
|
110
110
|
}
|
|
111
111
|
catch (error) {
|
|
112
112
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -116,7 +116,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
116
116
|
}
|
|
117
117
|
return next();
|
|
118
118
|
}), respond_1.respond);
|
|
119
|
-
router.delete('/', (0, async_handler_1.default)(async (req,
|
|
119
|
+
router.delete('/', (0, async_handler_1.default)(async (req, _res, next) => {
|
|
120
120
|
const service = new services_1.OperationsService({
|
|
121
121
|
accountability: req.accountability,
|
|
122
122
|
schema: req.schema,
|
|
@@ -133,12 +133,12 @@ router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
133
133
|
}
|
|
134
134
|
return next();
|
|
135
135
|
}), respond_1.respond);
|
|
136
|
-
router.delete('/:pk', (0, async_handler_1.default)(async (req,
|
|
136
|
+
router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
|
|
137
137
|
const service = new services_1.OperationsService({
|
|
138
138
|
accountability: req.accountability,
|
|
139
139
|
schema: req.schema,
|
|
140
140
|
});
|
|
141
|
-
await service.deleteOne(req.params
|
|
141
|
+
await service.deleteOne(req.params['pk']);
|
|
142
142
|
return next();
|
|
143
143
|
}), respond_1.respond);
|
|
144
144
|
exports.default = router;
|
|
@@ -30,11 +30,11 @@ router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
30
30
|
try {
|
|
31
31
|
if (Array.isArray(req.body)) {
|
|
32
32
|
const items = await service.readMany(savedKeys, req.sanitizedQuery);
|
|
33
|
-
res.locals
|
|
33
|
+
res.locals['payload'] = { data: items };
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
36
36
|
const item = await service.readOne(savedKeys[0], req.sanitizedQuery);
|
|
37
|
-
res.locals
|
|
37
|
+
res.locals['payload'] = { data: item };
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
catch (error) {
|
|
@@ -56,7 +56,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
56
56
|
});
|
|
57
57
|
const records = await service.readByQuery(req.sanitizedQuery);
|
|
58
58
|
const meta = await metaService.getMetaForQuery(req.collection, req.sanitizedQuery);
|
|
59
|
-
res.locals
|
|
59
|
+
res.locals['payload'] = { data: records || null, meta };
|
|
60
60
|
return next();
|
|
61
61
|
});
|
|
62
62
|
router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
|
|
@@ -66,8 +66,8 @@ router.get('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
66
66
|
accountability: req.accountability,
|
|
67
67
|
schema: req.schema,
|
|
68
68
|
});
|
|
69
|
-
const record = await service.readOne(req.params
|
|
70
|
-
res.locals
|
|
69
|
+
const record = await service.readOne(req.params['pk'], req.sanitizedQuery);
|
|
70
|
+
res.locals['payload'] = { data: record || null };
|
|
71
71
|
return next();
|
|
72
72
|
}), respond_1.respond);
|
|
73
73
|
router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -88,7 +88,7 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
|
|
|
88
88
|
}
|
|
89
89
|
try {
|
|
90
90
|
const result = await service.readMany(keys, req.sanitizedQuery);
|
|
91
|
-
res.locals
|
|
91
|
+
res.locals['payload'] = { data: result };
|
|
92
92
|
}
|
|
93
93
|
catch (error) {
|
|
94
94
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -103,10 +103,10 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
103
103
|
accountability: req.accountability,
|
|
104
104
|
schema: req.schema,
|
|
105
105
|
});
|
|
106
|
-
const primaryKey = await service.updateOne(req.params
|
|
106
|
+
const primaryKey = await service.updateOne(req.params['pk'], req.body);
|
|
107
107
|
try {
|
|
108
108
|
const item = await service.readOne(primaryKey, req.sanitizedQuery);
|
|
109
|
-
res.locals
|
|
109
|
+
res.locals['payload'] = { data: item || null };
|
|
110
110
|
}
|
|
111
111
|
catch (error) {
|
|
112
112
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -116,7 +116,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
116
116
|
}
|
|
117
117
|
return next();
|
|
118
118
|
}), respond_1.respond);
|
|
119
|
-
router.delete('/', (0, async_handler_1.default)(async (req,
|
|
119
|
+
router.delete('/', (0, async_handler_1.default)(async (req, _res, next) => {
|
|
120
120
|
const service = new services_1.PanelsService({
|
|
121
121
|
accountability: req.accountability,
|
|
122
122
|
schema: req.schema,
|
|
@@ -133,12 +133,12 @@ router.delete('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
133
133
|
}
|
|
134
134
|
return next();
|
|
135
135
|
}), respond_1.respond);
|
|
136
|
-
router.delete('/:pk', (0, async_handler_1.default)(async (req,
|
|
136
|
+
router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
|
|
137
137
|
const service = new services_1.PanelsService({
|
|
138
138
|
accountability: req.accountability,
|
|
139
139
|
schema: req.schema,
|
|
140
140
|
});
|
|
141
|
-
await service.deleteOne(req.params
|
|
141
|
+
await service.deleteOne(req.params['pk']);
|
|
142
142
|
return next();
|
|
143
143
|
}), respond_1.respond);
|
|
144
144
|
exports.default = router;
|
|
@@ -30,11 +30,11 @@ router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
30
30
|
try {
|
|
31
31
|
if (Array.isArray(req.body)) {
|
|
32
32
|
const items = await service.readMany(savedKeys, req.sanitizedQuery);
|
|
33
|
-
res.locals
|
|
33
|
+
res.locals['payload'] = { data: items };
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
36
36
|
const item = await service.readOne(savedKeys[0], req.sanitizedQuery);
|
|
37
|
-
res.locals
|
|
37
|
+
res.locals['payload'] = { data: item };
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
catch (error) {
|
|
@@ -65,7 +65,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
65
65
|
result = await service.readByQuery(req.sanitizedQuery);
|
|
66
66
|
}
|
|
67
67
|
const meta = await metaService.getMetaForQuery('directus_permissions', req.sanitizedQuery);
|
|
68
|
-
res.locals
|
|
68
|
+
res.locals['payload'] = { data: result, meta };
|
|
69
69
|
return next();
|
|
70
70
|
});
|
|
71
71
|
router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
|
|
@@ -77,8 +77,8 @@ router.get('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
77
77
|
accountability: req.accountability,
|
|
78
78
|
schema: req.schema,
|
|
79
79
|
});
|
|
80
|
-
const record = await service.readOne(req.params
|
|
81
|
-
res.locals
|
|
80
|
+
const record = await service.readOne(req.params['pk'], req.sanitizedQuery);
|
|
81
|
+
res.locals['payload'] = { data: record };
|
|
82
82
|
return next();
|
|
83
83
|
}), respond_1.respond);
|
|
84
84
|
router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -99,7 +99,7 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
|
|
|
99
99
|
}
|
|
100
100
|
try {
|
|
101
101
|
const result = await service.readMany(keys, req.sanitizedQuery);
|
|
102
|
-
res.locals
|
|
102
|
+
res.locals['payload'] = { data: result };
|
|
103
103
|
}
|
|
104
104
|
catch (error) {
|
|
105
105
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -114,10 +114,10 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
114
114
|
accountability: req.accountability,
|
|
115
115
|
schema: req.schema,
|
|
116
116
|
});
|
|
117
|
-
const primaryKey = await service.updateOne(req.params
|
|
117
|
+
const primaryKey = await service.updateOne(req.params['pk'], req.body);
|
|
118
118
|
try {
|
|
119
119
|
const item = await service.readOne(primaryKey, req.sanitizedQuery);
|
|
120
|
-
res.locals
|
|
120
|
+
res.locals['payload'] = { data: item || null };
|
|
121
121
|
}
|
|
122
122
|
catch (error) {
|
|
123
123
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -127,7 +127,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
127
127
|
}
|
|
128
128
|
return next();
|
|
129
129
|
}), respond_1.respond);
|
|
130
|
-
router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req,
|
|
130
|
+
router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, _res, next) => {
|
|
131
131
|
const service = new services_1.PermissionsService({
|
|
132
132
|
accountability: req.accountability,
|
|
133
133
|
schema: req.schema,
|
|
@@ -144,12 +144,12 @@ router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_hand
|
|
|
144
144
|
}
|
|
145
145
|
return next();
|
|
146
146
|
}), respond_1.respond);
|
|
147
|
-
router.delete('/:pk', (0, async_handler_1.default)(async (req,
|
|
147
|
+
router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
|
|
148
148
|
const service = new services_1.PermissionsService({
|
|
149
149
|
accountability: req.accountability,
|
|
150
150
|
schema: req.schema,
|
|
151
151
|
});
|
|
152
|
-
await service.deleteOne(req.params
|
|
152
|
+
await service.deleteOne(req.params['pk']);
|
|
153
153
|
return next();
|
|
154
154
|
}), respond_1.respond);
|
|
155
155
|
exports.default = router;
|
|
@@ -30,11 +30,11 @@ router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
30
30
|
try {
|
|
31
31
|
if (Array.isArray(req.body)) {
|
|
32
32
|
const records = await service.readMany(savedKeys, req.sanitizedQuery);
|
|
33
|
-
res.locals
|
|
33
|
+
res.locals['payload'] = { data: records };
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
36
36
|
const record = await service.readOne(savedKeys[0], req.sanitizedQuery);
|
|
37
|
-
res.locals
|
|
37
|
+
res.locals['payload'] = { data: record };
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
catch (error) {
|
|
@@ -65,7 +65,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
65
65
|
result = await service.readByQuery(req.sanitizedQuery);
|
|
66
66
|
}
|
|
67
67
|
const meta = await metaService.getMetaForQuery('directus_presets', req.sanitizedQuery);
|
|
68
|
-
res.locals
|
|
68
|
+
res.locals['payload'] = { data: result, meta };
|
|
69
69
|
return next();
|
|
70
70
|
});
|
|
71
71
|
router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
|
|
@@ -75,8 +75,8 @@ router.get('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
75
75
|
accountability: req.accountability,
|
|
76
76
|
schema: req.schema,
|
|
77
77
|
});
|
|
78
|
-
const record = await service.readOne(req.params
|
|
79
|
-
res.locals
|
|
78
|
+
const record = await service.readOne(req.params['pk'], req.sanitizedQuery);
|
|
79
|
+
res.locals['payload'] = { data: record || null };
|
|
80
80
|
return next();
|
|
81
81
|
}), respond_1.respond);
|
|
82
82
|
router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -97,7 +97,7 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
|
|
|
97
97
|
}
|
|
98
98
|
try {
|
|
99
99
|
const result = await service.readMany(keys, req.sanitizedQuery);
|
|
100
|
-
res.locals
|
|
100
|
+
res.locals['payload'] = { data: result };
|
|
101
101
|
}
|
|
102
102
|
catch (error) {
|
|
103
103
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -112,10 +112,10 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
112
112
|
accountability: req.accountability,
|
|
113
113
|
schema: req.schema,
|
|
114
114
|
});
|
|
115
|
-
const primaryKey = await service.updateOne(req.params
|
|
115
|
+
const primaryKey = await service.updateOne(req.params['pk'], req.body);
|
|
116
116
|
try {
|
|
117
117
|
const record = await service.readOne(primaryKey, req.sanitizedQuery);
|
|
118
|
-
res.locals
|
|
118
|
+
res.locals['payload'] = { data: record };
|
|
119
119
|
}
|
|
120
120
|
catch (error) {
|
|
121
121
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -125,7 +125,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
125
125
|
}
|
|
126
126
|
return next();
|
|
127
127
|
}), respond_1.respond);
|
|
128
|
-
router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req,
|
|
128
|
+
router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, _res, next) => {
|
|
129
129
|
const service = new services_1.PresetsService({
|
|
130
130
|
accountability: req.accountability,
|
|
131
131
|
schema: req.schema,
|
|
@@ -142,12 +142,12 @@ router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_hand
|
|
|
142
142
|
}
|
|
143
143
|
return next();
|
|
144
144
|
}), respond_1.respond);
|
|
145
|
-
router.delete('/:pk', (0, async_handler_1.default)(async (req,
|
|
145
|
+
router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
|
|
146
146
|
const service = new services_1.PresetsService({
|
|
147
147
|
accountability: req.accountability,
|
|
148
148
|
schema: req.schema,
|
|
149
149
|
});
|
|
150
|
-
await service.deleteOne(req.params
|
|
150
|
+
await service.deleteOne(req.params['pk']);
|
|
151
151
|
return next();
|
|
152
152
|
}), respond_1.respond);
|
|
153
153
|
exports.default = router;
|
|
@@ -19,7 +19,7 @@ router.get('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
19
19
|
schema: req.schema,
|
|
20
20
|
});
|
|
21
21
|
const relations = await service.readAll();
|
|
22
|
-
res.locals
|
|
22
|
+
res.locals['payload'] = { data: relations || null };
|
|
23
23
|
return next();
|
|
24
24
|
}), respond_1.respond);
|
|
25
25
|
router.get('/:collection', collection_exists_1.default, (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -27,8 +27,8 @@ router.get('/:collection', collection_exists_1.default, (0, async_handler_1.defa
|
|
|
27
27
|
accountability: req.accountability,
|
|
28
28
|
schema: req.schema,
|
|
29
29
|
});
|
|
30
|
-
const relations = await service.readAll(req.params
|
|
31
|
-
res.locals
|
|
30
|
+
const relations = await service.readAll(req.params['collection']);
|
|
31
|
+
res.locals['payload'] = { data: relations || null };
|
|
32
32
|
return next();
|
|
33
33
|
}), respond_1.respond);
|
|
34
34
|
router.get('/:collection/:field', collection_exists_1.default, (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -36,8 +36,8 @@ router.get('/:collection/:field', collection_exists_1.default, (0, async_handler
|
|
|
36
36
|
accountability: req.accountability,
|
|
37
37
|
schema: req.schema,
|
|
38
38
|
});
|
|
39
|
-
const relation = await service.readOne(req.params
|
|
40
|
-
res.locals
|
|
39
|
+
const relation = await service.readOne(req.params['collection'], req.params['field']);
|
|
40
|
+
res.locals['payload'] = { data: relation || null };
|
|
41
41
|
return next();
|
|
42
42
|
}), respond_1.respond);
|
|
43
43
|
const newRelationSchema = joi_1.default.object({
|
|
@@ -63,7 +63,7 @@ router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
63
63
|
await service.createOne(req.body);
|
|
64
64
|
try {
|
|
65
65
|
const createdRelation = await service.readOne(req.body.collection, req.body.field);
|
|
66
|
-
res.locals
|
|
66
|
+
res.locals['payload'] = { data: createdRelation || null };
|
|
67
67
|
}
|
|
68
68
|
catch (error) {
|
|
69
69
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -93,10 +93,10 @@ router.patch('/:collection/:field', collection_exists_1.default, (0, async_handl
|
|
|
93
93
|
if (error) {
|
|
94
94
|
throw new exceptions_1.InvalidPayloadException(error.message);
|
|
95
95
|
}
|
|
96
|
-
await service.updateOne(req.params
|
|
96
|
+
await service.updateOne(req.params['collection'], req.params['field'], req.body);
|
|
97
97
|
try {
|
|
98
|
-
const updatedField = await service.readOne(req.params
|
|
99
|
-
res.locals
|
|
98
|
+
const updatedField = await service.readOne(req.params['collection'], req.params['field']);
|
|
99
|
+
res.locals['payload'] = { data: updatedField || null };
|
|
100
100
|
}
|
|
101
101
|
catch (error) {
|
|
102
102
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -106,12 +106,12 @@ router.patch('/:collection/:field', collection_exists_1.default, (0, async_handl
|
|
|
106
106
|
}
|
|
107
107
|
return next();
|
|
108
108
|
}), respond_1.respond);
|
|
109
|
-
router.delete('/:collection/:field', collection_exists_1.default, (0, async_handler_1.default)(async (req,
|
|
109
|
+
router.delete('/:collection/:field', collection_exists_1.default, (0, async_handler_1.default)(async (req, _res, next) => {
|
|
110
110
|
const service = new services_1.RelationsService({
|
|
111
111
|
accountability: req.accountability,
|
|
112
112
|
schema: req.schema,
|
|
113
113
|
});
|
|
114
|
-
await service.deleteOne(req.params
|
|
114
|
+
await service.deleteOne(req.params['collection'], req.params['field']);
|
|
115
115
|
return next();
|
|
116
116
|
}), respond_1.respond);
|
|
117
117
|
exports.default = router;
|
|
@@ -22,7 +22,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
22
22
|
});
|
|
23
23
|
const records = await service.readByQuery(req.sanitizedQuery);
|
|
24
24
|
const meta = await metaService.getMetaForQuery('directus_revisions', req.sanitizedQuery);
|
|
25
|
-
res.locals
|
|
25
|
+
res.locals['payload'] = { data: records || null, meta };
|
|
26
26
|
return next();
|
|
27
27
|
});
|
|
28
28
|
router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
|
|
@@ -32,8 +32,8 @@ router.get('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
32
32
|
accountability: req.accountability,
|
|
33
33
|
schema: req.schema,
|
|
34
34
|
});
|
|
35
|
-
const record = await service.readOne(req.params
|
|
36
|
-
res.locals
|
|
35
|
+
const record = await service.readOne(req.params['pk'], req.sanitizedQuery);
|
|
36
|
+
res.locals['payload'] = { data: record || null };
|
|
37
37
|
return next();
|
|
38
38
|
}), respond_1.respond);
|
|
39
39
|
exports.default = router;
|
|
@@ -30,11 +30,11 @@ router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
30
30
|
try {
|
|
31
31
|
if (Array.isArray(req.body)) {
|
|
32
32
|
const items = await service.readMany(savedKeys, req.sanitizedQuery);
|
|
33
|
-
res.locals
|
|
33
|
+
res.locals['payload'] = { data: items };
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
36
36
|
const item = await service.readOne(savedKeys[0], req.sanitizedQuery);
|
|
37
|
-
res.locals
|
|
37
|
+
res.locals['payload'] = { data: item };
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
catch (error) {
|
|
@@ -56,7 +56,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
56
56
|
});
|
|
57
57
|
const records = await service.readByQuery(req.sanitizedQuery);
|
|
58
58
|
const meta = await metaService.getMetaForQuery('directus_roles', req.sanitizedQuery);
|
|
59
|
-
res.locals
|
|
59
|
+
res.locals['payload'] = { data: records || null, meta };
|
|
60
60
|
return next();
|
|
61
61
|
});
|
|
62
62
|
router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
|
|
@@ -66,8 +66,8 @@ router.get('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
66
66
|
accountability: req.accountability,
|
|
67
67
|
schema: req.schema,
|
|
68
68
|
});
|
|
69
|
-
const record = await service.readOne(req.params
|
|
70
|
-
res.locals
|
|
69
|
+
const record = await service.readOne(req.params['pk'], req.sanitizedQuery);
|
|
70
|
+
res.locals['payload'] = { data: record || null };
|
|
71
71
|
return next();
|
|
72
72
|
}), respond_1.respond);
|
|
73
73
|
router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -88,7 +88,7 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
|
|
|
88
88
|
}
|
|
89
89
|
try {
|
|
90
90
|
const result = await service.readMany(keys, req.sanitizedQuery);
|
|
91
|
-
res.locals
|
|
91
|
+
res.locals['payload'] = { data: result };
|
|
92
92
|
}
|
|
93
93
|
catch (error) {
|
|
94
94
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -103,10 +103,10 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
103
103
|
accountability: req.accountability,
|
|
104
104
|
schema: req.schema,
|
|
105
105
|
});
|
|
106
|
-
const primaryKey = await service.updateOne(req.params
|
|
106
|
+
const primaryKey = await service.updateOne(req.params['pk'], req.body);
|
|
107
107
|
try {
|
|
108
108
|
const item = await service.readOne(primaryKey, req.sanitizedQuery);
|
|
109
|
-
res.locals
|
|
109
|
+
res.locals['payload'] = { data: item || null };
|
|
110
110
|
}
|
|
111
111
|
catch (error) {
|
|
112
112
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -116,7 +116,7 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
116
116
|
}
|
|
117
117
|
return next();
|
|
118
118
|
}), respond_1.respond);
|
|
119
|
-
router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req,
|
|
119
|
+
router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_handler_1.default)(async (req, _res, next) => {
|
|
120
120
|
const service = new services_1.RolesService({
|
|
121
121
|
accountability: req.accountability,
|
|
122
122
|
schema: req.schema,
|
|
@@ -133,12 +133,12 @@ router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_hand
|
|
|
133
133
|
}
|
|
134
134
|
return next();
|
|
135
135
|
}), respond_1.respond);
|
|
136
|
-
router.delete('/:pk', (0, async_handler_1.default)(async (req,
|
|
136
|
+
router.delete('/:pk', (0, async_handler_1.default)(async (req, _res, next) => {
|
|
137
137
|
const service = new services_1.RolesService({
|
|
138
138
|
accountability: req.accountability,
|
|
139
139
|
schema: req.schema,
|
|
140
140
|
});
|
|
141
|
-
await service.deleteOne(req.params
|
|
141
|
+
await service.deleteOne(req.params['pk']);
|
|
142
142
|
return next();
|
|
143
143
|
}), respond_1.respond);
|
|
144
144
|
exports.default = router;
|
|
@@ -17,7 +17,7 @@ const router = express_1.default.Router();
|
|
|
17
17
|
router.get('/snapshot', (0, async_handler_1.default)(async (req, res, next) => {
|
|
18
18
|
const service = new schema_1.SchemaService({ accountability: req.accountability });
|
|
19
19
|
const currentSnapshot = await service.snapshot();
|
|
20
|
-
res.locals
|
|
20
|
+
res.locals['payload'] = { data: currentSnapshot };
|
|
21
21
|
return next();
|
|
22
22
|
}), respond_1.respond);
|
|
23
23
|
router.post('/apply', (0, async_handler_1.default)(async (req, _res, next) => {
|
|
@@ -29,7 +29,7 @@ const schemaMultipartHandler = (req, res, next) => {
|
|
|
29
29
|
if (req.is('application/json')) {
|
|
30
30
|
if (Object.keys(req.body).length === 0)
|
|
31
31
|
throw new exceptions_1.InvalidPayloadException(`No data was included in the body`);
|
|
32
|
-
res.locals
|
|
32
|
+
res.locals['uploadedSnapshot'] = req.body;
|
|
33
33
|
return next();
|
|
34
34
|
}
|
|
35
35
|
if (!req.is('multipart/form-data'))
|
|
@@ -70,7 +70,7 @@ const schemaMultipartHandler = (req, res, next) => {
|
|
|
70
70
|
}
|
|
71
71
|
if (!uploadedSnapshot)
|
|
72
72
|
throw new exceptions_1.InvalidPayloadException(`No file was included in the body`);
|
|
73
|
-
res.locals
|
|
73
|
+
res.locals['uploadedSnapshot'] = uploadedSnapshot;
|
|
74
74
|
return next();
|
|
75
75
|
}
|
|
76
76
|
catch (error) {
|
|
@@ -86,13 +86,13 @@ const schemaMultipartHandler = (req, res, next) => {
|
|
|
86
86
|
};
|
|
87
87
|
router.post('/diff', (0, async_handler_1.default)(schemaMultipartHandler), (0, async_handler_1.default)(async (req, res, next) => {
|
|
88
88
|
const service = new schema_1.SchemaService({ accountability: req.accountability });
|
|
89
|
-
const snapshot = res.locals
|
|
89
|
+
const snapshot = res.locals['uploadedSnapshot'];
|
|
90
90
|
const currentSnapshot = await service.snapshot();
|
|
91
91
|
const snapshotDiff = await service.diff(snapshot, { currentSnapshot, force: 'force' in req.query });
|
|
92
92
|
if (!snapshotDiff)
|
|
93
93
|
return next();
|
|
94
94
|
const currentSnapshotHash = (0, get_versioned_hash_1.getVersionedHash)(currentSnapshot);
|
|
95
|
-
res.locals
|
|
95
|
+
res.locals['payload'] = { data: { hash: currentSnapshotHash, diff: snapshotDiff } };
|
|
96
96
|
return next();
|
|
97
97
|
}), respond_1.respond);
|
|
98
98
|
exports.default = router;
|
|
@@ -15,7 +15,7 @@ router.get('/specs/oas', (0, async_handler_1.default)(async (req, res, next) =>
|
|
|
15
15
|
accountability: req.accountability,
|
|
16
16
|
schema: req.schema,
|
|
17
17
|
});
|
|
18
|
-
res.locals
|
|
18
|
+
res.locals['payload'] = await service.oas.generate();
|
|
19
19
|
return next();
|
|
20
20
|
}), respond_1.respond);
|
|
21
21
|
router.get('/specs/graphql/:scope?', (0, async_handler_1.default)(async (req, res) => {
|
|
@@ -27,12 +27,12 @@ router.get('/specs/graphql/:scope?', (0, async_handler_1.default)(async (req, re
|
|
|
27
27
|
accountability: req.accountability,
|
|
28
28
|
schema: req.schema,
|
|
29
29
|
});
|
|
30
|
-
const scope = req.params
|
|
30
|
+
const scope = req.params['scope'] || 'items';
|
|
31
31
|
if (['items', 'system'].includes(scope) === false)
|
|
32
32
|
throw new exceptions_1.RouteNotFoundException(req.path);
|
|
33
33
|
const info = await serverService.serverInfo();
|
|
34
34
|
const result = await service.graphql.generate(scope);
|
|
35
|
-
const filename = info
|
|
35
|
+
const filename = info['project'].project_name + '_' + (0, date_fns_1.format)(new Date(), 'yyyy-MM-dd') + '.graphql';
|
|
36
36
|
res.attachment(filename);
|
|
37
37
|
res.send(result);
|
|
38
38
|
}));
|
|
@@ -42,7 +42,7 @@ router.get('/info', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
42
42
|
schema: req.schema,
|
|
43
43
|
});
|
|
44
44
|
const data = await service.serverInfo();
|
|
45
|
-
res.locals
|
|
45
|
+
res.locals['payload'] = { data };
|
|
46
46
|
return next();
|
|
47
47
|
}), respond_1.respond);
|
|
48
48
|
router.get('/health', (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -52,10 +52,10 @@ router.get('/health', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
52
52
|
});
|
|
53
53
|
const data = await service.health();
|
|
54
54
|
res.setHeader('Content-Type', 'application/health+json');
|
|
55
|
-
if (data
|
|
55
|
+
if (data['status'] === 'error')
|
|
56
56
|
res.status(503);
|
|
57
|
-
res.locals
|
|
58
|
-
res.locals
|
|
57
|
+
res.locals['payload'] = data;
|
|
58
|
+
res.locals['cache'] = false;
|
|
59
59
|
return next();
|
|
60
60
|
}), respond_1.respond);
|
|
61
61
|
exports.default = router;
|
|
@@ -17,7 +17,7 @@ router.get('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
17
17
|
schema: req.schema,
|
|
18
18
|
});
|
|
19
19
|
const records = await service.readSingleton(req.sanitizedQuery);
|
|
20
|
-
res.locals
|
|
20
|
+
res.locals['payload'] = { data: records || null };
|
|
21
21
|
return next();
|
|
22
22
|
}), respond_1.respond);
|
|
23
23
|
router.patch('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -28,7 +28,7 @@ router.patch('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
28
28
|
await service.upsertSingleton(req.body);
|
|
29
29
|
try {
|
|
30
30
|
const record = await service.readSingleton(req.sanitizedQuery);
|
|
31
|
-
res.locals
|
|
31
|
+
res.locals['payload'] = { data: record || null };
|
|
32
32
|
}
|
|
33
33
|
catch (error) {
|
|
34
34
|
if (error instanceof exceptions_1.ForbiddenException) {
|