directus 9.23.1 → 9.23.4
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 +25 -21
- package/dist/auth/auth.d.ts +3 -3
- package/dist/auth/auth.js +2 -0
- package/dist/auth/drivers/ldap.d.ts +1 -1
- package/dist/auth/drivers/ldap.js +57 -46
- package/dist/auth/drivers/local.d.ts +1 -1
- package/dist/auth/drivers/local.js +20 -17
- package/dist/auth/drivers/oauth2.d.ts +1 -1
- package/dist/auth/drivers/oauth2.js +44 -35
- package/dist/auth/drivers/openid.d.ts +1 -1
- package/dist/auth/drivers/openid.js +50 -41
- package/dist/auth/drivers/saml.d.ts +1 -1
- package/dist/auth/drivers/saml.js +20 -17
- package/dist/auth.d.ts +1 -1
- package/dist/auth.js +8 -7
- package/dist/cache.d.ts +9 -1
- package/dist/cache.js +66 -18
- package/dist/cli/commands/bootstrap/index.js +7 -6
- package/dist/cli/commands/init/index.js +3 -3
- package/dist/cli/commands/schema/apply.js +14 -15
- package/dist/cli/commands/schema/snapshot.js +2 -2
- package/dist/cli/utils/create-db-connection.d.ts +1 -1
- package/dist/cli/utils/create-db-connection.js +3 -2
- package/dist/cli/utils/create-env/index.d.ts +2 -2
- package/dist/cli/utils/create-env/index.js +1 -1
- package/dist/cli/utils/drivers.d.ts +1 -1
- package/dist/constants.d.ts +3 -2
- package/dist/constants.js +7 -7
- package/dist/controllers/activity.js +10 -11
- package/dist/controllers/assets.js +31 -25
- package/dist/controllers/auth.js +40 -26
- package/dist/controllers/collections.js +10 -10
- package/dist/controllers/dashboards.js +14 -11
- package/dist/controllers/extensions.js +3 -3
- package/dist/controllers/fields.js +20 -20
- package/dist/controllers/files.js +26 -20
- package/dist/controllers/flows.js +16 -13
- package/dist/controllers/folders.js +14 -11
- package/dist/controllers/graphql.js +6 -8
- package/dist/controllers/items.js +22 -19
- package/dist/controllers/not-found.d.ts +1 -1
- package/dist/controllers/not-found.js +1 -2
- package/dist/controllers/notifications.js +14 -11
- package/dist/controllers/operations.js +14 -11
- package/dist/controllers/panels.js +14 -11
- package/dist/controllers/permissions.js +14 -11
- package/dist/controllers/presets.js +14 -11
- package/dist/controllers/relations.js +10 -10
- package/dist/controllers/revisions.js +3 -3
- package/dist/controllers/roles.js +14 -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 +21 -18
- package/dist/controllers/users.js +32 -36
- package/dist/controllers/utils.js +10 -15
- package/dist/controllers/webhooks.js +14 -11
- package/dist/database/helpers/fn/dialects/mssql.d.ts +1 -1
- package/dist/database/helpers/fn/dialects/mssql.js +10 -11
- package/dist/database/helpers/fn/dialects/mysql.d.ts +1 -1
- package/dist/database/helpers/fn/dialects/mysql.js +2 -3
- package/dist/database/helpers/fn/dialects/oracle.d.ts +1 -1
- package/dist/database/helpers/fn/dialects/oracle.js +10 -11
- package/dist/database/helpers/fn/dialects/postgres.d.ts +1 -1
- package/dist/database/helpers/fn/dialects/postgres.js +10 -11
- package/dist/database/helpers/fn/dialects/sqlite.d.ts +1 -1
- package/dist/database/helpers/fn/dialects/sqlite.js +10 -11
- package/dist/database/helpers/fn/types.d.ts +5 -6
- package/dist/database/helpers/fn/types.js +4 -5
- package/dist/database/helpers/geometry/dialects/mssql.d.ts +3 -3
- package/dist/database/helpers/geometry/dialects/mysql.d.ts +1 -1
- package/dist/database/helpers/geometry/dialects/oracle.d.ts +3 -3
- package/dist/database/helpers/geometry/dialects/postgres.d.ts +3 -3
- package/dist/database/helpers/geometry/dialects/postgres.js +1 -2
- package/dist/database/helpers/geometry/dialects/redshift.d.ts +2 -2
- package/dist/database/helpers/geometry/dialects/sqlite.d.ts +1 -1
- package/dist/database/helpers/geometry/types.d.ts +2 -2
- package/dist/database/helpers/geometry/types.js +1 -2
- package/dist/database/helpers/index.d.ts +5 -5
- package/dist/database/helpers/schema/dialects/cockroachdb.d.ts +1 -1
- package/dist/database/helpers/schema/dialects/mssql.d.ts +1 -1
- package/dist/database/helpers/schema/dialects/mysql.d.ts +1 -1
- package/dist/database/helpers/schema/dialects/mysql.js +1 -2
- package/dist/database/helpers/schema/dialects/oracle.d.ts +2 -2
- package/dist/database/helpers/schema/dialects/oracle.js +4 -6
- package/dist/database/helpers/schema/types.d.ts +4 -4
- package/dist/database/helpers/types.d.ts +1 -1
- package/dist/database/helpers/types.js +1 -0
- package/dist/database/index.d.ts +1 -1
- package/dist/database/index.js +13 -13
- package/dist/database/migrations/20201028A-remove-collection-foreign-keys.d.ts +1 -1
- package/dist/database/migrations/20201029A-remove-system-relations.d.ts +1 -1
- package/dist/database/migrations/20201029B-remove-system-collections.d.ts +1 -1
- package/dist/database/migrations/20201029C-remove-system-fields.d.ts +1 -1
- package/dist/database/migrations/20201105A-add-cascade-system-relations.d.ts +1 -1
- package/dist/database/migrations/20201105B-change-webhook-url-type.d.ts +1 -1
- package/dist/database/migrations/20210225A-add-relations-sort-field.d.ts +1 -1
- package/dist/database/migrations/20210225A-add-relations-sort-field.js +1 -2
- package/dist/database/migrations/20210304A-remove-locked-fields.d.ts +1 -1
- package/dist/database/migrations/20210312A-webhooks-collections-text.d.ts +1 -1
- package/dist/database/migrations/20210331A-add-refresh-interval.d.ts +1 -1
- package/dist/database/migrations/20210415A-make-filesize-nullable.d.ts +1 -1
- package/dist/database/migrations/20210416A-add-collections-accountability.d.ts +1 -1
- package/dist/database/migrations/20210422A-remove-files-interface.d.ts +1 -1
- package/dist/database/migrations/20210506A-rename-interfaces.d.ts +1 -1
- package/dist/database/migrations/20210510A-restructure-relations.d.ts +1 -1
- package/dist/database/migrations/20210518A-add-foreign-key-constraints.d.ts +1 -1
- package/dist/database/migrations/20210518A-add-foreign-key-constraints.js +1 -1
- package/dist/database/migrations/20210519A-add-system-fk-triggers.d.ts +1 -1
- package/dist/database/migrations/20210519A-add-system-fk-triggers.js +2 -2
- package/dist/database/migrations/20210521A-add-collections-icon-color.d.ts +1 -1
- package/dist/database/migrations/20210525A-add-insights.d.ts +1 -1
- package/dist/database/migrations/20210608A-add-deep-clone-config.d.ts +1 -1
- package/dist/database/migrations/20210626A-change-filesize-bigint.d.ts +1 -1
- package/dist/database/migrations/20210716A-add-conditions-to-fields.d.ts +1 -1
- package/dist/database/migrations/20210721A-add-default-folder.d.ts +1 -1
- package/dist/database/migrations/20210802A-replace-groups.d.ts +1 -1
- package/dist/database/migrations/20210803A-add-required-to-fields.d.ts +1 -1
- package/dist/database/migrations/20210805A-update-groups.d.ts +1 -1
- package/dist/database/migrations/20210805B-change-image-metadata-structure.d.ts +1 -1
- package/dist/database/migrations/20210805B-change-image-metadata-structure.js +15 -15
- package/dist/database/migrations/20210811A-add-geometry-config.d.ts +1 -1
- package/dist/database/migrations/20210831A-remove-limit-column.d.ts +1 -1
- package/dist/database/migrations/20210903A-add-auth-provider.d.ts +1 -1
- package/dist/database/migrations/20210907A-webhooks-collections-not-null.d.ts +1 -1
- package/dist/database/migrations/20210910A-move-module-setup.d.ts +1 -1
- package/dist/database/migrations/20210920A-webhooks-url-not-null.d.ts +1 -1
- package/dist/database/migrations/20210924A-add-collection-organization.d.ts +1 -1
- package/dist/database/migrations/20210927A-replace-fields-group.d.ts +1 -1
- package/dist/database/migrations/20210927B-replace-m2m-interface.d.ts +1 -1
- package/dist/database/migrations/20210929A-rename-login-action.d.ts +1 -1
- package/dist/database/migrations/20211007A-update-presets.d.ts +1 -1
- package/dist/database/migrations/20211007A-update-presets.js +7 -9
- package/dist/database/migrations/20211009A-add-auth-data.d.ts +1 -1
- package/dist/database/migrations/20211016A-add-webhook-headers.d.ts +1 -1
- package/dist/database/migrations/20211103A-set-unique-to-user-token.d.ts +1 -1
- package/dist/database/migrations/20211103B-update-special-geometry.d.ts +1 -1
- package/dist/database/migrations/20211104A-remove-collections-listing.d.ts +1 -1
- package/dist/database/migrations/20211118A-add-notifications.d.ts +1 -1
- package/dist/database/migrations/20211211A-add-shares.d.ts +1 -1
- package/dist/database/migrations/20211230A-add-project-descriptor.d.ts +1 -1
- package/dist/database/migrations/20220303A-remove-default-project-color.d.ts +1 -1
- package/dist/database/migrations/20220308A-add-bookmark-icon-and-color.d.ts +1 -1
- package/dist/database/migrations/20220314A-add-translation-strings.d.ts +1 -1
- package/dist/database/migrations/20220322A-rename-field-typecast-flags.d.ts +1 -1
- package/dist/database/migrations/20220323A-add-field-validation.d.ts +1 -1
- package/dist/database/migrations/20220325A-fix-typecast-flags.d.ts +1 -1
- package/dist/database/migrations/20220325B-add-default-language.d.ts +1 -1
- package/dist/database/migrations/20220402A-remove-default-value-panel-icon.d.ts +1 -1
- package/dist/database/migrations/20220429A-add-flows.d.ts +1 -1
- package/dist/database/migrations/20220429B-add-color-to-insights-icon.d.ts +1 -1
- package/dist/database/migrations/20220429C-drop-non-null-from-ip-of-activity.d.ts +1 -1
- package/dist/database/migrations/20220429D-drop-non-null-from-sender-of-notifications.d.ts +1 -1
- package/dist/database/migrations/20220614A-rename-hook-trigger-to-event.d.ts +1 -1
- package/dist/database/migrations/20220801A-update-notifications-timestamp-column.d.ts +1 -1
- package/dist/database/migrations/20220802A-add-custom-aspect-ratios.d.ts +1 -1
- package/dist/database/migrations/20220826A-add-origin-to-accountability.d.ts +1 -1
- package/dist/database/migrations/run.d.ts +1 -1
- package/dist/database/migrations/run.js +1 -1
- package/dist/database/run-ast.d.ts +3 -3
- package/dist/database/run-ast.js +21 -30
- package/dist/database/seeds/run.d.ts +1 -1
- package/dist/database/seeds/run.js +1 -2
- package/dist/database/system-data/app-access-permissions/index.d.ts +1 -1
- package/dist/database/system-data/collections/index.d.ts +1 -1
- package/dist/database/system-data/collections/index.js +2 -2
- package/dist/database/system-data/fields/collections.yaml +2 -0
- package/dist/database/system-data/fields/index.d.ts +1 -1
- package/dist/database/system-data/fields/index.js +3 -4
- package/dist/database/system-data/fields/settings.yaml +4 -0
- package/dist/database/system-data/relations/index.d.ts +1 -1
- package/dist/emitter.d.ts +1 -1
- package/dist/emitter.js +3 -0
- package/dist/env.js +11 -3
- package/dist/exceptions/database/dialects/mssql.d.ts +1 -1
- package/dist/exceptions/database/dialects/mssql.js +5 -6
- package/dist/exceptions/database/dialects/mysql.d.ts +1 -1
- package/dist/exceptions/database/dialects/mysql.js +19 -25
- package/dist/exceptions/database/dialects/oracle.d.ts +1 -1
- package/dist/exceptions/database/dialects/postgres.d.ts +1 -1
- package/dist/exceptions/database/dialects/sqlite.d.ts +1 -1
- package/dist/exceptions/database/translate.d.ts +1 -1
- package/dist/exceptions/database/value-out-of-range.js +1 -1
- package/dist/exceptions/range-not-satisfiable.js +2 -3
- package/dist/extensions.d.ts +1 -1
- package/dist/extensions.js +43 -33
- package/dist/flows.js +65 -46
- package/dist/logger.d.ts +2 -1
- package/dist/logger.js +35 -19
- package/dist/logger.test.d.ts +1 -0
- package/dist/mailer.js +16 -16
- package/dist/messenger.js +9 -7
- package/dist/middleware/authenticate.d.ts +1 -1
- package/dist/middleware/authenticate.js +13 -6
- package/dist/middleware/cache.d.ts +1 -1
- package/dist/middleware/cache.js +16 -16
- package/dist/middleware/check-ip.d.ts +1 -1
- package/dist/middleware/check-ip.js +1 -1
- package/dist/middleware/collection-exists.d.ts +1 -1
- package/dist/middleware/collection-exists.js +5 -5
- package/dist/middleware/cors.d.ts +1 -1
- package/dist/middleware/cors.js +7 -7
- package/dist/middleware/error-handler.d.ts +1 -1
- package/dist/middleware/error-handler.js +11 -12
- package/dist/middleware/extract-token.d.ts +1 -1
- package/dist/middleware/extract-token.js +2 -2
- package/dist/middleware/get-permissions.d.ts +1 -1
- package/dist/middleware/graphql.d.ts +1 -1
- package/dist/middleware/graphql.js +15 -9
- package/dist/middleware/rate-limiter-global.d.ts +5 -0
- package/dist/middleware/rate-limiter-global.js +48 -0
- package/dist/middleware/{rate-limiter.d.ts → rate-limiter-ip.d.ts} +2 -2
- package/dist/middleware/{rate-limiter.js → rate-limiter-ip.js} +5 -5
- package/dist/middleware/respond.d.ts +1 -1
- package/dist/middleware/respond.js +18 -19
- package/dist/middleware/sanitize-query.d.ts +1 -1
- package/dist/middleware/sanitize-query.js +1 -1
- package/dist/middleware/schema.d.ts +1 -1
- package/dist/middleware/use-collection.d.ts +1 -1
- package/dist/operations/condition/index.d.ts +1 -1
- package/dist/operations/exec/index.js +15 -4
- package/dist/operations/item-create/index.js +1 -2
- package/dist/operations/item-delete/index.d.ts +1 -1
- package/dist/operations/item-read/index.d.ts +1 -1
- package/dist/operations/item-update/index.d.ts +1 -1
- package/dist/operations/item-update/index.js +1 -2
- package/dist/operations/notification/index.js +1 -2
- package/dist/operations/request/index.js +19 -19
- package/dist/operations/trigger/index.js +2 -3
- package/dist/rate-limiter.d.ts +1 -1
- package/dist/rate-limiter.js +9 -9
- package/dist/request/validate-ip.js +2 -2
- package/dist/server.js +12 -13
- package/dist/services/activity.d.ts +1 -1
- package/dist/services/activity.js +17 -16
- package/dist/services/assets.d.ts +3 -3
- package/dist/services/assets.js +35 -37
- package/dist/services/authentication.d.ts +2 -2
- package/dist/services/authentication.js +22 -19
- package/dist/services/authorization.d.ts +3 -3
- package/dist/services/authorization.js +27 -31
- package/dist/services/collections.d.ts +5 -5
- package/dist/services/collections.js +54 -50
- package/dist/services/dashboards.d.ts +1 -1
- package/dist/services/fields.d.ts +5 -5
- package/dist/services/fields.js +50 -50
- package/dist/services/files.d.ts +1 -2
- package/dist/services/files.js +33 -27
- package/dist/services/flows.d.ts +2 -2
- package/dist/services/folders.d.ts +1 -1
- package/dist/services/graphql/index.d.ts +4 -4
- package/dist/services/graphql/index.js +259 -252
- package/dist/services/graphql/utils/add-path-to-validation-error.js +1 -2
- package/dist/services/graphql/utils/process-error.d.ts +2 -2
- package/dist/services/graphql/utils/process-error.js +11 -4
- package/dist/services/import-export.d.ts +3 -3
- package/dist/services/import-export.js +30 -27
- package/dist/services/items.d.ts +3 -3
- package/dist/services/items.js +42 -36
- package/dist/services/mail/index.d.ts +4 -4
- package/dist/services/mail/index.js +14 -10
- package/dist/services/meta.d.ts +3 -3
- package/dist/services/meta.js +11 -9
- package/dist/services/notifications.d.ts +3 -3
- package/dist/services/notifications.js +10 -9
- package/dist/services/operations.d.ts +2 -2
- package/dist/services/panels.d.ts +1 -1
- package/dist/services/payload.d.ts +3 -3
- package/dist/services/payload.js +124 -122
- package/dist/services/permissions.d.ts +3 -3
- package/dist/services/permissions.js +11 -11
- package/dist/services/presets.d.ts +1 -1
- package/dist/services/relations.d.ts +6 -6
- package/dist/services/relations.js +45 -43
- package/dist/services/revisions.d.ts +1 -1
- package/dist/services/revisions.js +3 -3
- package/dist/services/roles.d.ts +2 -2
- package/dist/services/roles.js +7 -7
- package/dist/services/schema.d.ts +3 -3
- package/dist/services/schema.js +9 -11
- package/dist/services/server.d.ts +3 -3
- package/dist/services/server.js +88 -32
- package/dist/services/settings.d.ts +1 -1
- package/dist/services/shares.d.ts +1 -1
- package/dist/services/shares.js +14 -15
- package/dist/services/specifications.d.ts +4 -4
- package/dist/services/specifications.js +137 -119
- package/dist/services/tfa.d.ts +2 -2
- package/dist/services/tfa.js +7 -5
- package/dist/services/users.d.ts +2 -6
- package/dist/services/users.js +37 -40
- package/dist/services/utils.d.ts +3 -3
- package/dist/services/utils.js +10 -8
- package/dist/services/webhooks.d.ts +2 -2
- package/dist/services/webhooks.js +2 -1
- package/dist/storage/register-locations.js +1 -1
- package/dist/types/assets.d.ts +1 -1
- package/dist/types/ast.d.ts +1 -1
- package/dist/types/auth.d.ts +2 -2
- package/dist/types/collection.d.ts +2 -2
- package/dist/types/events.d.ts +2 -2
- package/dist/types/graphql.d.ts +2 -2
- package/dist/types/items.d.ts +3 -3
- package/dist/types/services.d.ts +5 -5
- package/dist/types/snapshot.d.ts +4 -4
- package/dist/utils/apply-diff.d.ts +3 -3
- package/dist/utils/apply-diff.js +25 -28
- package/dist/utils/apply-query.d.ts +3 -3
- package/dist/utils/apply-query.js +10 -12
- package/dist/utils/apply-snapshot.d.ts +3 -3
- package/dist/utils/apply-snapshot.js +5 -6
- package/dist/utils/construct-flow-tree.d.ts +1 -1
- package/dist/utils/construct-flow-tree.js +2 -2
- package/dist/utils/dynamic-import.js +1 -1
- package/dist/utils/filter-items.d.ts +1 -1
- package/dist/utils/generate-hash.js +1 -1
- package/dist/utils/get-accountability-for-role.d.ts +2 -2
- package/dist/utils/get-accountability-for-role.js +1 -1
- package/dist/utils/get-ast-from-query.d.ts +3 -3
- package/dist/utils/get-ast-from-query.js +22 -28
- package/dist/utils/get-auth-providers.js +1 -1
- package/dist/utils/get-cache-headers.d.ts +1 -1
- package/dist/utils/get-cache-headers.js +6 -7
- package/dist/utils/get-cache-key.d.ts +1 -1
- package/dist/utils/get-cache-key.js +2 -3
- package/dist/utils/get-collection-from-alias.d.ts +1 -1
- package/dist/utils/get-collection-from-alias.js +1 -0
- package/dist/utils/get-column-path.d.ts +2 -2
- package/dist/utils/get-column-path.js +3 -4
- package/dist/utils/get-column.d.ts +4 -4
- package/dist/utils/get-column.js +4 -5
- package/dist/utils/get-default-value.d.ts +2 -2
- package/dist/utils/get-default-value.js +2 -3
- package/dist/utils/get-graphql-query-and-variables.d.ts +1 -1
- package/dist/utils/get-graphql-query-and-variables.js +1 -2
- package/dist/utils/get-graphql-type.d.ts +2 -2
- package/dist/utils/get-graphql-type.js +1 -1
- package/dist/utils/get-ip-from-req.d.ts +1 -1
- package/dist/utils/get-ip-from-req.js +2 -2
- package/dist/utils/get-local-type.d.ts +1 -1
- package/dist/utils/get-local-type.js +3 -3
- package/dist/utils/get-milliseconds.js +1 -2
- package/dist/utils/get-permissions.d.ts +1 -1
- package/dist/utils/get-permissions.js +12 -12
- package/dist/utils/get-relation-info.d.ts +1 -1
- package/dist/utils/get-relation-info.js +3 -5
- package/dist/utils/get-relation-type.d.ts +1 -1
- package/dist/utils/get-relation-type.js +3 -4
- package/dist/utils/get-schema.d.ts +2 -2
- package/dist/utils/get-schema.js +20 -22
- package/dist/utils/get-snapshot-diff.js +2 -3
- package/dist/utils/get-snapshot.d.ts +3 -3
- package/dist/utils/get-snapshot.js +6 -8
- package/dist/utils/is-directus-jwt.js +1 -1
- package/dist/utils/is-url-allowed.js +5 -2
- package/dist/utils/job-queue.js +2 -0
- package/dist/utils/jwt.d.ts +1 -1
- package/dist/utils/merge-permissions-for-share.d.ts +1 -1
- package/dist/utils/merge-permissions-for-share.js +3 -4
- package/dist/utils/merge-permissions.d.ts +3 -3
- package/dist/utils/reduce-schema.d.ts +1 -1
- package/dist/utils/reduce-schema.js +12 -12
- package/dist/utils/sanitize-query.d.ts +1 -1
- package/dist/utils/sanitize-query.js +27 -27
- package/dist/utils/sanitize-schema.d.ts +2 -2
- package/dist/utils/should-skip-cache.d.ts +7 -0
- package/dist/utils/should-skip-cache.js +21 -0
- package/dist/utils/should-skip-cache.test.d.ts +1 -0
- package/dist/utils/track.js +16 -16
- package/dist/utils/transformations.d.ts +1 -1
- package/dist/utils/transformations.js +2 -4
- package/dist/utils/url.js +7 -2
- package/dist/utils/user-name.d.ts +1 -1
- package/dist/utils/validate-diff.js +7 -8
- package/dist/utils/validate-keys.d.ts +2 -2
- package/dist/utils/validate-keys.js +1 -1
- package/dist/utils/validate-query.d.ts +1 -1
- package/dist/utils/validate-query.js +3 -3
- package/dist/utils/validate-storage.js +8 -8
- package/dist/webhooks.js +3 -3
- package/package.json +36 -37
- package/dist/utils/with-timeout.d.ts +0 -1
- package/dist/utils/with-timeout.js +0 -16
|
@@ -10,6 +10,7 @@ const use_collection_1 = __importDefault(require("../middleware/use-collection")
|
|
|
10
10
|
const validate_batch_1 = require("../middleware/validate-batch");
|
|
11
11
|
const services_1 = require("../services");
|
|
12
12
|
const async_handler_1 = __importDefault(require("../utils/async-handler"));
|
|
13
|
+
const sanitize_query_1 = require("../utils/sanitize-query");
|
|
13
14
|
const router = express_1.default.Router();
|
|
14
15
|
router.use((0, use_collection_1.default)('directus_permissions'));
|
|
15
16
|
router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -29,11 +30,11 @@ router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
29
30
|
try {
|
|
30
31
|
if (Array.isArray(req.body)) {
|
|
31
32
|
const items = await service.readMany(savedKeys, req.sanitizedQuery);
|
|
32
|
-
res.locals
|
|
33
|
+
res.locals['payload'] = { data: items };
|
|
33
34
|
}
|
|
34
35
|
else {
|
|
35
36
|
const item = await service.readOne(savedKeys[0], req.sanitizedQuery);
|
|
36
|
-
res.locals
|
|
37
|
+
res.locals['payload'] = { data: item };
|
|
37
38
|
}
|
|
38
39
|
}
|
|
39
40
|
catch (error) {
|
|
@@ -64,7 +65,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
64
65
|
result = await service.readByQuery(req.sanitizedQuery);
|
|
65
66
|
}
|
|
66
67
|
const meta = await metaService.getMetaForQuery('directus_permissions', req.sanitizedQuery);
|
|
67
|
-
res.locals
|
|
68
|
+
res.locals['payload'] = { data: result, meta };
|
|
68
69
|
return next();
|
|
69
70
|
});
|
|
70
71
|
router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
|
|
@@ -76,8 +77,8 @@ router.get('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
76
77
|
accountability: req.accountability,
|
|
77
78
|
schema: req.schema,
|
|
78
79
|
});
|
|
79
|
-
const record = await service.readOne(req.params
|
|
80
|
-
res.locals
|
|
80
|
+
const record = await service.readOne(req.params['pk'], req.sanitizedQuery);
|
|
81
|
+
res.locals['payload'] = { data: record };
|
|
81
82
|
return next();
|
|
82
83
|
}), respond_1.respond);
|
|
83
84
|
router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -93,11 +94,12 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
|
|
|
93
94
|
keys = await service.updateMany(req.body.keys, req.body.data);
|
|
94
95
|
}
|
|
95
96
|
else {
|
|
96
|
-
|
|
97
|
+
const sanitizedQuery = (0, sanitize_query_1.sanitizeQuery)(req.body.query, req.accountability);
|
|
98
|
+
keys = await service.updateByQuery(sanitizedQuery, req.body.data);
|
|
97
99
|
}
|
|
98
100
|
try {
|
|
99
101
|
const result = await service.readMany(keys, req.sanitizedQuery);
|
|
100
|
-
res.locals
|
|
102
|
+
res.locals['payload'] = { data: result };
|
|
101
103
|
}
|
|
102
104
|
catch (error) {
|
|
103
105
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -112,10 +114,10 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
112
114
|
accountability: req.accountability,
|
|
113
115
|
schema: req.schema,
|
|
114
116
|
});
|
|
115
|
-
const primaryKey = await service.updateOne(req.params
|
|
117
|
+
const primaryKey = await service.updateOne(req.params['pk'], req.body);
|
|
116
118
|
try {
|
|
117
119
|
const item = await service.readOne(primaryKey, req.sanitizedQuery);
|
|
118
|
-
res.locals
|
|
120
|
+
res.locals['payload'] = { data: item || null };
|
|
119
121
|
}
|
|
120
122
|
catch (error) {
|
|
121
123
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -137,7 +139,8 @@ router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_hand
|
|
|
137
139
|
await service.deleteMany(req.body.keys);
|
|
138
140
|
}
|
|
139
141
|
else {
|
|
140
|
-
|
|
142
|
+
const sanitizedQuery = (0, sanitize_query_1.sanitizeQuery)(req.body.query, req.accountability);
|
|
143
|
+
await service.deleteByQuery(sanitizedQuery);
|
|
141
144
|
}
|
|
142
145
|
return next();
|
|
143
146
|
}), respond_1.respond);
|
|
@@ -146,7 +149,7 @@ router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
146
149
|
accountability: req.accountability,
|
|
147
150
|
schema: req.schema,
|
|
148
151
|
});
|
|
149
|
-
await service.deleteOne(req.params
|
|
152
|
+
await service.deleteOne(req.params['pk']);
|
|
150
153
|
return next();
|
|
151
154
|
}), respond_1.respond);
|
|
152
155
|
exports.default = router;
|
|
@@ -10,6 +10,7 @@ const use_collection_1 = __importDefault(require("../middleware/use-collection")
|
|
|
10
10
|
const validate_batch_1 = require("../middleware/validate-batch");
|
|
11
11
|
const services_1 = require("../services");
|
|
12
12
|
const async_handler_1 = __importDefault(require("../utils/async-handler"));
|
|
13
|
+
const sanitize_query_1 = require("../utils/sanitize-query");
|
|
13
14
|
const router = express_1.default.Router();
|
|
14
15
|
router.use((0, use_collection_1.default)('directus_presets'));
|
|
15
16
|
router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -29,11 +30,11 @@ router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
29
30
|
try {
|
|
30
31
|
if (Array.isArray(req.body)) {
|
|
31
32
|
const records = await service.readMany(savedKeys, req.sanitizedQuery);
|
|
32
|
-
res.locals
|
|
33
|
+
res.locals['payload'] = { data: records };
|
|
33
34
|
}
|
|
34
35
|
else {
|
|
35
36
|
const record = await service.readOne(savedKeys[0], req.sanitizedQuery);
|
|
36
|
-
res.locals
|
|
37
|
+
res.locals['payload'] = { data: record };
|
|
37
38
|
}
|
|
38
39
|
}
|
|
39
40
|
catch (error) {
|
|
@@ -64,7 +65,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
64
65
|
result = await service.readByQuery(req.sanitizedQuery);
|
|
65
66
|
}
|
|
66
67
|
const meta = await metaService.getMetaForQuery('directus_presets', req.sanitizedQuery);
|
|
67
|
-
res.locals
|
|
68
|
+
res.locals['payload'] = { data: result, meta };
|
|
68
69
|
return next();
|
|
69
70
|
});
|
|
70
71
|
router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
|
|
@@ -74,8 +75,8 @@ router.get('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
74
75
|
accountability: req.accountability,
|
|
75
76
|
schema: req.schema,
|
|
76
77
|
});
|
|
77
|
-
const record = await service.readOne(req.params
|
|
78
|
-
res.locals
|
|
78
|
+
const record = await service.readOne(req.params['pk'], req.sanitizedQuery);
|
|
79
|
+
res.locals['payload'] = { data: record || null };
|
|
79
80
|
return next();
|
|
80
81
|
}), respond_1.respond);
|
|
81
82
|
router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -91,11 +92,12 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
|
|
|
91
92
|
keys = await service.updateMany(req.body.keys, req.body.data);
|
|
92
93
|
}
|
|
93
94
|
else {
|
|
94
|
-
|
|
95
|
+
const sanitizedQuery = (0, sanitize_query_1.sanitizeQuery)(req.body.query, req.accountability);
|
|
96
|
+
keys = await service.updateByQuery(sanitizedQuery, req.body.data);
|
|
95
97
|
}
|
|
96
98
|
try {
|
|
97
99
|
const result = await service.readMany(keys, req.sanitizedQuery);
|
|
98
|
-
res.locals
|
|
100
|
+
res.locals['payload'] = { data: result };
|
|
99
101
|
}
|
|
100
102
|
catch (error) {
|
|
101
103
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -110,10 +112,10 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
110
112
|
accountability: req.accountability,
|
|
111
113
|
schema: req.schema,
|
|
112
114
|
});
|
|
113
|
-
const primaryKey = await service.updateOne(req.params
|
|
115
|
+
const primaryKey = await service.updateOne(req.params['pk'], req.body);
|
|
114
116
|
try {
|
|
115
117
|
const record = await service.readOne(primaryKey, req.sanitizedQuery);
|
|
116
|
-
res.locals
|
|
118
|
+
res.locals['payload'] = { data: record };
|
|
117
119
|
}
|
|
118
120
|
catch (error) {
|
|
119
121
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -135,7 +137,8 @@ router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_hand
|
|
|
135
137
|
await service.deleteMany(req.body.keys);
|
|
136
138
|
}
|
|
137
139
|
else {
|
|
138
|
-
|
|
140
|
+
const sanitizedQuery = (0, sanitize_query_1.sanitizeQuery)(req.body.query, req.accountability);
|
|
141
|
+
await service.deleteByQuery(sanitizedQuery);
|
|
139
142
|
}
|
|
140
143
|
return next();
|
|
141
144
|
}), respond_1.respond);
|
|
@@ -144,7 +147,7 @@ router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
144
147
|
accountability: req.accountability,
|
|
145
148
|
schema: req.schema,
|
|
146
149
|
});
|
|
147
|
-
await service.deleteOne(req.params
|
|
150
|
+
await service.deleteOne(req.params['pk']);
|
|
148
151
|
return next();
|
|
149
152
|
}), respond_1.respond);
|
|
150
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) {
|
|
@@ -111,7 +111,7 @@ router.delete('/:collection/:field', collection_exists_1.default, (0, async_hand
|
|
|
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;
|
|
@@ -10,6 +10,7 @@ const use_collection_1 = __importDefault(require("../middleware/use-collection")
|
|
|
10
10
|
const validate_batch_1 = require("../middleware/validate-batch");
|
|
11
11
|
const services_1 = require("../services");
|
|
12
12
|
const async_handler_1 = __importDefault(require("../utils/async-handler"));
|
|
13
|
+
const sanitize_query_1 = require("../utils/sanitize-query");
|
|
13
14
|
const router = express_1.default.Router();
|
|
14
15
|
router.use((0, use_collection_1.default)('directus_roles'));
|
|
15
16
|
router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -29,11 +30,11 @@ router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
29
30
|
try {
|
|
30
31
|
if (Array.isArray(req.body)) {
|
|
31
32
|
const items = await service.readMany(savedKeys, req.sanitizedQuery);
|
|
32
|
-
res.locals
|
|
33
|
+
res.locals['payload'] = { data: items };
|
|
33
34
|
}
|
|
34
35
|
else {
|
|
35
36
|
const item = await service.readOne(savedKeys[0], req.sanitizedQuery);
|
|
36
|
-
res.locals
|
|
37
|
+
res.locals['payload'] = { data: item };
|
|
37
38
|
}
|
|
38
39
|
}
|
|
39
40
|
catch (error) {
|
|
@@ -55,7 +56,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
55
56
|
});
|
|
56
57
|
const records = await service.readByQuery(req.sanitizedQuery);
|
|
57
58
|
const meta = await metaService.getMetaForQuery('directus_roles', req.sanitizedQuery);
|
|
58
|
-
res.locals
|
|
59
|
+
res.locals['payload'] = { data: records || null, meta };
|
|
59
60
|
return next();
|
|
60
61
|
});
|
|
61
62
|
router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
|
|
@@ -65,8 +66,8 @@ router.get('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
65
66
|
accountability: req.accountability,
|
|
66
67
|
schema: req.schema,
|
|
67
68
|
});
|
|
68
|
-
const record = await service.readOne(req.params
|
|
69
|
-
res.locals
|
|
69
|
+
const record = await service.readOne(req.params['pk'], req.sanitizedQuery);
|
|
70
|
+
res.locals['payload'] = { data: record || null };
|
|
70
71
|
return next();
|
|
71
72
|
}), respond_1.respond);
|
|
72
73
|
router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -82,11 +83,12 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
|
|
|
82
83
|
keys = await service.updateMany(req.body.keys, req.body.data);
|
|
83
84
|
}
|
|
84
85
|
else {
|
|
85
|
-
|
|
86
|
+
const sanitizedQuery = (0, sanitize_query_1.sanitizeQuery)(req.body.query, req.accountability);
|
|
87
|
+
keys = await service.updateByQuery(sanitizedQuery, req.body.data);
|
|
86
88
|
}
|
|
87
89
|
try {
|
|
88
90
|
const result = await service.readMany(keys, req.sanitizedQuery);
|
|
89
|
-
res.locals
|
|
91
|
+
res.locals['payload'] = { data: result };
|
|
90
92
|
}
|
|
91
93
|
catch (error) {
|
|
92
94
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -101,10 +103,10 @@ router.patch('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
101
103
|
accountability: req.accountability,
|
|
102
104
|
schema: req.schema,
|
|
103
105
|
});
|
|
104
|
-
const primaryKey = await service.updateOne(req.params
|
|
106
|
+
const primaryKey = await service.updateOne(req.params['pk'], req.body);
|
|
105
107
|
try {
|
|
106
108
|
const item = await service.readOne(primaryKey, req.sanitizedQuery);
|
|
107
|
-
res.locals
|
|
109
|
+
res.locals['payload'] = { data: item || null };
|
|
108
110
|
}
|
|
109
111
|
catch (error) {
|
|
110
112
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -126,7 +128,8 @@ router.delete('/', (0, validate_batch_1.validateBatch)('delete'), (0, async_hand
|
|
|
126
128
|
await service.deleteMany(req.body.keys);
|
|
127
129
|
}
|
|
128
130
|
else {
|
|
129
|
-
|
|
131
|
+
const sanitizedQuery = (0, sanitize_query_1.sanitizeQuery)(req.body.query, req.accountability);
|
|
132
|
+
await service.deleteByQuery(sanitizedQuery);
|
|
130
133
|
}
|
|
131
134
|
return next();
|
|
132
135
|
}), respond_1.respond);
|
|
@@ -135,7 +138,7 @@ router.delete('/:pk', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
135
138
|
accountability: req.accountability,
|
|
136
139
|
schema: req.schema,
|
|
137
140
|
});
|
|
138
|
-
await service.deleteOne(req.params
|
|
141
|
+
await service.deleteOne(req.params['pk']);
|
|
139
142
|
return next();
|
|
140
143
|
}), respond_1.respond);
|
|
141
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) {
|
|
@@ -4,15 +4,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const express_1 = __importDefault(require("express"));
|
|
7
|
+
const joi_1 = __importDefault(require("joi"));
|
|
8
|
+
const constants_1 = require("../constants");
|
|
9
|
+
const env_1 = __importDefault(require("../env"));
|
|
7
10
|
const exceptions_1 = require("../exceptions");
|
|
8
11
|
const respond_1 = require("../middleware/respond");
|
|
9
12
|
const use_collection_1 = __importDefault(require("../middleware/use-collection"));
|
|
10
13
|
const validate_batch_1 = require("../middleware/validate-batch");
|
|
11
14
|
const services_1 = require("../services");
|
|
12
15
|
const async_handler_1 = __importDefault(require("../utils/async-handler"));
|
|
13
|
-
const
|
|
14
|
-
const joi_1 = __importDefault(require("joi"));
|
|
15
|
-
const env_1 = __importDefault(require("../env"));
|
|
16
|
+
const sanitize_query_1 = require("../utils/sanitize-query");
|
|
16
17
|
const router = express_1.default.Router();
|
|
17
18
|
router.use((0, use_collection_1.default)('directus_shares'));
|
|
18
19
|
const sharedLoginSchema = joi_1.default.object({
|
|
@@ -29,8 +30,8 @@ router.post('/auth', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
29
30
|
throw new exceptions_1.InvalidPayloadException(error.message);
|
|
30
31
|
}
|
|
31
32
|
const { accessToken, refreshToken, expires } = await service.login(req.body);
|
|
32
|
-
res.cookie(env_1.default
|
|
33
|
-
res.locals
|
|
33
|
+
res.cookie(env_1.default['REFRESH_TOKEN_COOKIE_NAME'], refreshToken, constants_1.COOKIE_OPTIONS);
|
|
34
|
+
res.locals['payload'] = { data: { access_token: accessToken, expires } };
|
|
34
35
|
return next();
|
|
35
36
|
}), respond_1.respond);
|
|
36
37
|
const sharedInviteSchema = joi_1.default.object({
|
|
@@ -66,11 +67,11 @@ router.post('/', (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
66
67
|
try {
|
|
67
68
|
if (Array.isArray(req.body)) {
|
|
68
69
|
const items = await service.readMany(savedKeys, req.sanitizedQuery);
|
|
69
|
-
res.locals
|
|
70
|
+
res.locals['payload'] = { data: items };
|
|
70
71
|
}
|
|
71
72
|
else {
|
|
72
73
|
const item = await service.readOne(savedKeys[0], req.sanitizedQuery);
|
|
73
|
-
res.locals
|
|
74
|
+
res.locals['payload'] = { data: item };
|
|
74
75
|
}
|
|
75
76
|
}
|
|
76
77
|
catch (error) {
|
|
@@ -87,7 +88,7 @@ const readHandler = (0, async_handler_1.default)(async (req, res, next) => {
|
|
|
87
88
|
schema: req.schema,
|
|
88
89
|
});
|
|
89
90
|
const records = await service.readByQuery(req.sanitizedQuery);
|
|
90
|
-
res.locals
|
|
91
|
+
res.locals['payload'] = { data: records || null };
|
|
91
92
|
return next();
|
|
92
93
|
});
|
|
93
94
|
router.get('/', (0, validate_batch_1.validateBatch)('read'), readHandler, respond_1.respond);
|
|
@@ -96,7 +97,7 @@ router.get(`/info/:pk(${constants_1.UUID_REGEX})`, (0, async_handler_1.default)(
|
|
|
96
97
|
const service = new services_1.SharesService({
|
|
97
98
|
schema: req.schema,
|
|
98
99
|
});
|
|
99
|
-
const record = await service.readOne(req.params
|
|
100
|
+
const record = await service.readOne(req.params['pk'], {
|
|
100
101
|
fields: ['id', 'collection', 'item', 'password', 'max_uses', 'times_used', 'date_start', 'date_end'],
|
|
101
102
|
filter: {
|
|
102
103
|
_and: [
|
|
@@ -131,7 +132,7 @@ router.get(`/info/:pk(${constants_1.UUID_REGEX})`, (0, async_handler_1.default)(
|
|
|
131
132
|
],
|
|
132
133
|
},
|
|
133
134
|
});
|
|
134
|
-
res.locals
|
|
135
|
+
res.locals['payload'] = { data: record || null };
|
|
135
136
|
return next();
|
|
136
137
|
}), respond_1.respond);
|
|
137
138
|
router.get(`/:pk(${constants_1.UUID_REGEX})`, (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -139,8 +140,8 @@ router.get(`/:pk(${constants_1.UUID_REGEX})`, (0, async_handler_1.default)(async
|
|
|
139
140
|
accountability: req.accountability,
|
|
140
141
|
schema: req.schema,
|
|
141
142
|
});
|
|
142
|
-
const record = await service.readOne(req.params
|
|
143
|
-
res.locals
|
|
143
|
+
const record = await service.readOne(req.params['pk'], req.sanitizedQuery);
|
|
144
|
+
res.locals['payload'] = { data: record || null };
|
|
144
145
|
return next();
|
|
145
146
|
}), respond_1.respond);
|
|
146
147
|
router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handler_1.default)(async (req, res, next) => {
|
|
@@ -156,11 +157,12 @@ router.patch('/', (0, validate_batch_1.validateBatch)('update'), (0, async_handl
|
|
|
156
157
|
keys = await service.updateMany(req.body.keys, req.body.data);
|
|
157
158
|
}
|
|
158
159
|
else {
|
|
159
|
-
|
|
160
|
+
const sanitizedQuery = (0, sanitize_query_1.sanitizeQuery)(req.body.query, req.accountability);
|
|
161
|
+
keys = await service.updateByQuery(sanitizedQuery, req.body.data);
|
|
160
162
|
}
|
|
161
163
|
try {
|
|
162
164
|
const result = await service.readMany(keys, req.sanitizedQuery);
|
|
163
|
-
res.locals
|
|
165
|
+
res.locals['payload'] = { data: result };
|
|
164
166
|
}
|
|
165
167
|
catch (error) {
|
|
166
168
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -175,10 +177,10 @@ router.patch(`/:pk(${constants_1.UUID_REGEX})`, (0, async_handler_1.default)(asy
|
|
|
175
177
|
accountability: req.accountability,
|
|
176
178
|
schema: req.schema,
|
|
177
179
|
});
|
|
178
|
-
const primaryKey = await service.updateOne(req.params
|
|
180
|
+
const primaryKey = await service.updateOne(req.params['pk'], req.body);
|
|
179
181
|
try {
|
|
180
182
|
const item = await service.readOne(primaryKey, req.sanitizedQuery);
|
|
181
|
-
res.locals
|
|
183
|
+
res.locals['payload'] = { data: item || null };
|
|
182
184
|
}
|
|
183
185
|
catch (error) {
|
|
184
186
|
if (error instanceof exceptions_1.ForbiddenException) {
|
|
@@ -200,7 +202,8 @@ router.delete('/', (0, async_handler_1.default)(async (req, _res, next) => {
|
|
|
200
202
|
await service.deleteMany(req.body.keys);
|
|
201
203
|
}
|
|
202
204
|
else {
|
|
203
|
-
|
|
205
|
+
const sanitizedQuery = (0, sanitize_query_1.sanitizeQuery)(req.body.query, req.accountability);
|
|
206
|
+
await service.deleteByQuery(sanitizedQuery);
|
|
204
207
|
}
|
|
205
208
|
return next();
|
|
206
209
|
}), respond_1.respond);
|
|
@@ -209,7 +212,7 @@ router.delete(`/:pk(${constants_1.UUID_REGEX})`, (0, async_handler_1.default)(as
|
|
|
209
212
|
accountability: req.accountability,
|
|
210
213
|
schema: req.schema,
|
|
211
214
|
});
|
|
212
|
-
await service.deleteOne(req.params
|
|
215
|
+
await service.deleteOne(req.params['pk']);
|
|
213
216
|
return next();
|
|
214
217
|
}), respond_1.respond);
|
|
215
218
|
exports.default = router;
|