naystack 1.7.26 → 1.7.27

package/dist/auth/email/index.cjs.js

@@ -226,7 +226,6 @@ async function massageRequest(req, options) {
   }
   return {
     data: {
-      email: data.email,
       password: data.password,
       ...data
     }
@@ -277,9 +276,13 @@ var getContext = (req) => {
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
   if (options.onLogout) {
-    const ctx = await getContext(req);
-    const body = await req.json();
-    await options.onLogout?.(ctx.userId, body);
+    try {
+      const ctx = await getContext(req);
+      const body = await req.json().catch(() => null);
+      await options.onLogout?.(ctx.userId, body);
+    } catch (e) {
+      console.error(e);
+    }
   }
   return getTokenizedResponse();
 };
@@ -290,8 +293,12 @@ var getGetRoute = (options) => async (req) => {
   const userID = getUserIdFromRefreshToken(refresh);
   if (userID) {
     if (options.onRefresh) {
-      const body = await req.json().catch(() => null);
-      await options.onRefresh?.(userID, body);
+      try {
+        const body = await req.json().catch(() => null);
+        await options.onRefresh?.(userID, body);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       userID
@@ -321,7 +328,11 @@ var getPostRoute = (options) => async (req) => {
   });
   if (newUser) {
     if (options.onSignUp) {
-      await options.onSignUp?.(newUser.id, data);
+      try {
+        await options.onSignUp?.(newUser.id, data);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       newUser.id
@@ -339,7 +350,11 @@ var getPutRoute = (options) => async (req) => {
     return handleError(400, "A user does not exist", options.onError);
   if (await verifyUser(user, data.password)) {
     if (options.onLogin) {
-      await options.onLogin?.(user.id, data);
+      try {
+        await options.onLogin?.(user.id, data);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       user.id
@@ -397,7 +412,7 @@ function AuthFetch() {
           headers: {
             Cookie: cookie.toString()
           }
-        }).then((res) => res.json()).then((data) => data.accessToken).catch(() => null);
+        }).then((res) => res.text()).catch(() => null);
       },
       Component: import_client2.AuthApply
     }

package/dist/auth/email/index.esm.js

@@ -187,7 +187,6 @@ async function massageRequest(req, options) {
   }
   return {
     data: {
-      email: data.email,
       password: data.password,
       ...data
     }
@@ -238,9 +237,13 @@ var getContext = (req) => {
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
   if (options.onLogout) {
-    const ctx = await getContext(req);
-    const body = await req.json();
-    await options.onLogout?.(ctx.userId, body);
+    try {
+      const ctx = await getContext(req);
+      const body = await req.json().catch(() => null);
+      await options.onLogout?.(ctx.userId, body);
+    } catch (e) {
+      console.error(e);
+    }
   }
   return getTokenizedResponse();
 };
@@ -251,8 +254,12 @@ var getGetRoute = (options) => async (req) => {
   const userID = getUserIdFromRefreshToken(refresh);
   if (userID) {
     if (options.onRefresh) {
-      const body = await req.json().catch(() => null);
-      await options.onRefresh?.(userID, body);
+      try {
+        const body = await req.json().catch(() => null);
+        await options.onRefresh?.(userID, body);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       userID
@@ -282,7 +289,11 @@ var getPostRoute = (options) => async (req) => {
   });
   if (newUser) {
     if (options.onSignUp) {
-      await options.onSignUp?.(newUser.id, data);
+      try {
+        await options.onSignUp?.(newUser.id, data);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       newUser.id
@@ -300,7 +311,11 @@ var getPutRoute = (options) => async (req) => {
     return handleError(400, "A user does not exist", options.onError);
   if (await verifyUser(user, data.password)) {
     if (options.onLogin) {
-      await options.onLogin?.(user.id, data);
+      try {
+        await options.onLogin?.(user.id, data);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       user.id
@@ -362,7 +377,7 @@ function AuthFetch() {
           headers: {
             Cookie: cookie.toString()
           }
-        }).then((res) => res.json()).then((data) => data.accessToken).catch(() => null);
+        }).then((res) => res.text()).catch(() => null);
       },
       Component: AuthApply
     }

package/dist/auth/email/next.cjs.js

@@ -135,7 +135,7 @@ function AuthFetch() {
           headers: {
             Cookie: cookie.toString()
           }
-        }).then((res) => res.json()).then((data) => data.accessToken).catch(() => null);
+        }).then((res) => res.text()).catch(() => null);
       },
       Component: import_client2.AuthApply
     }

package/dist/auth/email/next.esm.js

@@ -104,7 +104,7 @@ function AuthFetch() {
           headers: {
             Cookie: cookie.toString()
           }
-        }).then((res) => res.json()).then((data) => data.accessToken).catch(() => null);
+        }).then((res) => res.text()).catch(() => null);
       },
       Component: AuthApply
     }

package/dist/auth/email/routes/delete.cjs.js

@@ -160,9 +160,13 @@ var getContext = (req) => {
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
   if (options.onLogout) {
-    const ctx = await getContext(req);
-    const body = await req.json();
-    await options.onLogout?.(ctx.userId, body);
+    try {
+      const ctx = await getContext(req);
+      const body = await req.json().catch(() => null);
+      await options.onLogout?.(ctx.userId, body);
+    } catch (e) {
+      console.error(e);
+    }
   }
   return getTokenizedResponse();
 };

package/dist/auth/email/routes/delete.esm.js

@@ -134,9 +134,13 @@ var getContext = (req) => {
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
   if (options.onLogout) {
-    const ctx = await getContext(req);
-    const body = await req.json();
-    await options.onLogout?.(ctx.userId, body);
+    try {
+      const ctx = await getContext(req);
+      const body = await req.json().catch(() => null);
+      await options.onLogout?.(ctx.userId, body);
+    } catch (e) {
+      console.error(e);
+    }
   }
   return getTokenizedResponse();
 };

package/dist/auth/email/routes/get.cjs.js

@@ -134,8 +134,12 @@ var getGetRoute = (options) => async (req) => {
   const userID = getUserIdFromRefreshToken(refresh);
   if (userID) {
     if (options.onRefresh) {
-      const body = await req.json().catch(() => null);
-      await options.onRefresh?.(userID, body);
+      try {
+        const body = await req.json().catch(() => null);
+        await options.onRefresh?.(userID, body);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       userID

package/dist/auth/email/routes/get.esm.js

@@ -108,8 +108,12 @@ var getGetRoute = (options) => async (req) => {
   const userID = getUserIdFromRefreshToken(refresh);
   if (userID) {
     if (options.onRefresh) {
-      const body = await req.json().catch(() => null);
-      await options.onRefresh?.(userID, body);
+      try {
+        const body = await req.json().catch(() => null);
+        await options.onRefresh?.(userID, body);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       userID

package/dist/auth/email/routes/post.cjs.js

@@ -150,7 +150,6 @@ async function massageRequest(req, options) {
   }
   return {
     data: {
-      email: data.email,
       password: data.password,
       ...data
     }
@@ -197,7 +196,11 @@ var getPostRoute = (options) => async (req) => {
   });
   if (newUser) {
     if (options.onSignUp) {
-      await options.onSignUp?.(newUser.id, data);
+      try {
+        await options.onSignUp?.(newUser.id, data);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       newUser.id

package/dist/auth/email/routes/post.esm.js

@@ -126,7 +126,6 @@ async function massageRequest(req, options) {
   }
   return {
     data: {
-      email: data.email,
       password: data.password,
       ...data
     }
@@ -173,7 +172,11 @@ var getPostRoute = (options) => async (req) => {
   });
   if (newUser) {
     if (options.onSignUp) {
-      await options.onSignUp?.(newUser.id, data);
+      try {
+        await options.onSignUp?.(newUser.id, data);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       newUser.id

package/dist/auth/email/routes/put.cjs.js

@@ -149,7 +149,6 @@ async function massageRequest(req, options) {
   }
   return {
     data: {
-      email: data.email,
       password: data.password,
       ...data
     }
@@ -185,7 +184,11 @@ var getPutRoute = (options) => async (req) => {
     return handleError(400, "A user does not exist", options.onError);
   if (await verifyUser(user, data.password)) {
     if (options.onLogin) {
-      await options.onLogin?.(user.id, data);
+      try {
+        await options.onLogin?.(user.id, data);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       user.id

package/dist/auth/email/routes/put.esm.js

@@ -123,7 +123,6 @@ async function massageRequest(req, options) {
   }
   return {
     data: {
-      email: data.email,
       password: data.password,
       ...data
     }
@@ -159,7 +158,11 @@ var getPutRoute = (options) => async (req) => {
     return handleError(400, "A user does not exist", options.onError);
   if (await verifyUser(user, data.password)) {
     if (options.onLogin) {
-      await options.onLogin?.(user.id, data);
+      try {
+        await options.onLogin?.(user.id, data);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       user.id

package/dist/auth/email/types.d.mts

@@ -28,10 +28,10 @@ type SetupEmailAuthOptions = {
     getUser: (data: any) => Promise<UserOutput | undefined>;
     createUser: (user: any) => Promise<UserOutput | undefined>;
     onError?: ErrorHandler;
-    onSignUp?: (userId: number | null, body: any) => Promise<void>;
-    onLogin?: (userId: number | null, body: any) => Promise<void>;
-    onRefresh?: (userId: number | null, body: any) => Promise<void>;
-    onLogout?: (userId: number | null, body: any) => Promise<void>;
+    onSignUp?: (userId: number | null, body: object) => Promise<void>;
+    onLogin?: (userId: number | null, body: object) => Promise<void>;
+    onRefresh?: (userId: number | null, body: object) => Promise<void>;
+    onLogout?: (userId: number | null, body: object) => Promise<void>;
     allowedOrigins?: string[];
 };
 

package/dist/auth/email/types.d.ts

@@ -28,10 +28,10 @@ type SetupEmailAuthOptions = {
     getUser: (data: any) => Promise<UserOutput | undefined>;
     createUser: (user: any) => Promise<UserOutput | undefined>;
     onError?: ErrorHandler;
-    onSignUp?: (userId: number | null, body: any) => Promise<void>;
-    onLogin?: (userId: number | null, body: any) => Promise<void>;
-    onRefresh?: (userId: number | null, body: any) => Promise<void>;
-    onLogout?: (userId: number | null, body: any) => Promise<void>;
+    onSignUp?: (userId: number | null, body: object) => Promise<void>;
+    onLogin?: (userId: number | null, body: object) => Promise<void>;
+    onRefresh?: (userId: number | null, body: object) => Promise<void>;
+    onLogout?: (userId: number | null, body: object) => Promise<void>;
     allowedOrigins?: string[];
 };
 

package/dist/auth/email/utils.cjs.js

@@ -129,7 +129,6 @@ async function massageRequest(req, options) {
   }
   return {
     data: {
-      email: data.email,
       password: data.password,
       ...data
     }

package/dist/auth/email/utils.esm.js

@@ -103,7 +103,6 @@ async function massageRequest(req, options) {
   }
   return {
     data: {
-      email: data.email,
       password: data.password,
       ...data
     }

package/dist/auth/index.cjs.js

@@ -244,7 +244,6 @@ async function massageRequest(req, options) {
   }
   return {
     data: {
-      email: data.email,
       password: data.password,
       ...data
     }
@@ -295,9 +294,13 @@ var getContext = (req) => {
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
   if (options.onLogout) {
-    const ctx = await getContext(req);
-    const body = await req.json();
-    await options.onLogout?.(ctx.userId, body);
+    try {
+      const ctx = await getContext(req);
+      const body = await req.json().catch(() => null);
+      await options.onLogout?.(ctx.userId, body);
+    } catch (e) {
+      console.error(e);
+    }
   }
   return getTokenizedResponse();
 };
@@ -308,8 +311,12 @@ var getGetRoute = (options) => async (req) => {
   const userID = getUserIdFromRefreshToken(refresh);
   if (userID) {
     if (options.onRefresh) {
-      const body = await req.json().catch(() => null);
-      await options.onRefresh?.(userID, body);
+      try {
+        const body = await req.json().catch(() => null);
+        await options.onRefresh?.(userID, body);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       userID
@@ -339,7 +346,11 @@ var getPostRoute = (options) => async (req) => {
   });
   if (newUser) {
     if (options.onSignUp) {
-      await options.onSignUp?.(newUser.id, data);
+      try {
+        await options.onSignUp?.(newUser.id, data);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       newUser.id
@@ -357,7 +368,11 @@ var getPutRoute = (options) => async (req) => {
     return handleError(400, "A user does not exist", options.onError);
   if (await verifyUser(user, data.password)) {
     if (options.onLogin) {
-      await options.onLogin?.(user.id, data);
+      try {
+        await options.onLogin?.(user.id, data);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       user.id
@@ -415,7 +430,7 @@ function AuthFetch() {
           headers: {
             Cookie: cookie.toString()
           }
-        }).then((res) => res.json()).then((data) => data.accessToken).catch(() => null);
+        }).then((res) => res.text()).catch(() => null);
       },
       Component: import_client2.AuthApply
     }

package/dist/auth/index.esm.js

@@ -199,7 +199,6 @@ async function massageRequest(req, options) {
   }
   return {
     data: {
-      email: data.email,
       password: data.password,
       ...data
     }
@@ -250,9 +249,13 @@ var getContext = (req) => {
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
   if (options.onLogout) {
-    const ctx = await getContext(req);
-    const body = await req.json();
-    await options.onLogout?.(ctx.userId, body);
+    try {
+      const ctx = await getContext(req);
+      const body = await req.json().catch(() => null);
+      await options.onLogout?.(ctx.userId, body);
+    } catch (e) {
+      console.error(e);
+    }
   }
   return getTokenizedResponse();
 };
@@ -263,8 +266,12 @@ var getGetRoute = (options) => async (req) => {
   const userID = getUserIdFromRefreshToken(refresh);
   if (userID) {
     if (options.onRefresh) {
-      const body = await req.json().catch(() => null);
-      await options.onRefresh?.(userID, body);
+      try {
+        const body = await req.json().catch(() => null);
+        await options.onRefresh?.(userID, body);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       userID
@@ -294,7 +301,11 @@ var getPostRoute = (options) => async (req) => {
   });
   if (newUser) {
     if (options.onSignUp) {
-      await options.onSignUp?.(newUser.id, data);
+      try {
+        await options.onSignUp?.(newUser.id, data);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       newUser.id
@@ -312,7 +323,11 @@ var getPutRoute = (options) => async (req) => {
     return handleError(400, "A user does not exist", options.onError);
   if (await verifyUser(user, data.password)) {
     if (options.onLogin) {
-      await options.onLogin?.(user.id, data);
+      try {
+        await options.onLogin?.(user.id, data);
+      } catch (e) {
+        console.error(e);
+      }
     }
     return getTokenizedResponse(
       user.id
@@ -374,7 +389,7 @@ function AuthFetch() {
           headers: {
             Cookie: cookie.toString()
           }
-        }).then((res) => res.json()).then((data) => data.accessToken).catch(() => null);
+        }).then((res) => res.text()).catch(() => null);
       },
       Component: AuthApply
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naystack",
-  "version": "1.7.26",
+  "version": "1.7.27",
   "description": "A stack built with Next + GraphQL + S3 + Auth",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",