naystack 1.2.16 → 1.2.19

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

@@ -17,16 +17,40 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/auth/email/client.ts
+// src/auth/email/client.tsx
 var client_exports = {};
 __export(client_exports, {
-  getEmailAuthUtils: () => getEmailAuthUtils
+  TokenContext: () => TokenContext,
+  getApolloWrapper: () => getApolloWrapper,
+  getEmailAuthUtils: () => getEmailAuthUtils,
+  useSetToken: () => useSetToken,
+  useToken: () => useToken
 });
 module.exports = __toCommonJS(client_exports);
-var import_client = require("naystack/graphql/client");
 var import_react = require("react");
+var TokenContext = (0, import_react.createContext)({
+  token: null,
+  setToken: () => null
+});
+var getApolloWrapper = (endpoint) => ({ children }) => {
+  const [token, setToken] = (0, import_react.useState)(null);
+  (0, import_react.useEffect)(() => {
+    fetch(endpoint, {
+      credentials: "include"
+    }).then((res) => res.json()).then((data) => setToken(data.accessToken));
+  }, []);
+  return /* @__PURE__ */ React.createElement(TokenContext.Provider, { value: { token, setToken } }, children);
+};
+function useToken() {
+  const { token } = (0, import_react.useContext)(TokenContext);
+  return token;
+}
+function useSetToken() {
+  const { setToken } = (0, import_react.useContext)(TokenContext);
+  return setToken;
+}
 function useSignUpWithEmail(endpoint) {
-  const setToken = (0, import_client.useSetToken)();
+  const setToken = useSetToken();
   return (0, import_react.useCallback)(
     async (data) => {
       const res = await fetch(endpoint, {
@@ -45,7 +69,7 @@ function useSignUpWithEmail(endpoint) {
   );
 }
 function useLoginWithEmail(endpoint) {
-  const setToken = (0, import_client.useSetToken)();
+  const setToken = useSetToken();
   return (0, import_react.useCallback)(
     async (data) => {
       const res = await fetch(endpoint, {
@@ -64,7 +88,7 @@ function useLoginWithEmail(endpoint) {
   );
 }
 function useLogout(endpoint) {
-  const setToken = (0, import_client.useSetToken)();
+  const setToken = useSetToken();
   return (0, import_react.useCallback)(
     async (data) => {
       setToken(null);
@@ -86,5 +110,9 @@ function getEmailAuthUtils(endpoint) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getEmailAuthUtils
+  TokenContext,
+  getApolloWrapper,
+  getEmailAuthUtils,
+  useSetToken,
+  useToken
 });

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

@@ -1,7 +1,19 @@
+import * as react from 'react';
+import { Dispatch, SetStateAction } from 'react';
+
+declare const TokenContext: react.Context<{
+    token: string | null;
+    setToken: Dispatch<SetStateAction<string | null>>;
+}>;
+declare const getApolloWrapper: (endpoint: string) => ({ children }: {
+    children: React.ReactNode;
+}) => react.JSX.Element;
+declare function useToken(): string | null;
+declare function useSetToken(): Dispatch<SetStateAction<string | null>>;
 declare function getEmailAuthUtils(endpoint: string): {
     useSignUp: () => (data: object) => Promise<string | null>;
     useLogin: () => (data: object) => Promise<string | null>;
     useLogout: () => (data?: object) => Promise<void>;
 };
 
-export { getEmailAuthUtils };
+export { TokenContext, getApolloWrapper, getEmailAuthUtils, useSetToken, useToken };

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

@@ -1,7 +1,19 @@
+import * as react from 'react';
+import { Dispatch, SetStateAction } from 'react';
+
+declare const TokenContext: react.Context<{
+    token: string | null;
+    setToken: Dispatch<SetStateAction<string | null>>;
+}>;
+declare const getApolloWrapper: (endpoint: string) => ({ children }: {
+    children: React.ReactNode;
+}) => react.JSX.Element;
+declare function useToken(): string | null;
+declare function useSetToken(): Dispatch<SetStateAction<string | null>>;
 declare function getEmailAuthUtils(endpoint: string): {
     useSignUp: () => (data: object) => Promise<string | null>;
     useLogin: () => (data: object) => Promise<string | null>;
     useLogout: () => (data?: object) => Promise<void>;
 };
 
-export { getEmailAuthUtils };
+export { TokenContext, getApolloWrapper, getEmailAuthUtils, useSetToken, useToken };

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

@@ -1,6 +1,32 @@
-// src/auth/email/client.ts
-import { useSetToken } from "naystack/graphql/client";
-import { useCallback } from "react";
+// src/auth/email/client.tsx
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useState
+} from "react";
+var TokenContext = createContext({
+  token: null,
+  setToken: () => null
+});
+var getApolloWrapper = (endpoint) => ({ children }) => {
+  const [token, setToken] = useState(null);
+  useEffect(() => {
+    fetch(endpoint, {
+      credentials: "include"
+    }).then((res) => res.json()).then((data) => setToken(data.accessToken));
+  }, []);
+  return /* @__PURE__ */ React.createElement(TokenContext.Provider, { value: { token, setToken } }, children);
+};
+function useToken() {
+  const { token } = useContext(TokenContext);
+  return token;
+}
+function useSetToken() {
+  const { setToken } = useContext(TokenContext);
+  return setToken;
+}
 function useSignUpWithEmail(endpoint) {
   const setToken = useSetToken();
   return useCallback(
@@ -61,5 +87,9 @@ function getEmailAuthUtils(endpoint) {
   };
 }
 export {
-  getEmailAuthUtils
+  TokenContext,
+  getApolloWrapper,
+  getEmailAuthUtils,
+  useSetToken,
+  useToken
 };

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 };