naystack 1.1.12-beta.2 → 1.1.12-beta.4

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

@@ -24,6 +24,9 @@ __export(email_exports, {
 });
 module.exports = __toCommonJS(email_exports);
 
+// src/auth/email/utils.ts
+var import_jsonwebtoken2 = require("jsonwebtoken");
+
 // src/auth/email/token.ts
 var import_bcryptjs = require("bcryptjs");
 var import_jsonwebtoken = require("jsonwebtoken");
@@ -74,23 +77,6 @@ function verifyUser(user, password) {
   return (0, import_bcryptjs.compare)(password, user.password);
 }
 
-// src/auth/email/routes/delete.ts
-var getDeleteRoute = () => () => getTokenizedResponse(void 0, "");
-
-// src/auth/email/routes/get.ts
-var getGetRoute = (options) => (req) => {
-  const refresh = req.cookies.get("refresh")?.value;
-  const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
-  if (userID)
-    return getTokenizedResponse(
-      generateAccessToken(userID, options.signingKey)
-    );
-  return getTokenizedResponse();
-};
-
-// src/auth/email/routes/post.ts
-var import_bcryptjs2 = require("bcryptjs");
-
 // src/auth/utils/errors.ts
 var import_server2 = require("next/server");
 function handleError(status, message, onError) {
@@ -142,8 +128,44 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
+var getUserContext = (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;
+  }
+  const token = bearer.slice(7);
+  try {
+    const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
+    if (typeof res === "string") {
+      return null;
+    }
+    return {
+      accessUserId: res.id
+    };
+  } catch {
+  }
+  return null;
+};
+
+// src/auth/email/routes/delete.ts
+var getDeleteRoute = () => () => getTokenizedResponse(void 0, "");
+
+// src/auth/email/routes/get.ts
+var getGetRoute = (options) => (req) => {
+  const refresh = req.cookies.get("refresh")?.value;
+  const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
+  if (userID)
+    return getTokenizedResponse(
+      generateAccessToken(userID, options.signingKey)
+    );
+  return getTokenizedResponse();
+};
 
 // src/auth/email/routes/post.ts
