chore: fix some eslint errors
This commit is contained in:
@@ -46,7 +46,7 @@ export default [
|
|||||||
hidden: true,
|
hidden: true,
|
||||||
hooks: {
|
hooks: {
|
||||||
beforeValidate: [
|
beforeValidate: [
|
||||||
async ({ data, req, value }) => {
|
({ data, req, value }) => {
|
||||||
if (data.apiKey) {
|
if (data.apiKey) {
|
||||||
return crypto
|
return crypto
|
||||||
.createHmac('sha1', req.payload.secret)
|
.createHmac('sha1', req.payload.secret)
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import type { SanitizedConfig } from './types.js'
|
|||||||
import { CLIENT_EXTENSIONS } from '../bin/register/clientExtensions.js'
|
import { CLIENT_EXTENSIONS } from '../bin/register/clientExtensions.js'
|
||||||
import Logger from '../utilities/logger.js'
|
import Logger from '../utilities/logger.js'
|
||||||
import { findConfig } from './find.js'
|
import { findConfig } from './find.js'
|
||||||
import validate from './validate.js'
|
import { validateSchema } from './validate.js'
|
||||||
|
|
||||||
const require = createRequire(import.meta.url)
|
const require = createRequire(import.meta.url)
|
||||||
|
|
||||||
@@ -28,7 +28,7 @@ const loadConfig = async (logger?: pino.Logger): Promise<SanitizedConfig> => {
|
|||||||
if ('default' in config) config = await config.default
|
if ('default' in config) config = await config.default
|
||||||
|
|
||||||
if (process.env.NODE_ENV !== 'production') {
|
if (process.env.NODE_ENV !== 'production') {
|
||||||
config = await validate(config, localLogger)
|
config = validateSchema(config, localLogger)
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ const validateFields = (
|
|||||||
return errors
|
return errors
|
||||||
}
|
}
|
||||||
|
|
||||||
const validateCollections = async (collections: SanitizedCollectionConfig[]): Promise<string[]> => {
|
const validateCollections = (collections: SanitizedCollectionConfig[]): string[] => {
|
||||||
const errors: string[] = []
|
const errors: string[] = []
|
||||||
collections.forEach((collection) => {
|
collections.forEach((collection) => {
|
||||||
const result = collectionSchema.validate(collection, { abortEarly: false })
|
const result = collectionSchema.validate(collection, { abortEarly: false })
|
||||||
@@ -75,16 +75,13 @@ const validateGlobals = (globals: SanitizedGlobalConfig[]): string[] => {
|
|||||||
return errors
|
return errors
|
||||||
}
|
}
|
||||||
|
|
||||||
const validateSchema = async (
|
export const validateSchema = (config: SanitizedConfig, logger: Logger): SanitizedConfig => {
|
||||||
config: SanitizedConfig,
|
|
||||||
logger: Logger,
|
|
||||||
): Promise<SanitizedConfig> => {
|
|
||||||
const result = schema.validate(config, {
|
const result = schema.validate(config, {
|
||||||
abortEarly: false,
|
abortEarly: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
const nestedErrors = [
|
const nestedErrors = [
|
||||||
...(await validateCollections(config.collections)),
|
...validateCollections(config.collections),
|
||||||
...validateGlobals(config.globals),
|
...validateGlobals(config.globals),
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -112,5 +109,3 @@ const validateSchema = async (
|
|||||||
|
|
||||||
return result.value
|
return result.value
|
||||||
}
|
}
|
||||||
|
|
||||||
export default validateSchema
|
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ import { decrypt, encrypt } from './auth/crypto.js'
|
|||||||
import { APIKeyAuthentication } from './auth/strategies/apiKey.js'
|
import { APIKeyAuthentication } from './auth/strategies/apiKey.js'
|
||||||
import { JWTAuthentication } from './auth/strategies/jwt.js'
|
import { JWTAuthentication } from './auth/strategies/jwt.js'
|
||||||
import localOperations from './collections/operations/local/index.js'
|
import localOperations from './collections/operations/local/index.js'
|
||||||
import validate from './config/validate.js'
|
import { validateSchema } from './config/validate.js'
|
||||||
import buildEmail from './email/build.js'
|
import buildEmail from './email/build.js'
|
||||||
import { defaults as emailDefaults } from './email/defaults.js'
|
import { defaults as emailDefaults } from './email/defaults.js'
|
||||||
import sendEmail from './email/sendEmail.js'
|
import sendEmail from './email/sendEmail.js'
|
||||||
@@ -307,7 +307,7 @@ export class BasePayload<TGeneratedTypes extends GeneratedTypes> {
|
|||||||
this.config = await options.config
|
this.config = await options.config
|
||||||
|
|
||||||
if (process.env.NODE_ENV !== 'production') {
|
if (process.env.NODE_ENV !== 'production') {
|
||||||
await validate(this.config, this.logger)
|
validateSchema(this.config, this.logger)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this.config.secret) {
|
if (!this.config.secret) {
|
||||||
|
|||||||
Reference in New Issue
Block a user