github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace express-async-handler for a local function.

Browse Source
This commit is contained in:
WoLfulus
2020-12-22 17:11:08 -03:00
parent 0cbf5ee418
commit c5f3802da3
30 changed files with 207 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
api/src/controllers/users.ts
View File

@@ -1,5 +1,5 @@
import express from 'express';
import asyncHandler from 'express-async-handler';
import express, { NextFunction, Request, Response } from 'express';
import asyncHandler from '../utils/async-handler';
import Joi from 'joi';
import { InvalidPayloadException, InvalidCredentialsException, ForbiddenException } from '../exceptions';
import { UsersService, MetaService, AuthenticationService } from '../services';
@@ -13,7 +13,7 @@ router.use(useCollection('directus_users'));
router.post(
'/',
asyncHandler(async (req, res, next) => {
asyncHandler(async (req: Request, res: Response, next: NextFunction) => {
const service = new UsersService({
accountability: req.accountability,
schema: req.schema,
@@ -38,7 +38,7 @@ router.post(
router.get(
'/',
asyncHandler(async (req, res, next) => {
asyncHandler(async (req: Request, res: Response, next: NextFunction) => {
const service = new UsersService({
accountability: req.accountability,
schema: req.schema,
@@ -59,7 +59,7 @@ router.get(
router.get(
'/me',
asyncHandler(async (req, res, next) => {
asyncHandler(async (req: Request, res: Response, next: NextFunction) => {
if (!req.accountability?.user) {
throw new InvalidCredentialsException();
}
@@ -88,7 +88,7 @@ router.get(
router.get(
'/:pk',
asyncHandler(async (req, res, next) => {
asyncHandler(async (req: Request, res: Response, next: NextFunction) => {
if (req.path.endsWith('me')) return next();
const service = new UsersService({
accountability: req.accountability,
@@ -104,7 +104,7 @@ router.get(
router.patch(
'/me',
asyncHandler(async (req, res, next) => {
asyncHandler(async (req: Request, res: Response, next: NextFunction) => {
if (!req.accountability?.user) {
throw new InvalidCredentialsException();
}
@@ -124,7 +124,7 @@ router.patch(
router.patch(
'/me/track/page',
asyncHandler(async (req, res, next) => {
asyncHandler(async (req: Request, res: Response, next: NextFunction) => {
if (!req.accountability?.user) {
throw new InvalidCredentialsException();
}
@@ -143,7 +143,7 @@ router.patch(
router.patch(
'/:pk',
asyncHandler(async (req, res, next) => {
asyncHandler(async (req: Request, res: Response, next: NextFunction) => {
const service = new UsersService({
accountability: req.accountability,
schema: req.schema,
@@ -169,7 +169,7 @@ router.patch(
router.delete(
'/',
asyncHandler(async (req, res, next) => {
asyncHandler(async (req: Request, res: Response, next: NextFunction) => {
if (!req.body || Array.isArray(req.body) === false) {
throw new InvalidPayloadException(`Body has to be an array of primary keys`);
}
@@ -187,7 +187,7 @@ router.delete(
router.delete(
'/:pk',
asyncHandler(async (req, res, next) => {
asyncHandler(async (req: Request, res: Response, next: NextFunction) => {
const service = new UsersService({
accountability: req.accountability,
schema: req.schema,
@@ -207,7 +207,7 @@ const inviteSchema = Joi.object({
router.post(
'/invite',
asyncHandler(async (req, res, next) => {
asyncHandler(async (req: Request, res: Response, next: NextFunction) => {
const { error } = inviteSchema.validate(req.body);
if (error) throw new InvalidPayloadException(error.message);
@@ -228,7 +228,7 @@ const acceptInviteSchema = Joi.object({
router.post(
'/invite/accept',
asyncHandler(async (req, res, next) => {
asyncHandler(async (req: Request, res: Response, next: NextFunction) => {
const { error } = acceptInviteSchema.validate(req.body);
if (error) throw new InvalidPayloadException(error.message);
const service = new UsersService({
@@ -243,7 +243,7 @@ router.post(
router.post(
'/me/tfa/enable/',
asyncHandler(async (req, res, next) => {
asyncHandler(async (req: Request, res: Response, next: NextFunction) => {
if (!req.accountability?.user) {
throw new InvalidCredentialsException();
}
@@ -273,7 +273,7 @@ router.post(
router.post(
'/me/tfa/disable',
asyncHandler(async (req, res, next) => {
asyncHandler(async (req: Request, res: Response, next: NextFunction) => {
if (!req.accountability?.user) {
throw new InvalidCredentialsException();
}