Merge branch 'main' of github.com:prefabs-tech/fastify into feat/error-handler

Author: rameshlohala

packages/user/src/index.ts

@@ -58,6 +58,7 @@ export { default as hasUserPermission } from "./lib/hasUserPermission";
 export { default as ProfileValidationClaim } from "./supertokens/utils/profileValidationClaim";
 export { default as createUserContext } from "./supertokens/utils/createUserContext";
 export { default as userSchema } from "./graphql/schema";
+export { errorHandler as supertokensErrorHandler } from "./supertokens/errorHandler";
 
 export * from "./migrations/queries";
 

packages/user/src/supertokens/errorHandler.ts

@@ -0,0 +1,17 @@
+import { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
+import { errorHandler as supertokensErrorHandler } from "supertokens-node/framework/fastify";
+
+export const errorHandler = (
+  error: Error,
+  request: FastifyRequest,
+  reply: FastifyReply,
+) => {
+  return (
+    supertokensErrorHandler() as unknown as (
+      this: FastifyInstance,
+      error: Error,
+      request: FastifyRequest,
+      reply: FastifyReply,
+    ) => Promise<void>
+  ).call(request.server, error, request, reply);
+};

packages/user/src/supertokens/plugin.ts

@@ -2,20 +2,13 @@ import cors from "@fastify/cors";
 import formDataPlugin from "@fastify/formbody";
 import FastifyPlugin from "fastify-plugin";
 import supertokens from "supertokens-node";
-import {
-  errorHandler,
-  plugin as supertokensPlugin,
-} from "supertokens-node/framework/fastify";
+import { plugin as supertokensPlugin } from "supertokens-node/framework/fastify";
 import { verifySession } from "supertokens-node/recipe/session/framework/fastify";
 
+import { errorHandler } from "./errorHandler";
 import init from "./init";
 
-import type {
-  FastifyError,
-  FastifyInstance,
-  FastifyReply,
-  FastifyRequest,
-} from "fastify";
+import type { FastifyInstance } from "fastify";
 
 const plugin = async (fastify: FastifyInstance) => {
   const { config, log } = fastify;
@@ -25,14 +18,7 @@ const plugin = async (fastify: FastifyInstance) => {
   init(fastify);
 
   if (config.user.supertokens.setErrorHandler !== false) {
-    fastify.setErrorHandler(
-      errorHandler() as unknown as (
-        this: FastifyInstance,
-        error: FastifyError,
-        request: FastifyRequest,
-        reply: FastifyReply,
-      ) => void,
-    );
+    fastify.setErrorHandler(errorHandler);
   }
 
   await fastify.register(cors, {