tabshift/payload
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: handle access result gracefully

Browse Source
This commit is contained in:
Elliot DeNolf
2020-12-03 11:50:08 -05:00
parent 66946c8697
commit 1cd578ef44
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/auth/executeAccess.ts
View File

@@ -1,7 +1,7 @@
import { Forbidden } from '../errors';
import { Access } from '../config/types';
import { Access, AccessResult } from '../config/types';
const executeAccess = async (operation, access: Access): Promise<boolean> => {
const executeAccess = async (operation, access: Access): Promise<AccessResult> => {
if (access) {
const result = await access(operation);

3
src/config/types.ts
View File

@@ -49,7 +49,8 @@ export type MockEmailCredentials = {
web: string;
};
export type Access = (args?: any) => boolean | Where;
export type AccessResult = boolean | Where;
export type Access = (args?: any) => AccessResult;
export type PayloadConfig = {
admin?: {

4
src/express/middleware/errorHandler.ts
View File

@@ -1,5 +1,5 @@
import httpStatus from 'http-status';
import { Response } from 'express';
import { NextFunction, Response } from 'express';
import { Logger } from 'pino';
import { Config } from '../../config/types';
import formatErrorResponse, { ErrorResponse } from '../responses/formatError';
@@ -10,7 +10,7 @@ export type ErrorHandler = (err: Error, req: PayloadRequest, res: Response) => P
// NextFunction must be passed for Express to use this middleware as error handler
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const errorHandler = (config: Config, logger: Logger) => async (err: APIError, req: PayloadRequest, res: Response): Promise<void> => {
const errorHandler = (config: Config, logger: Logger) => async (err: APIError, req: PayloadRequest, res: Response, next: NextFunction): Promise<void> => {
let response = formatErrorResponse(err);
let status = err.status || httpStatus.INTERNAL_SERVER_ERROR;