From 6dc688cefde0ef6a7bd9dbf01c389ae5cf72149a Mon Sep 17 00:00:00 2001
From: James <james@trbl.design>
Date: Thu, 19 Jan 2023 16:06:50 -0500
Subject: [PATCH] chore: ensures onInit is called after initHTTP

---
 src/index.ts    | 4 ++++
 src/initHTTP.ts | 2 +-
 src/payload.ts  | 6 ++++--
 test/dev.ts     | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 74d240f5dc..b23847609a 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -13,6 +13,10 @@ export class PayloadHTTP extends BasePayload<GeneratedTypes> {
   async init(options: InitOptions): Promise<Payload> {
     const payload = await initHTTP(options);
     Object.assign(this, payload);
+
+    if (typeof options.onInit === 'function') await options.onInit(this);
+    if (typeof this.config.onInit === 'function') await this.config.onInit(this);
+
     return payload;
   }
 }
diff --git a/src/initHTTP.ts b/src/initHTTP.ts
index 9a8ca3e2ad..f40bcc6cad 100644
--- a/src/initHTTP.ts
+++ b/src/initHTTP.ts
@@ -1,6 +1,5 @@
 /* eslint-disable no-param-reassign */
 import express, { NextFunction, Response } from 'express';
-import { Config as GeneratedTypes } from 'payload/generated-types';
 import { InitOptions } from './config/types';
 
 import authenticate from './express/middleware/authenticate';
@@ -22,6 +21,7 @@ import mountEndpoints from './express/mountEndpoints';
 import { Payload, getPayload } from './payload';
 
 export const initHTTP = async (options: InitOptions): Promise<Payload> => {
+  options.local = false;
   const payload = await getPayload(options);
 
   if (!options.local) {
diff --git a/src/payload.ts b/src/payload.ts
index 022eb83052..e6693f5b78 100644
--- a/src/payload.ts
+++ b/src/payload.ts
@@ -199,8 +199,10 @@ export class BasePayload<TGeneratedTypes extends GeneratedTypes> {
 
     serverInitTelemetry(this);
 
-    if (typeof options.onInit === 'function') await options.onInit(this);
-    if (typeof this.config.onInit === 'function') await this.config.onInit(this);
+    if (options.local !== false) {
+      if (typeof options.onInit === 'function') await options.onInit(this);
+      if (typeof this.config.onInit === 'function') await this.config.onInit(this);
+    }
 
     return this;
   }
diff --git a/test/dev.ts b/test/dev.ts
index c276cb7c01..3265d72ea8 100644
--- a/test/dev.ts
+++ b/test/dev.ts
@@ -34,8 +34,8 @@ const startDev = async () => {
       fromName: 'Payload',
       fromAddress: 'hello@payloadcms.com',
     },
-    onInit: async (app) => {
-      app.logger.info('Payload Dev Server Initialized');
+    onInit: async () => {
+      payload.logger.info('Payload Dev Server Initialized');
     },
   });