+var import_bcryptjs2 = require("bcryptjs");
 var getPostRoute = (options) => async (req) => {
   const { data, error } = await massageRequest(req, options);
   if (error || !data) return error;
@@ -194,7 +216,8 @@ function getEmailAuthRoutes(options) {
     GET: getGetRoute(options),
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
-    DELETE: getDeleteRoute()
+    DELETE: getDeleteRoute(),
+    getUserIdFromRequest: (req) => getUserContext(options.refreshKey, options.signingKey, req)
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -1,18 +1,23 @@
 import * as next_server from 'next/server';
+import { NextRequest } from 'next/server';
 import { InitRoutesOptions } from './types.mjs';
 import '../types.mjs';
 
 declare function getEmailAuthRoutes(options: InitRoutesOptions): {
-    GET: (req: next_server.NextRequest) => next_server.NextResponse<{
+    GET: (req: NextRequest) => next_server.NextResponse<{
         accessToken: string | undefined;
         refreshToken: string | undefined;
     }>;
-    POST: (req: next_server.NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
-    PUT: (req: next_server.NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
+    POST: (req: NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
+    PUT: (req: NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
     DELETE: () => next_server.NextResponse<{
         accessToken: string | undefined;
         refreshToken: string | undefined;
     }>;
+    getUserIdFromRequest: (req: NextRequest) => {
+        refreshUserID?: number;
+        accessUserId?: number;
+    } | null;
 };
 
 export { getEmailAuthRoutes };

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

@@ -1,18 +1,23 @@
 import * as next_server from 'next/server';
+import { NextRequest } from 'next/server';
 import { InitRoutesOptions } from './types.js';
 import '../types.js';
 
 declare function getEmailAuthRoutes(options: InitRoutesOptions): {
-    GET: (req: next_server.NextRequest) => next_server.NextResponse<{
+    GET: (req: NextRequest) => next_server.NextResponse<{
         accessToken: string | undefined;
         refreshToken: string | undefined;
     }>;
-    POST: (req: next_server.NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
-    PUT: (req: next_server.NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
+    POST: (req: NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
+    PUT: (req: NextRequest) => Promise<next_server.NextResponse<unknown> | undefined>;
     DELETE: () => next_server.NextResponse<{
         accessToken: string | undefined;
         refreshToken: string | undefined;
     }>;
+    getUserIdFromRequest: (req: NextRequest) => {
+        refreshUserID?: number;
+        accessUserId?: number;
+    } | null;
 };
 
 export { getEmailAuthRoutes };

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

@@ -1,3 +1,6 @@
+// src/auth/email/utils.ts
+import { verify as verify2 } from "jsonwebtoken";
+
 // src/auth/email/token.ts
 import { compare } from "bcryptjs";
 import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
@@ -48,23 +51,6 @@ function verifyUser(user, password) {
   return compare(password, user.password);
 }
 
-// src/auth/email/routes/delete.ts
-var getDeleteRoute = () => () => getTokenizedResponse(void 0, "");
-
-// src/auth/email/routes/get.ts
-var getGetRoute = (options) => (req) => {
-  const refresh = req.cookies.get("refresh")?.value;
-  const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
-  if (userID)
-    return getTokenizedResponse(
-      generateAccessToken(userID, options.signingKey)
-    );
-  return getTokenizedResponse();
-};
-
-// src/auth/email/routes/post.ts
-import { hash } from "bcryptjs";
-
 // src/auth/utils/errors.ts
 import { NextResponse as NextResponse2 } from "next/server";
 function handleError(status, message, onError) {
@@ -116,8 +102,44 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
+var getUserContext = (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;
+  }
+  const token = bearer.slice(7);
+  try {
+    const res = verify2(token, signingKey);
+    if (typeof res === "string") {
+      return null;
+    }
+    return {
+      accessUserId: res.id
+    };
+  } catch {
+  }
+  return null;
+};
+
+// src/auth/email/routes/delete.ts
+var getDeleteRoute = () => () => getTokenizedResponse(void 0, "");
+
+// src/auth/email/routes/get.ts
+var getGetRoute = (options) => (req) => {
+  const refresh = req.cookies.get("refresh")?.value;
+  const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
+  if (userID)
+    return getTokenizedResponse(
+      generateAccessToken(userID, options.signingKey)
+    );
+  return getTokenizedResponse();
+};
 
 // src/auth/email/routes/post.ts
+import { hash } from "bcryptjs";
 var getPostRoute = (options) => async (req) => {
   const { data, error } = await massageRequest(req, options);
   if (error || !data) return error;
@@ -168,7 +190,8 @@ function getEmailAuthRoutes(options) {
     GET: getGetRoute(options),
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
-    DELETE: getDeleteRoute()
+    DELETE: getDeleteRoute(),
+    getUserIdFromRequest: (req) => getUserContext(options.refreshKey, options.signingKey, req)
   };
 }
 export {

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

@@ -72,6 +72,7 @@ function verifyUser(user, password) {
 }
 
 // src/auth/email/utils.ts
+var import_jsonwebtoken2 = require("jsonwebtoken");
 async function massageRequest(req, options) {
   const data = await req.json();
   if (!data.email || !data.password)

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

@@ -48,6 +48,7 @@ function verifyUser(user, password) {
 }
 
 // src/auth/email/utils.ts
+import { verify as verify2 } from "jsonwebtoken";
 async function massageRequest(req, options) {
   const data = await req.json();
   if (!data.email || !data.password)

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

@@ -71,6 +71,7 @@ function verifyUser(user, password) {
 }
 
 // src/auth/email/utils.ts
+var import_jsonwebtoken2 = require("jsonwebtoken");
 async function massageRequest(req, options) {
   const data = await req.json();
   if (!data.email || !data.password)

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

@@ -45,6 +45,7 @@ function verifyUser(user, password) {
 }
 
 // src/auth/email/utils.ts
+import { verify as verify2 } from "jsonwebtoken";
 async function massageRequest(req, options) {
   const data = await req.json();
   if (!data.email || !data.password)

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

@@ -20,17 +20,36 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/auth/email/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
+  getUserContext: () => getUserContext,
   massageRequest: () => massageRequest,
   verifyCaptcha: () => verifyCaptcha
 });
 module.exports = __toCommonJS(utils_exports);
+var import_jsonwebtoken2 = require("jsonwebtoken");
 
-// src/auth/utils/errors.ts
+// src/auth/email/token.ts
+var import_bcryptjs = require("bcryptjs");
+var import_jsonwebtoken = require("jsonwebtoken");
 var import_server = require("next/server");
+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/utils/errors.ts
+var import_server2 = require("next/server");
 function handleError(status, message, onError) {
   const res = onError?.({ status, message });
   if (res) return res;
-  return new import_server.NextResponse(message, { status });
+  return new import_server2.NextResponse(message, { status });
 }
 
 // src/auth/email/utils.ts
@@ -76,8 +95,30 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
+var getUserContext = (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;
+  }
+  const token = bearer.slice(7);
+  try {
+    const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
+    if (typeof res === "string") {
+      return null;
+    }
+    return {
+      accessUserId: res.id
+    };
+  } catch {
+  }
+  return null;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getUserContext,
   massageRequest,
   verifyCaptcha
 });

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

@@ -12,5 +12,9 @@ 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;
 
-export { massageRequest, verifyCaptcha };
+export { getUserContext, massageRequest, verifyCaptcha };

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

@@ -12,5 +12,9 @@ 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;
 
-export { massageRequest, verifyCaptcha };
+export { getUserContext, massageRequest, verifyCaptcha };

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

@@ -1,9 +1,29 @@
-// src/auth/utils/errors.ts
+// src/auth/email/utils.ts
+import { verify as verify2 } from "jsonwebtoken";
+
+// src/auth/email/token.ts
+import { compare } from "bcryptjs";
+import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
 import { NextResponse } from "next/server";
+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/utils/errors.ts
+import { NextResponse as NextResponse2 } from "next/server";
 function handleError(status, message, onError) {
   const res = onError?.({ status, message });
   if (res) return res;
-  return new NextResponse(message, { status });
+  return new NextResponse2(message, { status });
 }
 
 // src/auth/email/utils.ts
@@ -49,7 +69,29 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
+var getUserContext = (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;
+  }
+  const token = bearer.slice(7);
+  try {
+    const res = verify2(token, signingKey);
+    if (typeof res === "string") {
+      return null;
+    }
+    return {
+      accessUserId: res.id
+    };
+  } catch {
+  }
+  return null;
+};
 export {
+  getUserContext,
   massageRequest,
   verifyCaptcha
 };

package/dist/auth/index.cjs.js

@@ -24,6 +24,9 @@ __export(auth_exports, {
 });
 module.exports = __toCommonJS(auth_exports);
 
+// src/auth/email/utils.ts
+var import_jsonwebtoken2 = require("jsonwebtoken");
+
 // src/auth/email/token.ts
 var import_bcryptjs = require("bcryptjs");
 var import_jsonwebtoken = require("jsonwebtoken");
@@ -74,23 +77,6 @@ function verifyUser(user, password) {
   return (0, import_bcryptjs.compare)(password, user.password);
 }
 
-// src/auth/email/routes/delete.ts
-var getDeleteRoute = () => () => getTokenizedResponse(void 0, "");
-
-// src/auth/email/routes/get.ts
-var getGetRoute = (options) => (req) => {
-  const refresh = req.cookies.get("refresh")?.value;
-  const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
-  if (userID)
-    return getTokenizedResponse(
-      generateAccessToken(userID, options.signingKey)
-    );
-  return getTokenizedResponse();
-};
-
-// src/auth/email/routes/post.ts
-var import_bcryptjs2 = require("bcryptjs");
-
 // src/auth/utils/errors.ts
 var import_server2 = require("next/server");
 function handleError(status, message, onError) {
@@ -142,8 +128,44 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
+var getUserContext = (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;
+  }
+  const token = bearer.slice(7);
+  try {
+    const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
+    if (typeof res === "string") {
+      return null;
+    }
+    return {
+      accessUserId: res.id
+    };
+  } catch {
+  }
+  return null;
+};
+
+// src/auth/email/routes/delete.ts
+var getDeleteRoute = () => () => getTokenizedResponse(void 0, "");
+
+// src/auth/email/routes/get.ts
+var getGetRoute = (options) => (req) => {
+  const refresh = req.cookies.get("refresh")?.value;
+  const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
+  if (userID)
+    return getTokenizedResponse(
+      generateAccessToken(userID, options.signingKey)
+    );
+  return getTokenizedResponse();
+};
 
 // src/auth/email/routes/post.ts
+var import_bcryptjs2 = require("bcryptjs");
 var getPostRoute = (options) => async (req) => {
   const { data, error } = await massageRequest(req, options);
   if (error || !data) return error;
@@ -194,7 +216,8 @@ function getEmailAuthRoutes(options) {
     GET: getGetRoute(options),
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
-    DELETE: getDeleteRoute()
+    DELETE: getDeleteRoute(),
+    getUserIdFromRequest: (req) => getUserContext(options.refreshKey, options.signingKey, req)
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/auth/index.esm.js

@@ -1,3 +1,6 @@
+// src/auth/email/utils.ts
+import { verify as verify2 } from "jsonwebtoken";
+
 // src/auth/email/token.ts
 import { compare } from "bcryptjs";
 import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
@@ -48,23 +51,6 @@ function verifyUser(user, password) {
   return compare(password, user.password);
 }
 
-// src/auth/email/routes/delete.ts
-var getDeleteRoute = () => () => getTokenizedResponse(void 0, "");
-
-// src/auth/email/routes/get.ts
-var getGetRoute = (options) => (req) => {
-  const refresh = req.cookies.get("refresh")?.value;
-  const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
-  if (userID)
-    return getTokenizedResponse(
-      generateAccessToken(userID, options.signingKey)
-    );
-  return getTokenizedResponse();
-};
-
-// src/auth/email/routes/post.ts
-import { hash } from "bcryptjs";
-
 // src/auth/utils/errors.ts
 import { NextResponse as NextResponse2 } from "next/server";
 function handleError(status, message, onError) {
@@ -116,8 +102,44 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
+var getUserContext = (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;
+  }
+  const token = bearer.slice(7);
+  try {
+    const res = verify2(token, signingKey);
+    if (typeof res === "string") {
+      return null;
+    }
+    return {
+      accessUserId: res.id
+    };
+  } catch {
+  }
+  return null;
+};
+
+// src/auth/email/routes/delete.ts
+var getDeleteRoute = () => () => getTokenizedResponse(void 0, "");
+
+// src/auth/email/routes/get.ts
+var getGetRoute = (options) => (req) => {
+  const refresh = req.cookies.get("refresh")?.value;
+  const userID = getUserIdFromRefreshToken(options.refreshKey, refresh);
+  if (userID)
+    return getTokenizedResponse(
+      generateAccessToken(userID, options.signingKey)
+    );
+  return getTokenizedResponse();
+};
 
 // src/auth/email/routes/post.ts
+import { hash } from "bcryptjs";
 var getPostRoute = (options) => async (req) => {
   const { data, error } = await massageRequest(req, options);
   if (error || !data) return error;
@@ -168,7 +190,8 @@ function getEmailAuthRoutes(options) {
     GET: getGetRoute(options),
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
-    DELETE: getDeleteRoute()
+    DELETE: getDeleteRoute(),
+    getUserIdFromRequest: (req) => getUserContext(options.refreshKey, options.signingKey, req)
   };
 }
 export {

package/dist/graphql/index.cjs.js

@@ -26,74 +26,24 @@ module.exports = __toCommonJS(graphql_exports);
 
 // src/graphql/init.ts
 var import_reflect_metadata = require("reflect-metadata");
-var import_server3 = require("@apollo/server");
+var import_server = require("@apollo/server");
 var import_default = require("@apollo/server/plugin/landingPage/default");
 var import_next = require("@as-integrations/next");
 var import_type_graphql = require("type-graphql");
-
-// src/graphql/context.ts
-var import_jsonwebtoken2 = require("jsonwebtoken");
-
-// src/auth/email/token.ts
-var import_bcryptjs = require("bcryptjs");
-var import_jsonwebtoken = require("jsonwebtoken");
-var import_server = require("next/server");
-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/utils/errors.ts
-var import_server2 = require("next/server");
-function handleError(status, message, onError) {
-  const res = onError?.({ status, message });
-  if (res) return res;
-  return new import_server2.NextResponse(message, { status });
-}
-
-// src/graphql/context.ts
-var getContext = (refreshKey, signingKey) => async (req) => {
-  const bearer = req.headers.get("authorization");
-  const isMobile = req.headers.get("x-platform-is-mobile");
-  if (!bearer) {
-    if (isMobile) return { userId: null };
-    const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { userId, onlyQuery: true };
-    return { userId: null };
-  }
-  const token = bearer.slice(7);
-  try {
-    const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
-    return { userId: typeof res !== "string" ? res.id : null };
-  } catch {
-    if (isMobile) return handleError(401, "Refresh token is invalid.");
-  }
-  return { userId: null };
-};
-
-// src/graphql/init.ts
 async function initGraphQLServer({
   authChecker,
   resolvers,
   plugins,
   refreshKey,
-  signingKey
+  signingKey,
+  context
 }) {
   const { typeDefs, resolvers: builtResolvers } = await (0, import_type_graphql.buildTypeDefsAndResolvers)({
     validate: true,
     authChecker,
     resolvers
   });
-  const server = new import_server3.ApolloServer({
+  const server = new import_server.ApolloServer({
     typeDefs,
     resolvers: builtResolvers,
     plugins: [
@@ -112,7 +62,6 @@ async function initGraphQLServer({
     introspection: process.env.NODE_ENV !== "production",
     status400ForVariableCoercionErrors: true
   });
-  const context = getContext(refreshKey, signingKey);
   const handler = (0, import_next.startServerAndCreateNextHandler)(server, {
     context
   });

package/dist/graphql/index.d.mts

@@ -1,7 +1,6 @@
 export { initGraphQLServer } from './init.mjs';
 export { AuthorizedContext, Context } from './types.mjs';
 export { FieldLibrary, QueryLibrary, field, query } from './utils.mjs';
-import 'vm';
 import '@apollo/server';
 import 'next/server';
 import 'type-graphql';

package/dist/graphql/index.d.ts

@@ -1,7 +1,6 @@
 export { initGraphQLServer } from './init.js';
 export { AuthorizedContext, Context } from './types.js';
 export { FieldLibrary, QueryLibrary, field, query } from './utils.js';
-import 'vm';
 import '@apollo/server';
 import 'next/server';
 import 'type-graphql';

package/dist/graphql/index.esm.js

@@ -9,63 +9,13 @@ import { startServerAndCreateNextHandler } from "@as-integrations/next";
 import {
   buildTypeDefsAndResolvers
 } from "type-graphql";
-
-// src/graphql/context.ts
-import { verify as verify2 } from "jsonwebtoken";
-
-// src/auth/email/token.ts
-import { compare } from "bcryptjs";
-import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
-import { NextResponse } from "next/server";
-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/utils/errors.ts
-import { NextResponse as NextResponse2 } from "next/server";
-function handleError(status, message, onError) {
-  const res = onError?.({ status, message });
-  if (res) return res;
-  return new NextResponse2(message, { status });
-}
-
-// src/graphql/context.ts
-var getContext = (refreshKey, signingKey) => async (req) => {
-  const bearer = req.headers.get("authorization");
-  const isMobile = req.headers.get("x-platform-is-mobile");
-  if (!bearer) {
-    if (isMobile) return { userId: null };
-    const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { userId, onlyQuery: true };
-    return { userId: null };
-  }
-  const token = bearer.slice(7);
-  try {
-    const res = verify2(token, signingKey);
-    return { userId: typeof res !== "string" ? res.id : null };
-  } catch {
-    if (isMobile) return handleError(401, "Refresh token is invalid.");
-  }
-  return { userId: null };
-};
-
-// src/graphql/init.ts
 async function initGraphQLServer({
   authChecker,
   resolvers,
   plugins,
   refreshKey,
-  signingKey
+  signingKey,
+  context
 }) {
   const { typeDefs, resolvers: builtResolvers } = await buildTypeDefsAndResolvers({
     validate: true,
@@ -91,7 +41,6 @@ async function initGraphQLServer({
     introspection: process.env.NODE_ENV !== "production",
     status400ForVariableCoercionErrors: true
   });
-  const context = getContext(refreshKey, signingKey);
   const handler = startServerAndCreateNextHandler(server, {
     context
   });

package/dist/graphql/init.cjs.js

@@ -24,74 +24,24 @@ __export(init_exports, {
 });
 module.exports = __toCommonJS(init_exports);
 var import_reflect_metadata = require("reflect-metadata");
-var import_server3 = require("@apollo/server");
+var import_server = require("@apollo/server");
 var import_default = require("@apollo/server/plugin/landingPage/default");
 var import_next = require("@as-integrations/next");
 var import_type_graphql = require("type-graphql");
-
-// src/graphql/context.ts
-var import_jsonwebtoken2 = require("jsonwebtoken");
-
-// src/auth/email/token.ts
-var import_bcryptjs = require("bcryptjs");
-var import_jsonwebtoken = require("jsonwebtoken");
-var import_server = require("next/server");
-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/utils/errors.ts
-var import_server2 = require("next/server");
-function handleError(status, message, onError) {
-  const res = onError?.({ status, message });
-  if (res) return res;
-  return new import_server2.NextResponse(message, { status });
-}
-
-// src/graphql/context.ts
-var getContext = (refreshKey, signingKey) => async (req) => {
-  const bearer = req.headers.get("authorization");
-  const isMobile = req.headers.get("x-platform-is-mobile");
-  if (!bearer) {
-    if (isMobile) return { userId: null };
-    const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { userId, onlyQuery: true };
-    return { userId: null };
-  }
-  const token = bearer.slice(7);
-  try {
-    const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
-    return { userId: typeof res !== "string" ? res.id : null };
-  } catch {
-    if (isMobile) return handleError(401, "Refresh token is invalid.");
-  }
-  return { userId: null };
-};
-
-// src/graphql/init.ts
 async function initGraphQLServer({
   authChecker,
   resolvers,
   plugins,
   refreshKey,
-  signingKey
+  signingKey,
+  context
 }) {
   const { typeDefs, resolvers: builtResolvers } = await (0, import_type_graphql.buildTypeDefsAndResolvers)({
     validate: true,
     authChecker,
     resolvers
   });
-  const server = new import_server3.ApolloServer({
+  const server = new import_server.ApolloServer({
     typeDefs,
     resolvers: builtResolvers,
     plugins: [
@@ -110,7 +60,6 @@ async function initGraphQLServer({
     introspection: process.env.NODE_ENV !== "production",
     status400ForVariableCoercionErrors: true
   });
-  const context = getContext(refreshKey, signingKey);
   const handler = (0, import_next.startServerAndCreateNextHandler)(server, {
     context
   });

package/dist/graphql/init.d.mts

@@ -1,18 +1,18 @@
-import * as vm from 'vm';
 import { ApolloServerPlugin } from '@apollo/server';
 import { NextRequest } from 'next/server';
 import { AuthChecker, NonEmptyArray } from 'type-graphql';
 
-declare function initGraphQLServer({ authChecker, resolvers, plugins, refreshKey, signingKey, }: {
+declare function initGraphQLServer({ authChecker, resolvers, plugins, refreshKey, signingKey, context, }: {
     authChecker?: AuthChecker<any>;
     resolvers: NonEmptyArray<Function>;
     plugins?: ApolloServerPlugin[];
+    context?: (req: NextRequest) => Promise<any>;
     refreshKey: string;
     signingKey: string;
 }): Promise<{
     GET: (request: NextRequest) => Promise<Response>;
     POST: (request: NextRequest) => Promise<Response>;
-    context: (req: NextRequest) => Promise<vm.Context>;
+    context: ((req: NextRequest) => Promise<any>) | undefined;
 }>;
 
 export { initGraphQLServer };

package/dist/graphql/init.d.ts

@@ -1,18 +1,18 @@
-import * as vm from 'vm';
 import { ApolloServerPlugin } from '@apollo/server';
 import { NextRequest } from 'next/server';
 import { AuthChecker, NonEmptyArray } from 'type-graphql';
 
-declare function initGraphQLServer({ authChecker, resolvers, plugins, refreshKey, signingKey, }: {
+declare function initGraphQLServer({ authChecker, resolvers, plugins, refreshKey, signingKey, context, }: {
     authChecker?: AuthChecker<any>;
     resolvers: NonEmptyArray<Function>;
     plugins?: ApolloServerPlugin[];
+    context?: (req: NextRequest) => Promise<any>;
     refreshKey: string;
     signingKey: string;
 }): Promise<{
     GET: (request: NextRequest) => Promise<Response>;
     POST: (request: NextRequest) => Promise<Response>;
-    context: (req: NextRequest) => Promise<vm.Context>;
+    context: ((req: NextRequest) => Promise<any>) | undefined;
 }>;
 
 export { initGraphQLServer };

package/dist/graphql/init.esm.js

@@ -9,63 +9,13 @@ import { startServerAndCreateNextHandler } from "@as-integrations/next";
 import {
   buildTypeDefsAndResolvers
 } from "type-graphql";
-
-// src/graphql/context.ts
-import { verify as verify2 } from "jsonwebtoken";
-
-// src/auth/email/token.ts
-import { compare } from "bcryptjs";
-import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
-import { NextResponse } from "next/server";
-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/utils/errors.ts
-import { NextResponse as NextResponse2 } from "next/server";
-function handleError(status, message, onError) {
-  const res = onError?.({ status, message });
-  if (res) return res;
-  return new NextResponse2(message, { status });
-}
-
-// src/graphql/context.ts
-var getContext = (refreshKey, signingKey) => async (req) => {
-  const bearer = req.headers.get("authorization");
-  const isMobile = req.headers.get("x-platform-is-mobile");
-  if (!bearer) {
-    if (isMobile) return { userId: null };
-    const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { userId, onlyQuery: true };
-    return { userId: null };
-  }
-  const token = bearer.slice(7);
-  try {
-    const res = verify2(token, signingKey);
-    return { userId: typeof res !== "string" ? res.id : null };
-  } catch {
-    if (isMobile) return handleError(401, "Refresh token is invalid.");
-  }
-  return { userId: null };
-};
-
-// src/graphql/init.ts
 async function initGraphQLServer({
   authChecker,
   resolvers,
   plugins,
   refreshKey,
-  signingKey
+  signingKey,
+  context
 }) {
   const { typeDefs, resolvers: builtResolvers } = await buildTypeDefsAndResolvers({
     validate: true,
@@ -91,7 +41,6 @@ async function initGraphQLServer({
     introspection: process.env.NODE_ENV !== "production",
     status400ForVariableCoercionErrors: true
   });
-  const context = getContext(refreshKey, signingKey);
   const handler = startServerAndCreateNextHandler(server, {
     context
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naystack",
-  "version": "1.1.12-beta.2",
+  "version": "1.1.12-beta.4",
   "description": "A stack built with tight Next + Drizzle + GraphQL",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
@@ -55,7 +55,7 @@
     "bcryptjs": "^3.0.2",
     "drizzle-orm": "^0.44.5",
     "jsonwebtoken": "^9.0.2",
-    "next": "^15.5.3",
+    "next": "^15.6.0-canary.29",
     "reflect-metadata": "^0.2.2",
     "type-graphql": "2.0.0-rc.2"
   },

package/dist/graphql/context.cjs.js

@@ -1,76 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/graphql/context.ts
-var context_exports = {};
-__export(context_exports, {
-  getContext: () => getContext
-});
-module.exports = __toCommonJS(context_exports);
-var import_jsonwebtoken2 = require("jsonwebtoken");
-
-// src/auth/email/token.ts
-var import_bcryptjs = require("bcryptjs");
-var import_jsonwebtoken = require("jsonwebtoken");
-var import_server = require("next/server");
-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/utils/errors.ts
-var import_server2 = require("next/server");
-function handleError(status, message, onError) {
-  const res = onError?.({ status, message });
-  if (res) return res;
-  return new import_server2.NextResponse(message, { status });
-}
-
-// src/graphql/context.ts
-var getContext = (refreshKey, signingKey) => async (req) => {
-  const bearer = req.headers.get("authorization");
-  const isMobile = req.headers.get("x-platform-is-mobile");
-  if (!bearer) {
-    if (isMobile) return { userId: null };
-    const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { userId, onlyQuery: true };
-    return { userId: null };
-  }
-  const token = bearer.slice(7);
-  try {
-    const res = (0, import_jsonwebtoken2.verify)(token, signingKey);
-    return { userId: typeof res !== "string" ? res.id : null };
-  } catch {
-    if (isMobile) return handleError(401, "Refresh token is invalid.");
-  }
-  return { userId: null };
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getContext
-});

package/dist/graphql/context.d.mts

@@ -1,6 +0,0 @@
-import { Context } from 'node:vm';
-import { NextRequest } from 'next/server';
-
-declare const getContext: (refreshKey: string, signingKey: string) => (req: NextRequest) => Promise<Context>;
-
-export { getContext };

package/dist/graphql/context.d.ts

@@ -1,6 +0,0 @@
-import { Context } from 'node:vm';
-import { NextRequest } from 'next/server';
-
-declare const getContext: (refreshKey: string, signingKey: string) => (req: NextRequest) => Promise<Context>;
-
-export { getContext };

package/dist/graphql/context.esm.js

@@ -1,51 +0,0 @@
-// src/graphql/context.ts
-import { verify as verify2 } from "jsonwebtoken";
-
-// src/auth/email/token.ts
-import { compare } from "bcryptjs";
-import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
-import { NextResponse } from "next/server";
-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/utils/errors.ts
-import { NextResponse as NextResponse2 } from "next/server";
-function handleError(status, message, onError) {
-  const res = onError?.({ status, message });
-  if (res) return res;
-  return new NextResponse2(message, { status });
-}
-
-// src/graphql/context.ts
-var getContext = (refreshKey, signingKey) => async (req) => {
-  const bearer = req.headers.get("authorization");
-  const isMobile = req.headers.get("x-platform-is-mobile");
-  if (!bearer) {
-    if (isMobile) return { userId: null };
-    const refresh = req.cookies.get("refresh")?.value;
-    const userId = getUserIdFromRefreshToken(refreshKey, refresh);
-    if (userId) return { userId, onlyQuery: true };
-    return { userId: null };
-  }
-  const token = bearer.slice(7);
-  try {
-    const res = verify2(token, signingKey);
-    return { userId: typeof res !== "string" ? res.id : null };
-  } catch {
-    if (isMobile) return handleError(401, "Refresh token is invalid.");
-  }
-  return { userId: null };
-};
-export {
-  getContext
-};