naystack 1.2.21 → 1.2.23

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

@@ -128,17 +128,17 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
-var getContext = (refreshKey, signingKey, req) => {
+var getContext = (keys, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
+    const res = (0, import_jsonwebtoken2.verify)(token, keys.signing);
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -153,7 +153,7 @@ var getContext = (refreshKey, signingKey, req) => {
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
   if (options.onLogout) {
-    const ctx = await getContext(options.refreshKey, options.signingKey, req);
+    const ctx = await getContext(options.keys, req);
     await options.onLogout?.(ctx.userId, req);
   }
   return getTokenizedResponse(void 0, "");
@@ -162,13 +162,13 @@ var getDeleteRoute = (options) => async (req) => {
 // src/auth/email/routes/get.ts
 var getGetRoute = (options) => async (req) => {
   const refresh = req.cookies.get("refresh")?.value;
-  const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
+  const userID = getUserIdFromRefreshToken(options.keys.refresh, refresh);
   if (userID) {
     if (options.onRefresh) {
       await options.onRefresh?.(userID, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(userID, options.signingKey)
+      generateAccessToken(userID, options.keys.signing)
     );
   }
   return getTokenizedResponse();
@@ -183,8 +183,8 @@ var getPostRoute = (options) => async (req) => {
   if (existingUser) {
     if (await verifyUser(existingUser, data.password)) {
       return getTokenizedResponse(
-        generateAccessToken(existingUser.id, options.signingKey),
-        generateRefreshToken(existingUser.id, options.refreshKey)
+        generateAccessToken(existingUser.id, options.keys.signing),
+        generateRefreshToken(existingUser.id, options.keys.refresh)
       );
     }
     return handleError(400, "A user already exists", options.onError);
@@ -199,8 +199,8 @@ var getPostRoute = (options) => async (req) => {
       await options.onSignUp?.(newUser.id, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(newUser.id, options.signingKey),
-      generateRefreshToken(newUser.id, options.refreshKey)
+      generateAccessToken(newUser.id, options.keys.signing),
+      generateRefreshToken(newUser.id, options.keys.refresh)
     );
   }
   return getTokenizedResponse();
@@ -218,8 +218,8 @@ var getPutRoute = (options) => async (req) => {
       await options.onLogin?.(user.id, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(user.id, options.signingKey),
-      generateRefreshToken(user.id, options.refreshKey)
+      generateAccessToken(user.id, options.keys.signing),
+      generateRefreshToken(user.id, options.keys.refresh)
     );
   }
   return handleError(403, "Invalid password", options.onError);
@@ -232,7 +232,7 @@ function getEmailAuthRoutes(options) {
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
     DELETE: getDeleteRoute(options),
-    getContext: (req) => getContext(options.refreshKey, options.signingKey, req)
+    getContext: (req) => getContext(options.keys, req)
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -102,17 +102,17 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
-var getContext = (refreshKey, signingKey, req) => {
+var getContext = (keys, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = verify2(token, signingKey);
+    const res = verify2(token, keys.signing);
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -127,7 +127,7 @@ var getContext = (refreshKey, signingKey, req) => {
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
   if (options.onLogout) {
-    const ctx = await getContext(options.refreshKey, options.signingKey, req);
+    const ctx = await getContext(options.keys, req);
     await options.onLogout?.(ctx.userId, req);
   }
   return getTokenizedResponse(void 0, "");
@@ -136,13 +136,13 @@ var getDeleteRoute = (options) => async (req) => {
 // src/auth/email/routes/get.ts
 var getGetRoute = (options) => async (req) => {
   const refresh = req.cookies.get("refresh")?.value;
-  const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
+  const userID = getUserIdFromRefreshToken(options.keys.refresh, refresh);
   if (userID) {
     if (options.onRefresh) {
       await options.onRefresh?.(userID, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(userID, options.signingKey)
+      generateAccessToken(userID, options.keys.signing)
     );
   }
   return getTokenizedResponse();
@@ -157,8 +157,8 @@ var getPostRoute = (options) => async (req) => {
   if (existingUser) {
     if (await verifyUser(existingUser, data.password)) {
       return getTokenizedResponse(
-        generateAccessToken(existingUser.id, options.signingKey),
-        generateRefreshToken(existingUser.id, options.refreshKey)
+        generateAccessToken(existingUser.id, options.keys.signing),
+        generateRefreshToken(existingUser.id, options.keys.refresh)
       );
     }
     return handleError(400, "A user already exists", options.onError);
@@ -173,8 +173,8 @@ var getPostRoute = (options) => async (req) => {
       await options.onSignUp?.(newUser.id, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(newUser.id, options.signingKey),
-      generateRefreshToken(newUser.id, options.refreshKey)
+      generateAccessToken(newUser.id, options.keys.signing),
+      generateRefreshToken(newUser.id, options.keys.refresh)
     );
   }
   return getTokenizedResponse();
@@ -192,8 +192,8 @@ var getPutRoute = (options) => async (req) => {
       await options.onLogin?.(user.id, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(user.id, options.signingKey),
-      generateRefreshToken(user.id, options.refreshKey)
+      generateAccessToken(user.id, options.keys.signing),
+      generateRefreshToken(user.id, options.keys.refresh)
     );
   }
   return handleError(403, "Invalid password", options.onError);
@@ -206,7 +206,7 @@ function getEmailAuthRoutes(options) {
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
     DELETE: getDeleteRoute(options),
-    getContext: (req) => getContext(options.refreshKey, options.signingKey, req)
+    getContext: (req) => getContext(options.keys, req)
   };
 }
 export {

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

@@ -69,17 +69,17 @@ var import_jsonwebtoken2 = require("jsonwebtoken");
 var import_server2 = require("next/server");
 
 // src/auth/email/utils.ts
-var getContext = (refreshKey, signingKey, req) => {
+var getContext = (keys, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
+    const res = (0, import_jsonwebtoken2.verify)(token, keys.signing);
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -94,7 +94,7 @@ var getContext = (refreshKey, signingKey, req) => {
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
   if (options.onLogout) {
-    const ctx = await getContext(options.refreshKey, options.signingKey, req);
+    const ctx = await getContext(options.keys, req);
     await options.onLogout?.(ctx.userId, req);
   }
   return getTokenizedResponse(void 0, "");

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

@@ -43,17 +43,17 @@ import { verify as verify2 } from "jsonwebtoken";
 import { NextResponse as NextResponse2 } from "next/server";
 
 // src/auth/email/utils.ts
-var getContext = (refreshKey, signingKey, req) => {
+var getContext = (keys, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = verify2(token, signingKey);
+    const res = verify2(token, keys.signing);
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -68,7 +68,7 @@ var getContext = (refreshKey, signingKey, req) => {
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
   if (options.onLogout) {
-    const ctx = await getContext(options.refreshKey, options.signingKey, req);
+    const ctx = await getContext(options.keys, req);
     await options.onLogout?.(ctx.userId, req);
   }
   return getTokenizedResponse(void 0, "");

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

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

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

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

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

@@ -124,8 +124,8 @@ var getPostRoute = (options) => async (req) => {
   if (existingUser) {
     if (await verifyUser(existingUser, data.password)) {
       return getTokenizedResponse(
-        generateAccessToken(existingUser.id, options.signingKey),
-        generateRefreshToken(existingUser.id, options.refreshKey)
+        generateAccessToken(existingUser.id, options.keys.signing),
+        generateRefreshToken(existingUser.id, options.keys.refresh)
       );
     }
     return handleError(400, "A user already exists", options.onError);
@@ -140,8 +140,8 @@ var getPostRoute = (options) => async (req) => {
       await options.onSignUp?.(newUser.id, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(newUser.id, options.signingKey),
-      generateRefreshToken(newUser.id, options.refreshKey)
+      generateAccessToken(newUser.id, options.keys.signing),
+      generateRefreshToken(newUser.id, options.keys.refresh)
     );
   }
   return getTokenizedResponse();

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

@@ -100,8 +100,8 @@ var getPostRoute = (options) => async (req) => {
   if (existingUser) {
     if (await verifyUser(existingUser, data.password)) {
       return getTokenizedResponse(
-        generateAccessToken(existingUser.id, options.signingKey),
-        generateRefreshToken(existingUser.id, options.refreshKey)
+        generateAccessToken(existingUser.id, options.keys.signing),
+        generateRefreshToken(existingUser.id, options.keys.refresh)
       );
     }
     return handleError(400, "A user already exists", options.onError);
@@ -116,8 +116,8 @@ var getPostRoute = (options) => async (req) => {
       await options.onSignUp?.(newUser.id, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(newUser.id, options.signingKey),
-      generateRefreshToken(newUser.id, options.refreshKey)
+      generateAccessToken(newUser.id, options.keys.signing),
+      generateRefreshToken(newUser.id, options.keys.refresh)
     );
   }
   return getTokenizedResponse();

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

@@ -127,8 +127,8 @@ var getPutRoute = (options) => async (req) => {
       await options.onLogin?.(user.id, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(user.id, options.signingKey),
-      generateRefreshToken(user.id, options.refreshKey)
+      generateAccessToken(user.id, options.keys.signing),
+      generateRefreshToken(user.id, options.keys.refresh)
     );
   }
   return handleError(403, "Invalid password", options.onError);

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

@@ -101,8 +101,8 @@ var getPutRoute = (options) => async (req) => {
       await options.onLogin?.(user.id, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(user.id, options.signingKey),
-      generateRefreshToken(user.id, options.refreshKey)
+      generateAccessToken(user.id, options.keys.signing),
+      generateRefreshToken(user.id, options.keys.refresh)
     );
   }
   return handleError(403, "Invalid password", options.onError);

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

@@ -5,13 +5,16 @@ type InitRoutesOptions = {
     getUser: (email: string) => Promise<UserOutput | undefined>;
     createUser: (user: UserInput) => Promise<UserOutput | undefined>;
     onError?: ErrorHandler;
-    signingKey: string;
-    refreshKey: string;
+    keys: AuthKeys;
     turnstileKey?: string;
     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>;
 };
+interface AuthKeys {
+    signing: string;
+    refresh: string;
+}
 
-export type { InitRoutesOptions };
+export type { AuthKeys, InitRoutesOptions };

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

@@ -5,13 +5,16 @@ type InitRoutesOptions = {
     getUser: (email: string) => Promise<UserOutput | undefined>;
     createUser: (user: UserInput) => Promise<UserOutput | undefined>;
     onError?: ErrorHandler;
-    signingKey: string;
-    refreshKey: string;
+    keys: AuthKeys;
     turnstileKey?: string;
     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>;
 };
+interface AuthKeys {
+    signing: string;
+    refresh: string;
+}
 
-export type { InitRoutesOptions };
+export type { AuthKeys, InitRoutesOptions };

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

@@ -95,17 +95,17 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
-var getContext = (refreshKey, signingKey, req) => {
+var getContext = (keys, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
+    const res = (0, import_jsonwebtoken2.verify)(token, keys.signing);
     if (typeof res === "string") {
       return { userId: null };
     }

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

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

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

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

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

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

package/dist/auth/index.cjs.js

@@ -142,17 +142,17 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
-var getContext = (refreshKey, signingKey, req) => {
+var getContext = (keys, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
+    const res = (0, import_jsonwebtoken2.verify)(token, keys.signing);
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -167,7 +167,7 @@ var getContext = (refreshKey, signingKey, req) => {
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
   if (options.onLogout) {
-    const ctx = await getContext(options.refreshKey, options.signingKey, req);
+    const ctx = await getContext(options.keys, req);
     await options.onLogout?.(ctx.userId, req);
   }
   return getTokenizedResponse(void 0, "");
@@ -176,13 +176,13 @@ var getDeleteRoute = (options) => async (req) => {
 // src/auth/email/routes/get.ts
 var getGetRoute = (options) => async (req) => {
   const refresh = req.cookies.get("refresh")?.value;
-  const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
+  const userID = getUserIdFromRefreshToken(options.keys.refresh, refresh);
   if (userID) {
     if (options.onRefresh) {
       await options.onRefresh?.(userID, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(userID, options.signingKey)
+      generateAccessToken(userID, options.keys.signing)
     );
   }
   return getTokenizedResponse();
@@ -197,8 +197,8 @@ var getPostRoute = (options) => async (req) => {
   if (existingUser) {
     if (await verifyUser(existingUser, data.password)) {
       return getTokenizedResponse(
-        generateAccessToken(existingUser.id, options.signingKey),
-        generateRefreshToken(existingUser.id, options.refreshKey)
+        generateAccessToken(existingUser.id, options.keys.signing),
+        generateRefreshToken(existingUser.id, options.keys.refresh)
       );
     }
     return handleError(400, "A user already exists", options.onError);
@@ -213,8 +213,8 @@ var getPostRoute = (options) => async (req) => {
       await options.onSignUp?.(newUser.id, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(newUser.id, options.signingKey),
-      generateRefreshToken(newUser.id, options.refreshKey)
+      generateAccessToken(newUser.id, options.keys.signing),
+      generateRefreshToken(newUser.id, options.keys.refresh)
     );
   }
   return getTokenizedResponse();
@@ -232,8 +232,8 @@ var getPutRoute = (options) => async (req) => {
       await options.onLogin?.(user.id, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(user.id, options.signingKey),
-      generateRefreshToken(user.id, options.refreshKey)
+      generateAccessToken(user.id, options.keys.signing),
+      generateRefreshToken(user.id, options.keys.refresh)
     );
   }
   return handleError(403, "Invalid password", options.onError);
@@ -246,7 +246,7 @@ function getEmailAuthRoutes(options) {
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
     DELETE: getDeleteRoute(options),
-    getContext: (req) => getContext(options.refreshKey, options.signingKey, req)
+    getContext: (req) => getContext(options.keys, req)
   };
 }
 

package/dist/auth/index.esm.js

@@ -114,17 +114,17 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
-var getContext = (refreshKey, signingKey, req) => {
+var getContext = (keys, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = verify2(token, signingKey);
+    const res = verify2(token, keys.signing);
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -139,7 +139,7 @@ var getContext = (refreshKey, signingKey, req) => {
 // src/auth/email/routes/delete.ts
 var getDeleteRoute = (options) => async (req) => {
   if (options.onLogout) {
-    const ctx = await getContext(options.refreshKey, options.signingKey, req);
+    const ctx = await getContext(options.keys, req);
     await options.onLogout?.(ctx.userId, req);
   }
   return getTokenizedResponse(void 0, "");
@@ -148,13 +148,13 @@ var getDeleteRoute = (options) => async (req) => {
 // src/auth/email/routes/get.ts
 var getGetRoute = (options) => async (req) => {
   const refresh = req.cookies.get("refresh")?.value;
-  const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
+  const userID = getUserIdFromRefreshToken(options.keys.refresh, refresh);
   if (userID) {
     if (options.onRefresh) {
       await options.onRefresh?.(userID, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(userID, options.signingKey)
+      generateAccessToken(userID, options.keys.signing)
     );
   }
   return getTokenizedResponse();
@@ -169,8 +169,8 @@ var getPostRoute = (options) => async (req) => {
   if (existingUser) {
     if (await verifyUser(existingUser, data.password)) {
       return getTokenizedResponse(
-        generateAccessToken(existingUser.id, options.signingKey),
-        generateRefreshToken(existingUser.id, options.refreshKey)
+        generateAccessToken(existingUser.id, options.keys.signing),
+        generateRefreshToken(existingUser.id, options.keys.refresh)
       );
     }
     return handleError(400, "A user already exists", options.onError);
@@ -185,8 +185,8 @@ var getPostRoute = (options) => async (req) => {
       await options.onSignUp?.(newUser.id, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(newUser.id, options.signingKey),
-      generateRefreshToken(newUser.id, options.refreshKey)
+      generateAccessToken(newUser.id, options.keys.signing),
+      generateRefreshToken(newUser.id, options.keys.refresh)
     );
   }
   return getTokenizedResponse();
@@ -204,8 +204,8 @@ var getPutRoute = (options) => async (req) => {
       await options.onLogin?.(user.id, req);
     }
     return getTokenizedResponse(
-      generateAccessToken(user.id, options.signingKey),
-      generateRefreshToken(user.id, options.refreshKey)
+      generateAccessToken(user.id, options.keys.signing),
+      generateRefreshToken(user.id, options.keys.refresh)
     );
   }
   return handleError(403, "Invalid password", options.onError);
@@ -218,7 +218,7 @@ function getEmailAuthRoutes(options) {
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
     DELETE: getDeleteRoute(options),
-    getContext: (req) => getContext(options.refreshKey, options.signingKey, req)
+    getContext: (req) => getContext(options.keys, req)
   };
 }
 

package/dist/file/index.cjs.js

@@ -52,17 +52,17 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 var import_server2 = require("next/server");
 
 // src/auth/email/utils.ts
-var getContext = (refreshKey, signingKey, req) => {
+var getContext = (keys, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
+    const res = (0, import_jsonwebtoken2.verify)(token, keys.signing);
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -145,7 +145,7 @@ var uploadBlob = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getContext(options.refreshKey, options.signingKey, req);
+  const ctx = getContext(options.keys, req);
   if (!ctx?.userId || ctx.isRefreshID)
     return import_server3.NextResponse.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();

package/dist/file/index.d.mts

@@ -1,2 +1,4 @@
 export { setupFileUpload } from './setup.mjs';
 import 'next/server';
+import '../auth/email/types.mjs';
+import '../auth/types.mjs';

package/dist/file/index.d.ts

@@ -1,2 +1,4 @@
 export { setupFileUpload } from './setup.js';
 import 'next/server';
+import '../auth/email/types.js';
+import '../auth/types.js';

package/dist/file/index.esm.js

@@ -26,17 +26,17 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 import { NextResponse as NextResponse2 } from "next/server";
 
 // src/auth/email/utils.ts
-var getContext = (refreshKey, signingKey, req) => {
+var getContext = (keys, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = verify2(token, signingKey);
+    const res = verify2(token, keys.signing);
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -123,7 +123,7 @@ var uploadBlob = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getContext(options.refreshKey, options.signingKey, req);
+  const ctx = getContext(options.keys, req);
   if (!ctx?.userId || ctx.isRefreshID)
     return NextResponse3.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();

package/dist/file/put.cjs.js

@@ -50,17 +50,17 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 var import_server2 = require("next/server");
 
 // src/auth/email/utils.ts
-var getContext = (refreshKey, signingKey, req) => {
+var getContext = (keys, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
+    const res = (0, import_jsonwebtoken2.verify)(token, keys.signing);
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -98,7 +98,7 @@ var uploadBlob = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getContext(options.refreshKey, options.signingKey, req);
+  const ctx = getContext(options.keys, req);
   if (!ctx?.userId || ctx.isRefreshID)
     return import_server3.NextResponse.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();

package/dist/file/put.d.mts

@@ -1,6 +1,8 @@
 import { S3Client } from '@aws-sdk/client-s3';
 import { NextRequest, NextResponse } from 'next/server';
 import { SetupFileUploadOptions } from './setup.mjs';
+import '../auth/email/types.mjs';
+import '../auth/types.mjs';
 
 declare const getFileUploadPutRoute: (options: SetupFileUploadOptions, client: S3Client) => (req: NextRequest) => Promise<NextResponse<{
     error: string;

package/dist/file/put.d.ts

@@ -1,6 +1,8 @@
 import { S3Client } from '@aws-sdk/client-s3';
 import { NextRequest, NextResponse } from 'next/server';
 import { SetupFileUploadOptions } from './setup.js';
+import '../auth/email/types.js';
+import '../auth/types.js';
 
 declare const getFileUploadPutRoute: (options: SetupFileUploadOptions, client: S3Client) => (req: NextRequest) => Promise<NextResponse<{
     error: string;

package/dist/file/put.esm.js

@@ -26,17 +26,17 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 import { NextResponse as NextResponse2 } from "next/server";
 
 // src/auth/email/utils.ts
-var getContext = (refreshKey, signingKey, req) => {
+var getContext = (keys, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = verify2(token, signingKey);
+    const res = verify2(token, keys.signing);
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -78,7 +78,7 @@ var uploadBlob = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getContext(options.refreshKey, options.signingKey, req);
+  const ctx = getContext(options.keys, req);
   if (!ctx?.userId || ctx.isRefreshID)
     return NextResponse3.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();

package/dist/file/setup.cjs.js

@@ -52,17 +52,17 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 var import_server2 = require("next/server");
 
 // src/auth/email/utils.ts
-var getContext = (refreshKey, signingKey, req) => {
+var getContext = (keys, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
+    const res = (0, import_jsonwebtoken2.verify)(token, keys.signing);
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -145,7 +145,7 @@ var uploadBlob = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getContext(options.refreshKey, options.signingKey, req);
+  const ctx = getContext(options.keys, req);
   if (!ctx?.userId || ctx.isRefreshID)
     return import_server3.NextResponse.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();

package/dist/file/setup.d.mts

@@ -1,8 +1,9 @@
 import * as next_server from 'next/server';
+import { AuthKeys } from '../auth/email/types.mjs';
+import '../auth/types.mjs';
 
 interface SetupFileUploadOptions {
-    refreshKey: string;
-    signingKey: string;
+    keys: AuthKeys;
     region: string;
     bucket: string;
     awsSecret: string;

package/dist/file/setup.d.ts

@@ -1,8 +1,9 @@
 import * as next_server from 'next/server';
+import { AuthKeys } from '../auth/email/types.js';
+import '../auth/types.js';
 
 interface SetupFileUploadOptions {
-    refreshKey: string;
-    signingKey: string;
+    keys: AuthKeys;
     region: string;
     bucket: string;
     awsSecret: string;

package/dist/file/setup.esm.js

@@ -26,17 +26,17 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
 import { NextResponse as NextResponse2 } from "next/server";
 
 // src/auth/email/utils.ts
-var getContext = (refreshKey, signingKey, req) => {
+var getContext = (keys, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
+    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = verify2(token, signingKey);
+    const res = verify2(token, keys.signing);
     if (typeof res === "string") {
       return { userId: null };
     }
@@ -123,7 +123,7 @@ var uploadBlob = (client, Bucket) => async (file, key) => {
 
 // src/file/put.ts
 var getFileUploadPutRoute = (options, client) => async (req) => {
-  const ctx = getContext(options.refreshKey, options.signingKey, req);
+  const ctx = getContext(options.keys, req);
   if (!ctx?.userId || ctx.isRefreshID)
     return NextResponse3.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();

package/dist/file/utils.d.mts

@@ -2,6 +2,8 @@ import * as _aws_sdk_client_s3 from '@aws-sdk/client-s3';
 import { S3Client } from '@aws-sdk/client-s3';
 import { SetupFileUploadOptions } from './setup.mjs';
 import 'next/server';
+import '../auth/email/types.mjs';
+import '../auth/types.mjs';
 
 declare const getS3Client: (options: SetupFileUploadOptions) => S3Client;
 declare const getUploadURL: (client: S3Client, Bucket: string) => (keys: string | string[]) => Promise<string>;

package/dist/file/utils.d.ts

@@ -2,6 +2,8 @@ import * as _aws_sdk_client_s3 from '@aws-sdk/client-s3';
 import { S3Client } from '@aws-sdk/client-s3';
 import { SetupFileUploadOptions } from './setup.js';
 import 'next/server';
+import '../auth/email/types.js';
+import '../auth/types.js';
 
 declare const getS3Client: (options: SetupFileUploadOptions) => S3Client;
 declare const getUploadURL: (client: S3Client, Bucket: string) => (keys: string | string[]) => Promise<string>;

package/dist/graphql/client.cjs.js

@@ -41,12 +41,10 @@ var import_client = require("@apollo/client");
 var import_client_integration_nextjs = require("@apollo/client-integration-nextjs");
 var import_client2 = require("naystack/auth/email/client");
 var import_react = __toESM(require("react"));
-var getApolloWrapper = (endpoint, {
-  cacheConfig
-}) => {
+var getApolloWrapper = (endpoint, options) => {
   function makeClient() {
     return new import_client_integration_nextjs.ApolloClient({
-      cache: new import_client_integration_nextjs.InMemoryCache(cacheConfig),
+      cache: new import_client_integration_nextjs.InMemoryCache(options?.cacheConfig),
       link: new import_client.HttpLink({
         uri: endpoint
       })

package/dist/graphql/client.d.mts

@@ -3,7 +3,7 @@ import { InMemoryCacheConfig, OperationVariables, MutationHookOptions } from '@a
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 import react__default, { PropsWithChildren } from 'react';
 
-declare const getApolloWrapper: (endpoint: string, { cacheConfig, }: {
+declare const getApolloWrapper: (endpoint: string, options?: {
     cacheConfig?: InMemoryCacheConfig;
 }) => ({ children }: PropsWithChildren) => react__default.JSX.Element;
 declare const tokenContext: (token?: string | null) => {

package/dist/graphql/client.d.ts

@@ -3,7 +3,7 @@ import { InMemoryCacheConfig, OperationVariables, MutationHookOptions } from '@a
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 import react__default, { PropsWithChildren } from 'react';
 
-declare const getApolloWrapper: (endpoint: string, { cacheConfig, }: {
+declare const getApolloWrapper: (endpoint: string, options?: {
     cacheConfig?: InMemoryCacheConfig;
 }) => ({ children }: PropsWithChildren) => react__default.JSX.Element;
 declare const tokenContext: (token?: string | null) => {

package/dist/graphql/client.esm.js

@@ -17,12 +17,10 @@ import React, {
   useEffect,
   useState
 } from "react";
-var getApolloWrapper = (endpoint, {
-  cacheConfig
-}) => {
+var getApolloWrapper = (endpoint, options) => {
   function makeClient() {
     return new ApolloClient({
-      cache: new InMemoryCache(cacheConfig),
+      cache: new InMemoryCache(options?.cacheConfig),
       link: new HttpLink({
         uri: endpoint
       })

package/package.json

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