naystack 1.2.16 → 1.2.17

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

@@ -128,42 +128,49 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
-var getUserContext = (refreshKey, signingKey, req) => {
+var getContext = (refreshKey, signingKey, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
     const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { refreshUserID: userId };
-    return null;
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
   }
   const token = bearer.slice(7);
   try {
     const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
     if (typeof res === "string") {
-      return null;
+      return { userId: null };
     }
     return {
-      accessUserId: res.id
+      userId: res.id
     };
   } catch {
   }
-  return null;
+  return { userId: null };
 };
 
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
-  if (options.onLogout) await options.onLogout?.(await req.json());
+  if (options.onLogout) {
+    const ctx = await getContext(options.refreshKey, options.signingKey, req);
+    await options.onLogout?.(ctx.userId, req);
+  }
   return getTokenizedResponse(void 0, "");
 };
 
 // src/auth/email/routes/get.ts
-var getGetRoute = (options) => (req) => {
+var getGetRoute = (options) => async (req) => {
   const refresh = req.cookies.get("refresh")?.value;
   const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
-  if (userID)
+  if (userID) {
+    if (options.onRefresh) {
+      await options.onRefresh?.(userID, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(userID, options.signingKey)
     );
+  }
   return getTokenizedResponse();
 };
 
@@ -188,7 +195,9 @@ var getPostRoute = (options) => async (req) => {
     password: encryptedPassword
   });
   if (newUser) {
-    options.onSignUp?.(newUser);
+    if (options.onSignUp) {
+      await options.onSignUp?.(newUser.id, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(newUser.id, options.signingKey),
       generateRefreshToken(newUser.id, options.refreshKey)
@@ -205,6 +214,9 @@ var getPutRoute = (options) => async (req) => {
   if (!user)
     return handleError(400, "A user does not exist", options.onError);
   if (await verifyUser(user, data.password)) {
+    if (options.onLogin) {
+      await options.onLogin?.(user.id, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(user.id, options.signingKey),
       generateRefreshToken(user.id, options.refreshKey)
@@ -220,14 +232,7 @@ function getEmailAuthRoutes(options) {
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
     DELETE: getDeleteRoute(options),
-    getContext: (req) => {
-      const ids = getUserContext(options.refreshKey, options.signingKey, req);
-      if (!ids) return { userId: null };
-      if (ids.refreshUserID) {
-        return { userId: ids.refreshUserID, isRefreshID: true };
-      }
-      return { userId: ids.accessUserId };
-    }
+    getContext: (req) => getContext(options.refreshKey, options.signingKey, req)
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,29 +1,21 @@
 import * as next_server from 'next/server';
 import { NextRequest } from 'next/server';
+import { Context } from '../../graphql/types.mjs';
 import { InitRoutesOptions } from './types.mjs';
 import '../types.mjs';
 
 declare function getEmailAuthRoutes(options: InitRoutesOptions): {
-    GET: (req: NextRequest) => next_server.NextResponse<{
+    GET: (req: NextRequest) => Promise<next_server.NextResponse<{
         accessToken: string | undefined;
         refreshToken: string | undefined;
-    }>;
+    }>>;
     POST: (req: NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
     PUT: (req: NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
     DELETE: (req: NextRequest) => Promise<next_server.NextResponse<{
         accessToken: string | undefined;
         refreshToken: string | undefined;
     }>>;
-    getContext: (req: NextRequest) => {
-        userId: null;
-        isRefreshID?: undefined;
-    } | {
-        userId: number;
-        isRefreshID: boolean;
-    } | {
-        userId: number | undefined;
-        isRefreshID?: undefined;
-    };
+    getContext: (req: NextRequest) => Context;
 };
 
 export { getEmailAuthRoutes };

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

@@ -1,29 +1,21 @@
 import * as next_server from 'next/server';
 import { NextRequest } from 'next/server';
+import { Context } from '../../graphql/types.js';
 import { InitRoutesOptions } from './types.js';
 import '../types.js';
 
 declare function getEmailAuthRoutes(options: InitRoutesOptions): {
-    GET: (req: NextRequest) => next_server.NextResponse<{
+    GET: (req: NextRequest) => Promise<next_server.NextResponse<{
         accessToken: string | undefined;
         refreshToken: string | undefined;
-    }>;
+    }>>;
     POST: (req: NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
     PUT: (req: NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
     DELETE: (req: NextRequest) => Promise<next_server.NextResponse<{
         accessToken: string | undefined;
         refreshToken: string | undefined;
     }>>;
-    getContext: (req: NextRequest) => {
-        userId: null;
-        isRefreshID?: undefined;
-    } | {
-        userId: number;
-        isRefreshID: boolean;
-    } | {
-        userId: number | undefined;
-        isRefreshID?: undefined;
-    };
+    getContext: (req: NextRequest) => Context;
 };
 
 export { getEmailAuthRoutes };

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

@@ -102,42 +102,49 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
-var getUserContext = (refreshKey, signingKey, req) => {
+var getContext = (refreshKey, signingKey, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
     const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { refreshUserID: userId };
-    return null;
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
   }
   const token = bearer.slice(7);
   try {
     const res = verify2(token, signingKey);
     if (typeof res === "string") {
-      return null;
+      return { userId: null };
     }
     return {
-      accessUserId: res.id
+      userId: res.id
     };
   } catch {
   }
-  return null;
+  return { userId: null };
 };
 
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
-  if (options.onLogout) await options.onLogout?.(await req.json());
+  if (options.onLogout) {
+    const ctx = await getContext(options.refreshKey, options.signingKey, req);
+    await options.onLogout?.(ctx.userId, req);
+  }
   return getTokenizedResponse(void 0, "");
 };
 
 // src/auth/email/routes/get.ts
-var getGetRoute = (options) => (req) => {
+var getGetRoute = (options) => async (req) => {
   const refresh = req.cookies.get("refresh")?.value;
   const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
-  if (userID)
+  if (userID) {
+    if (options.onRefresh) {
+      await options.onRefresh?.(userID, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(userID, options.signingKey)
     );
+  }
   return getTokenizedResponse();
 };
 
@@ -162,7 +169,9 @@ var getPostRoute = (options) => async (req) => {
     password: encryptedPassword
   });
   if (newUser) {
-    options.onSignUp?.(newUser);
+    if (options.onSignUp) {
+      await options.onSignUp?.(newUser.id, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(newUser.id, options.signingKey),
       generateRefreshToken(newUser.id, options.refreshKey)
@@ -179,6 +188,9 @@ var getPutRoute = (options) => async (req) => {
   if (!user)
     return handleError(400, "A user does not exist", options.onError);
   if (await verifyUser(user, data.password)) {
+    if (options.onLogin) {
+      await options.onLogin?.(user.id, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(user.id, options.signingKey),
       generateRefreshToken(user.id, options.refreshKey)
@@ -194,14 +206,7 @@ function getEmailAuthRoutes(options) {
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
     DELETE: getDeleteRoute(options),
-    getContext: (req) => {
-      const ids = getUserContext(options.refreshKey, options.signingKey, req);
-      if (!ids) return { userId: null };
-      if (ids.refreshUserID) {
-        return { userId: ids.refreshUserID, isRefreshID: true };
-      }
-      return { userId: ids.accessUserId };
-    }
+    getContext: (req) => getContext(options.refreshKey, options.signingKey, req)
   };
 }
 export {

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

@@ -49,10 +49,54 @@ function getTokenizedResponse(accessToken, refreshToken) {
   }
   return response;
 }
+function getUserIdFromRefreshToken(refreshKey, refreshToken) {
+  if (refreshToken)
+    try {
+      const decoded = (0, import_jsonwebtoken.verify)(refreshToken, refreshKey);
+      if (typeof decoded !== "string" && typeof decoded.id === "number")
+        return decoded.id;
+    } catch (e) {
+      if (!(e instanceof import_jsonwebtoken.JsonWebTokenError)) console.error(e, "errors");
+      return null;
+    }
+  return null;
+}
+
+// src/auth/email/utils.ts
+var import_jsonwebtoken2 = require("jsonwebtoken");
+
+// src/auth/utils/errors.ts
+var import_server2 = require("next/server");
+
+// src/auth/email/utils.ts
+var getContext = (refreshKey, signingKey, req) => {
+  const bearer = req.headers.get("authorization");
+  if (!bearer) {
+    const refresh = req.cookies.get("refresh")?.value;
+    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
+  }
+  const token = bearer.slice(7);
+  try {
+    const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
+    if (typeof res === "string") {
+      return { userId: null };
+    }
+    return {
+      userId: res.id
+    };
+  } catch {
+  }
+  return { userId: null };
+};
 
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
-  if (options.onLogout) await options.onLogout?.(await req.json());
+  if (options.onLogout) {
+    const ctx = await getContext(options.refreshKey, options.signingKey, req);
+    await options.onLogout?.(ctx.userId, req);
+  }
   return getTokenizedResponse(void 0, "");
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -23,10 +23,54 @@ function getTokenizedResponse(accessToken, refreshToken) {
   }
   return response;
 }
+function getUserIdFromRefreshToken(refreshKey, refreshToken) {
+  if (refreshToken)
+    try {
+      const decoded = verify(refreshToken, refreshKey);
+      if (typeof decoded !== "string" && typeof decoded.id === "number")
+        return decoded.id;
+    } catch (e) {
+      if (!(e instanceof JsonWebTokenError)) console.error(e, "errors");
+      return null;
+    }
+  return null;
+}
+
+// src/auth/email/utils.ts
+import { verify as verify2 } from "jsonwebtoken";
+
+// src/auth/utils/errors.ts
+import { NextResponse as NextResponse2 } from "next/server";
+
+// src/auth/email/utils.ts
+var getContext = (refreshKey, signingKey, req) => {
+  const bearer = req.headers.get("authorization");
+  if (!bearer) {
+    const refresh = req.cookies.get("refresh")?.value;
+    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
+  }
+  const token = bearer.slice(7);
+  try {
+    const res = verify2(token, signingKey);
+    if (typeof res === "string") {
+      return { userId: null };
+    }
+    return {
+      userId: res.id
+    };
+  } catch {
+  }
+  return { userId: null };
+};
 
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
-  if (options.onLogout) await options.onLogout?.(await req.json());
+  if (options.onLogout) {
+    const ctx = await getContext(options.refreshKey, options.signingKey, req);
+    await options.onLogout?.(ctx.userId, req);
+  }
   return getTokenizedResponse(void 0, "");
 };
 export {

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

@@ -68,13 +68,17 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 }
 
 // src/auth/email/routes/get.ts
-var getGetRoute = (options) => (req) => {
+var getGetRoute = (options) => async (req) => {
   const refresh = req.cookies.get("refresh")?.value;
   const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
-  if (userID)
+  if (userID) {
+    if (options.onRefresh) {
+      await options.onRefresh?.(userID, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(userID, options.signingKey)
     );
+  }
   return getTokenizedResponse();
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/auth/email/routes/get.d.mts

@@ -3,9 +3,9 @@ import { NextRequest } from 'next/server';
 import { InitRoutesOptions } from '../types.mjs';
 import '../../types.mjs';
 
-declare const getGetRoute: (options: InitRoutesOptions) => (req: NextRequest) => next_server.NextResponse<{
+declare const getGetRoute: (options: InitRoutesOptions) => (req: NextRequest) => Promise<next_server.NextResponse<{
     accessToken: string | undefined;
     refreshToken: string | undefined;
-}>;
+}>>;
 
 export { getGetRoute };

package/dist/auth/email/routes/get.d.ts

@@ -3,9 +3,9 @@ import { NextRequest } from 'next/server';
 import { InitRoutesOptions } from '../types.js';
 import '../../types.js';
 
-declare const getGetRoute: (options: InitRoutesOptions) => (req: NextRequest) => next_server.NextResponse<{
+declare const getGetRoute: (options: InitRoutesOptions) => (req: NextRequest) => Promise<next_server.NextResponse<{
     accessToken: string | undefined;
     refreshToken: string | undefined;
-}>;
+}>>;
 
 export { getGetRoute };

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

@@ -42,13 +42,17 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 }
 
 // src/auth/email/routes/get.ts
-var getGetRoute = (options) => (req) => {
+var getGetRoute = (options) => async (req) => {
   const refresh = req.cookies.get("refresh")?.value;
   const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
-  if (userID)
+  if (userID) {
+    if (options.onRefresh) {
+      await options.onRefresh?.(userID, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(userID, options.signingKey)
     );
+  }
   return getTokenizedResponse();
 };
 export {

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

@@ -136,7 +136,9 @@ var getPostRoute = (options) => async (req) => {
     password: encryptedPassword
   });
   if (newUser) {
-    options.onSignUp?.(newUser);
+    if (options.onSignUp) {
+      await options.onSignUp?.(newUser.id, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(newUser.id, options.signingKey),
       generateRefreshToken(newUser.id, options.refreshKey)

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

@@ -112,7 +112,9 @@ var getPostRoute = (options) => async (req) => {
     password: encryptedPassword
   });
   if (newUser) {
-    options.onSignUp?.(newUser);
+    if (options.onSignUp) {
+      await options.onSignUp?.(newUser.id, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(newUser.id, options.signingKey),
       generateRefreshToken(newUser.id, options.refreshKey)

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

@@ -123,6 +123,9 @@ var getPutRoute = (options) => async (req) => {
   if (!user)
     return handleError(400, "A user does not exist", options.onError);
   if (await verifyUser(user, data.password)) {
+    if (options.onLogin) {
+      await options.onLogin?.(user.id, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(user.id, options.signingKey),
       generateRefreshToken(user.id, options.refreshKey)

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

@@ -97,6 +97,9 @@ var getPutRoute = (options) => async (req) => {
   if (!user)
     return handleError(400, "A user does not exist", options.onError);
   if (await verifyUser(user, data.password)) {
+    if (options.onLogin) {
+      await options.onLogin?.(user.id, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(user.id, options.signingKey),
       generateRefreshToken(user.id, options.refreshKey)

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

@@ -1,5 +1,5 @@
+import { NextRequest } from 'next/server';
 import { UserOutput, UserInput, ErrorHandler } from '../types.mjs';
-import 'next/server';
 
 type InitRoutesOptions = {
     getUser: (email: string) => Promise<UserOutput | undefined>;
@@ -8,8 +8,10 @@ type InitRoutesOptions = {
     signingKey: string;
     refreshKey: string;
     turnstileKey?: string;
-    onSignUp?: (user: UserOutput) => void;
-    onLogout?: (body: string) => Promise<void>;
+    onSignUp?: (userId: number | null, req: NextRequest) => Promise<void>;
+    onLogin?: (userId: number | null, req: NextRequest) => Promise<void>;
+    onRefresh?: (userId: number | null, req: NextRequest) => Promise<void>;
+    onLogout?: (userId: number | null, req: NextRequest) => Promise<void>;
 };
 
 export type { InitRoutesOptions };

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

@@ -1,5 +1,5 @@
+import { NextRequest } from 'next/server';
 import { UserOutput, UserInput, ErrorHandler } from '../types.js';
-import 'next/server';
 
 type InitRoutesOptions = {
     getUser: (email: string) => Promise<UserOutput | undefined>;
@@ -8,8 +8,10 @@ type InitRoutesOptions = {
     signingKey: string;
     refreshKey: string;
     turnstileKey?: string;
-    onSignUp?: (user: UserOutput) => void;
-    onLogout?: (body: string) => Promise<void>;
+    onSignUp?: (userId: number | null, req: NextRequest) => Promise<void>;
+    onLogin?: (userId: number | null, req: NextRequest) => Promise<void>;
+    onRefresh?: (userId: number | null, req: NextRequest) => Promise<void>;
+    onLogout?: (userId: number | null, req: NextRequest) => Promise<void>;
 };
 
 export type { InitRoutesOptions };

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

@@ -20,7 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/auth/email/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
-  getUserContext: () => getUserContext,
+  getContext: () => getContext,
   massageRequest: () => massageRequest,
   verifyCaptcha: () => verifyCaptcha
 });
@@ -95,30 +95,30 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
-var getUserContext = (refreshKey, signingKey, req) => {
+var getContext = (refreshKey, signingKey, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
     const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { refreshUserID: userId };
-    return null;
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
   }
   const token = bearer.slice(7);
   try {
     const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
     if (typeof res === "string") {
-      return null;
+      return { userId: null };
     }
     return {
-      accessUserId: res.id
+      userId: res.id
     };
   } catch {
   }
-  return null;
+  return { userId: null };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getUserContext,
+  getContext,
   massageRequest,
   verifyCaptcha
 });

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

@@ -1,4 +1,5 @@
 import { NextRequest, NextResponse } from 'next/server';
+import { Context } from '../../graphql/types.mjs';
 import { InitRoutesOptions } from './types.mjs';
 import '../types.mjs';
 
@@ -12,9 +13,6 @@ declare function massageRequest(req: NextRequest, options: InitRoutesOptions): P
     };
 }>;
 declare function verifyCaptcha(token: string, secret?: string): Promise<boolean>;
-declare const getUserContext: (refreshKey: string, signingKey: string, req: NextRequest) => {
-    refreshUserID?: number;
-    accessUserId?: number;
-} | null;
+declare const getContext: (refreshKey: string, signingKey: string, req: NextRequest) => Context;
 
-export { getUserContext, massageRequest, verifyCaptcha };
+export { getContext, massageRequest, verifyCaptcha };

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

@@ -1,4 +1,5 @@
 import { NextRequest, NextResponse } from 'next/server';
+import { Context } from '../../graphql/types.js';
 import { InitRoutesOptions } from './types.js';
 import '../types.js';
 
@@ -12,9 +13,6 @@ declare function massageRequest(req: NextRequest, options: InitRoutesOptions): P
     };
 }>;
 declare function verifyCaptcha(token: string, secret?: string): Promise<boolean>;
-declare const getUserContext: (refreshKey: string, signingKey: string, req: NextRequest) => {
-    refreshUserID?: number;
-    accessUserId?: number;
-} | null;
+declare const getContext: (refreshKey: string, signingKey: string, req: NextRequest) => Context;
 
-export { getUserContext, massageRequest, verifyCaptcha };
+export { getContext, massageRequest, verifyCaptcha };

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

@@ -69,29 +69,29 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
-var getUserContext = (refreshKey, signingKey, req) => {
+var getContext = (refreshKey, signingKey, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
     const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { refreshUserID: userId };
-    return null;
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
   }
   const token = bearer.slice(7);
   try {
     const res = verify2(token, signingKey);
     if (typeof res === "string") {
-      return null;
+      return { userId: null };
     }
     return {
-      accessUserId: res.id
+      userId: res.id
     };
   } catch {
   }
-  return null;
+  return { userId: null };
 };
 export {
-  getUserContext,
+  getContext,
   massageRequest,
   verifyCaptcha
 };

package/dist/auth/index.cjs.js

@@ -142,42 +142,49 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
-var getUserContext = (refreshKey, signingKey, req) => {
+var getContext = (refreshKey, signingKey, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
     const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { refreshUserID: userId };
-    return null;
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
   }
   const token = bearer.slice(7);
   try {
     const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
     if (typeof res === "string") {
-      return null;
+      return { userId: null };
     }
     return {
-      accessUserId: res.id
+      userId: res.id
     };
   } catch {
   }
-  return null;
+  return { userId: null };
 };
 
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
-  if (options.onLogout) await options.onLogout?.(await req.json());
+  if (options.onLogout) {
+    const ctx = await getContext(options.refreshKey, options.signingKey, req);
+    await options.onLogout?.(ctx.userId, req);
+  }
   return getTokenizedResponse(void 0, "");
 };
 
 // src/auth/email/routes/get.ts
-var getGetRoute = (options) => (req) => {
+var getGetRoute = (options) => async (req) => {
   const refresh = req.cookies.get("refresh")?.value;
   const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
-  if (userID)
+  if (userID) {
+    if (options.onRefresh) {
+      await options.onRefresh?.(userID, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(userID, options.signingKey)
     );
+  }
   return getTokenizedResponse();
 };
 
@@ -202,7 +209,9 @@ var getPostRoute = (options) => async (req) => {
     password: encryptedPassword
   });
   if (newUser) {
-    options.onSignUp?.(newUser);
+    if (options.onSignUp) {
+      await options.onSignUp?.(newUser.id, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(newUser.id, options.signingKey),
       generateRefreshToken(newUser.id, options.refreshKey)
@@ -219,6 +228,9 @@ var getPutRoute = (options) => async (req) => {
   if (!user)
     return handleError(400, "A user does not exist", options.onError);
   if (await verifyUser(user, data.password)) {
+    if (options.onLogin) {
+      await options.onLogin?.(user.id, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(user.id, options.signingKey),
       generateRefreshToken(user.id, options.refreshKey)
@@ -234,14 +246,7 @@ function getEmailAuthRoutes(options) {
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
     DELETE: getDeleteRoute(options),
-    getContext: (req) => {
-      const ids = getUserContext(options.refreshKey, options.signingKey, req);
-      if (!ids) return { userId: null };
-      if (ids.refreshUserID) {
-        return { userId: ids.refreshUserID, isRefreshID: true };
-      }
-      return { userId: ids.accessUserId };
-    }
+    getContext: (req) => getContext(options.refreshKey, options.signingKey, req)
   };
 }
 

package/dist/auth/index.d.mts

@@ -2,6 +2,7 @@ export { getEmailAuthRoutes } from './email/index.mjs';
 export { initGoogleAuth } from './google/index.mjs';
 export { initInstagramAuth } from './instagram/index.mjs';
 import 'next/server';
+import '../graphql/types.mjs';
 import './email/types.mjs';
 import './types.mjs';
 import 'googleapis';

package/dist/auth/index.d.ts

@@ -2,6 +2,7 @@ export { getEmailAuthRoutes } from './email/index.js';
 export { initGoogleAuth } from './google/index.js';
 export { initInstagramAuth } from './instagram/index.js';
 import 'next/server';
+import '../graphql/types.js';
 import './email/types.js';
 import './types.js';
 import 'googleapis';

package/dist/auth/index.esm.js

@@ -114,42 +114,49 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
-var getUserContext = (refreshKey, signingKey, req) => {
+var getContext = (refreshKey, signingKey, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
     const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { refreshUserID: userId };
-    return null;
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
   }
   const token = bearer.slice(7);
   try {
     const res = verify2(token, signingKey);
     if (typeof res === "string") {
-      return null;
+      return { userId: null };
     }
     return {
-      accessUserId: res.id
+      userId: res.id
     };
   } catch {
   }
-  return null;
+  return { userId: null };
 };
 
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
-  if (options.onLogout) await options.onLogout?.(await req.json());
+  if (options.onLogout) {
+    const ctx = await getContext(options.refreshKey, options.signingKey, req);
+    await options.onLogout?.(ctx.userId, req);
+  }
   return getTokenizedResponse(void 0, "");
 };
 
 // src/auth/email/routes/get.ts
-var getGetRoute = (options) => (req) => {
+var getGetRoute = (options) => async (req) => {
   const refresh = req.cookies.get("refresh")?.value;
   const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
-  if (userID)
+  if (userID) {
+    if (options.onRefresh) {
+      await options.onRefresh?.(userID, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(userID, options.signingKey)
     );
+  }
   return getTokenizedResponse();
 };
 
@@ -174,7 +181,9 @@ var getPostRoute = (options) => async (req) => {
     password: encryptedPassword
   });
   if (newUser) {
-    options.onSignUp?.(newUser);
+    if (options.onSignUp) {
+      await options.onSignUp?.(newUser.id, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(newUser.id, options.signingKey),
       generateRefreshToken(newUser.id, options.refreshKey)
@@ -191,6 +200,9 @@ var getPutRoute = (options) => async (req) => {
   if (!user)
     return handleError(400, "A user does not exist", options.onError);
   if (await verifyUser(user, data.password)) {
+    if (options.onLogin) {
+      await options.onLogin?.(user.id, req);
+    }
     return getTokenizedResponse(
       generateAccessToken(user.id, options.signingKey),
       generateRefreshToken(user.id, options.refreshKey)
@@ -206,14 +218,7 @@ function getEmailAuthRoutes(options) {
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
     DELETE: getDeleteRoute(options),
-    getContext: (req) => {
-      const ids = getUserContext(options.refreshKey, options.signingKey, req);
-      if (!ids) return { userId: null };
-      if (ids.refreshUserID) {
-        return { userId: ids.refreshUserID, isRefreshID: true };
-      }
-      return { userId: ids.accessUserId };
-    }
+    getContext: (req) => getContext(options.refreshKey, options.signingKey, req)
   };
 }
 

package/dist/file/index.cjs.js

@@ -53,26 +53,26 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 var import_server2 = require("next/server");
 
 // src/auth/email/utils.ts
-var getUserContext = (refreshKey, signingKey, req) => {
+var getContext = (refreshKey, signingKey, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
     const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { refreshUserID: userId };
-    return null;
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
   }
   const token = bearer.slice(7);
   try {
     const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
     if (typeof res === "string") {
-      return null;
+      return { userId: null };
     }
     return {
-      accessUserId: res.id
+      userId: res.id
     };
   } catch {
   }
-  return null;
+  return { userId: null };
 };
 
 // src/file/utils.ts
@@ -144,8 +144,8 @@ var uploadFile = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getUserContext(options.refreshKey, options.signingKey, req);
-  if (!ctx?.accessUserId)
+  const ctx = getContext(options.refreshKey, options.signingKey, req);
+  if (!ctx?.userId || ctx.isRefreshID)
     return import_server3.NextResponse.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();
   const type = formData.get("type");
@@ -156,11 +156,11 @@ var getFileUploadPutRoute = (options, client) => async (req) => {
   const url = file ? getFileURL(options)(imageKey) : null;
   const handleKeyProcessing = async () => {
     if (file) await uploadFile(client, options.bucket)(file, imageKey);
-    if (!type || !ctx.accessUserId) return;
+    if (!type || !ctx.userId || ctx.isRefreshID) return;
     const { deleteURL, response } = await options.processFile({
       url,
       type,
-      userId: ctx.accessUserId,
+      userId: ctx.userId,
       data: typeof data === "string" ? JSON.parse(data) : void 0
     });
     if (deleteURL) await deleteImage(client, options)(deleteURL);

package/dist/file/index.esm.js

@@ -27,26 +27,26 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 import { NextResponse as NextResponse2 } from "next/server";
 
 // src/auth/email/utils.ts
-var getUserContext = (refreshKey, signingKey, req) => {
+var getContext = (refreshKey, signingKey, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
     const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { refreshUserID: userId };
-    return null;
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
   }
   const token = bearer.slice(7);
   try {
     const res = verify2(token, signingKey);
     if (typeof res === "string") {
-      return null;
+      return { userId: null };
     }
     return {
-      accessUserId: res.id
+      userId: res.id
     };
   } catch {
   }
-  return null;
+  return { userId: null };
 };
 
 // src/file/utils.ts
@@ -122,8 +122,8 @@ var uploadFile = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getUserContext(options.refreshKey, options.signingKey, req);
-  if (!ctx?.accessUserId)
+  const ctx = getContext(options.refreshKey, options.signingKey, req);
+  if (!ctx?.userId || ctx.isRefreshID)
     return NextResponse3.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();
   const type = formData.get("type");
@@ -134,11 +134,11 @@ var getFileUploadPutRoute = (options, client) => async (req) => {
   const url = file ? getFileURL(options)(imageKey) : null;
   const handleKeyProcessing = async () => {
     if (file) await uploadFile(client, options.bucket)(file, imageKey);
-    if (!type || !ctx.accessUserId) return;
+    if (!type || !ctx.userId || ctx.isRefreshID) return;
     const { deleteURL, response } = await options.processFile({
       url,
       type,
-      userId: ctx.accessUserId,
+      userId: ctx.userId,
       data: typeof data === "string" ? JSON.parse(data) : void 0
     });
     if (deleteURL) await deleteImage(client, options)(deleteURL);

package/dist/file/put.cjs.js

@@ -51,26 +51,26 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 var import_server2 = require("next/server");
 
 // src/auth/email/utils.ts
-var getUserContext = (refreshKey, signingKey, req) => {
+var getContext = (refreshKey, signingKey, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
     const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { refreshUserID: userId };
-    return null;
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
   }
   const token = bearer.slice(7);
   try {
     const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
     if (typeof res === "string") {
-      return null;
+      return { userId: null };
     }
     return {
-      accessUserId: res.id
+      userId: res.id
     };
   } catch {
   }
-  return null;
+  return { userId: null };
 };
 
 // src/file/utils.ts
@@ -119,8 +119,8 @@ var uploadFile = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getUserContext(options.refreshKey, options.signingKey, req);
-  if (!ctx?.accessUserId)
+  const ctx = getContext(options.refreshKey, options.signingKey, req);
+  if (!ctx?.userId || ctx.isRefreshID)
     return import_server3.NextResponse.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();
   const type = formData.get("type");
@@ -131,11 +131,11 @@ var getFileUploadPutRoute = (options, client) => async (req) => {
   const url = file ? getFileURL(options)(imageKey) : null;
   const handleKeyProcessing = async () => {
     if (file) await uploadFile(client, options.bucket)(file, imageKey);
-    if (!type || !ctx.accessUserId) return;
+    if (!type || !ctx.userId || ctx.isRefreshID) return;
     const { deleteURL, response } = await options.processFile({
       url,
       type,
-      userId: ctx.accessUserId,
+      userId: ctx.userId,
       data: typeof data === "string" ? JSON.parse(data) : void 0
     });
     if (deleteURL) await deleteImage(client, options)(deleteURL);

package/dist/file/put.esm.js

@@ -27,26 +27,26 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 import { NextResponse as NextResponse2 } from "next/server";
 
 // src/auth/email/utils.ts
-var getUserContext = (refreshKey, signingKey, req) => {
+var getContext = (refreshKey, signingKey, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
     const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { refreshUserID: userId };
-    return null;
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
   }
   const token = bearer.slice(7);
   try {
     const res = verify2(token, signingKey);
     if (typeof res === "string") {
-      return null;
+      return { userId: null };
     }
     return {
-      accessUserId: res.id
+      userId: res.id
     };
   } catch {
   }
-  return null;
+  return { userId: null };
 };
 
 // src/file/utils.ts
@@ -99,8 +99,8 @@ var uploadFile = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getUserContext(options.refreshKey, options.signingKey, req);
-  if (!ctx?.accessUserId)
+  const ctx = getContext(options.refreshKey, options.signingKey, req);
+  if (!ctx?.userId || ctx.isRefreshID)
     return NextResponse3.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();
   const type = formData.get("type");
@@ -111,11 +111,11 @@ var getFileUploadPutRoute = (options, client) => async (req) => {
   const url = file ? getFileURL(options)(imageKey) : null;
   const handleKeyProcessing = async () => {
     if (file) await uploadFile(client, options.bucket)(file, imageKey);
-    if (!type || !ctx.accessUserId) return;
+    if (!type || !ctx.userId || ctx.isRefreshID) return;
     const { deleteURL, response } = await options.processFile({
       url,
       type,
-      userId: ctx.accessUserId,
+      userId: ctx.userId,
       data: typeof data === "string" ? JSON.parse(data) : void 0
     });
     if (deleteURL) await deleteImage(client, options)(deleteURL);

package/dist/file/setup.cjs.js

@@ -53,26 +53,26 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 var import_server2 = require("next/server");
 
 // src/auth/email/utils.ts
-var getUserContext = (refreshKey, signingKey, req) => {
+var getContext = (refreshKey, signingKey, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
     const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { refreshUserID: userId };
-    return null;
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
   }
   const token = bearer.slice(7);
   try {
     const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
     if (typeof res === "string") {
-      return null;
+      return { userId: null };
     }
     return {
-      accessUserId: res.id
+      userId: res.id
     };
   } catch {
   }
-  return null;
+  return { userId: null };
 };
 
 // src/file/utils.ts
@@ -144,8 +144,8 @@ var uploadFile = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getUserContext(options.refreshKey, options.signingKey, req);
-  if (!ctx?.accessUserId)
+  const ctx = getContext(options.refreshKey, options.signingKey, req);
+  if (!ctx?.userId || ctx.isRefreshID)
     return import_server3.NextResponse.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();
   const type = formData.get("type");
@@ -156,11 +156,11 @@ var getFileUploadPutRoute = (options, client) => async (req) => {
   const url = file ? getFileURL(options)(imageKey) : null;
   const handleKeyProcessing = async () => {
     if (file) await uploadFile(client, options.bucket)(file, imageKey);
-    if (!type || !ctx.accessUserId) return;
+    if (!type || !ctx.userId || ctx.isRefreshID) return;
     const { deleteURL, response } = await options.processFile({
       url,
       type,
-      userId: ctx.accessUserId,
+      userId: ctx.userId,
       data: typeof data === "string" ? JSON.parse(data) : void 0
     });
     if (deleteURL) await deleteImage(client, options)(deleteURL);

package/dist/file/setup.esm.js

@@ -27,26 +27,26 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 import { NextResponse as NextResponse2 } from "next/server";
 
 // src/auth/email/utils.ts
-var getUserContext = (refreshKey, signingKey, req) => {
+var getContext = (refreshKey, signingKey, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
     const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { refreshUserID: userId };
-    return null;
+    if (userId) return { userId, isRefreshID: true };
+    return { userId: null };
   }
   const token = bearer.slice(7);
   try {
     const res = verify2(token, signingKey);
     if (typeof res === "string") {
-      return null;
+      return { userId: null };
     }
     return {
-      accessUserId: res.id
+      userId: res.id
     };
   } catch {
   }
-  return null;
+  return { userId: null };
 };
 
 // src/file/utils.ts
@@ -122,8 +122,8 @@ var uploadFile = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getUserContext(options.refreshKey, options.signingKey, req);
-  if (!ctx?.accessUserId)
+  const ctx = getContext(options.refreshKey, options.signingKey, req);
+  if (!ctx?.userId || ctx.isRefreshID)
     return NextResponse3.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();
   const type = formData.get("type");
@@ -134,11 +134,11 @@ var getFileUploadPutRoute = (options, client) => async (req) => {
   const url = file ? getFileURL(options)(imageKey) : null;
   const handleKeyProcessing = async () => {
     if (file) await uploadFile(client, options.bucket)(file, imageKey);
-    if (!type || !ctx.accessUserId) return;
+    if (!type || !ctx.userId || ctx.isRefreshID) return;
     const { deleteURL, response } = await options.processFile({
       url,
       type,
-      userId: ctx.accessUserId,
+      userId: ctx.userId,
       data: typeof data === "string" ? JSON.parse(data) : void 0
     });
     if (deleteURL) await deleteImage(client, options)(deleteURL);

package/dist/graphql/types.d.mts

@@ -1,8 +1,10 @@
 interface Context {
     userId: number | null;
+    isRefreshID?: boolean;
 }
 interface AuthorizedContext {
     userId: number;
+    isRefreshID?: boolean;
 }
 
 export type { AuthorizedContext, Context };

package/dist/graphql/types.d.ts

@@ -1,8 +1,10 @@
 interface Context {
     userId: number | null;
+    isRefreshID?: boolean;
 }
 interface AuthorizedContext {
     userId: number;
+    isRefreshID?: boolean;
 }
 
 export type { AuthorizedContext, Context };

package/package.json

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