From b6ec4bd2d4e89c990f5ac9bf4924f67ff326fced Mon Sep 17 00:00:00 2001 From: James Date: Mon, 5 Dec 2022 10:24:31 -0500 Subject: [PATCH] chore: binds prefs model even if not local --- src/auth/requestHandlers/login.ts | 2 +- src/init.ts | 4 ++++ src/preferences/init.ts | 3 --- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/auth/requestHandlers/login.ts b/src/auth/requestHandlers/login.ts index b97ffa4f04..30ce67c5e2 100644 --- a/src/auth/requestHandlers/login.ts +++ b/src/auth/requestHandlers/login.ts @@ -3,7 +3,7 @@ import httpStatus from 'http-status'; import { PayloadRequest } from '../../express/types'; import login, { Result } from '../operations/login'; -export default async function loginHandler(req: PayloadRequest, res: Response, next: NextFunction): Promise | void> { +export default async function loginHandler(req: PayloadRequest, res: Response, next: NextFunction): Promise | void> { try { const result = await login({ req, diff --git a/src/init.ts b/src/init.ts index 73979623bc..f2ea9020c0 100644 --- a/src/init.ts +++ b/src/init.ts @@ -29,6 +29,7 @@ import loadConfig from './config/load'; import Logger from './utilities/logger'; import { getDataLoader } from './collections/dataloader'; import mountEndpoints from './express/mountEndpoints'; +import PreferencesModel from './preferences/model'; export const init = (payload: Payload, options: InitOptions): void => { payload.logger.info('Starting Payload...'); @@ -71,6 +72,9 @@ export const init = (payload: Payload, options: InitOptions): void => { if (!payload.config.graphQL.disable) { registerSchema(payload); } + + payload.preferences = { Model: PreferencesModel }; + // If not initializing locally, set up HTTP routing if (!payload.local) { options.express.use((req: PayloadRequest, res, next) => { diff --git a/src/preferences/init.ts b/src/preferences/init.ts index f7dab65a6c..383b989ab2 100644 --- a/src/preferences/init.ts +++ b/src/preferences/init.ts @@ -1,14 +1,11 @@ import express from 'express'; import { Payload } from '../index'; -import Model from './model'; import findOne from './requestHandlers/findOne'; import update from './requestHandlers/update'; import deleteHandler from './requestHandlers/delete'; export default function initPreferences(ctx: Payload): void { - ctx.preferences = { Model }; - if (!ctx.local) { const router = express.Router(); router