naystack 1.2.16 → 1.2.19

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

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

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

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

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

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

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

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

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

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

package/dist/auth/index.cjs.js

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

package/dist/auth/index.d.mts

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

package/dist/auth/index.d.ts

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

package/dist/auth/index.esm.js

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

package/dist/client/hooks.d.mts

@@ -1,6 +1,6 @@
-import * as React from 'react';
+import * as react from 'react';
 
-declare function useVisibility(onVisible?: () => void): React.RefObject<null>;
+declare function useVisibility(onVisible?: () => void): react.RefObject<null>;
 declare function useBreakpoint(query: string): boolean | null;
 
 export { useBreakpoint, useVisibility };

package/dist/client/hooks.d.ts

@@ -1,6 +1,6 @@
-import * as React from 'react';
+import * as react from 'react';
 
-declare function useVisibility(onVisible?: () => void): React.RefObject<null>;
+declare function useVisibility(onVisible?: () => void): react.RefObject<null>;
 declare function useBreakpoint(query: string): boolean | null;
 
 export { useBreakpoint, useVisibility };

package/dist/file/client.cjs.js

@@ -20,32 +20,29 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/file/client.ts
 var client_exports = {};
 __export(client_exports, {
-  getHandleImageUpload: () => getHandleImageUpload
+  getUseFileUpload: () => getUseFileUpload
 });
 module.exports = __toCommonJS(client_exports);
-var getHandleImageUpload = (route) => ({
-  file,
-  type,
-  token,
-  data,
-  sync
-}) => {
-  const formData = new FormData();
-  formData.append("type", type);
-  if (file) formData.append("file", file);
-  if (sync) formData.append("sync", sync.toString());
-  if (data) formData.append("data", JSON.stringify(data));
-  return fetch(route, {
-    method: "PUT",
-    body: formData,
-    headers: {
-      Authorization: `Bearer ${token}`
-    }
-  }).then(
-    async (res) => await res.json() || null
-  );
+var import_client = require("naystack/auth/email/client");
+var getUseFileUpload = (route) => () => {
+  const token = (0, import_client.useToken)();
+  return (file, type, data) => {
+    const formData = new FormData();
+    formData.append("type", type);
+    formData.append("file", file);
+    if (data) formData.append("data", JSON.stringify(data));
+    return fetch(route, {
+      method: "PUT",
+      body: formData,
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    }).then(
+      async (res) => await res.json() || null
+    );
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getHandleImageUpload
+  getUseFileUpload
 });

package/dist/file/client.d.mts

@@ -1,13 +1,7 @@
-declare const getHandleImageUpload: (route: string) => ({ file, type, token, data, sync, }: {
-    file?: File | Blob;
-    token: string;
-    type: string;
-    sync?: boolean;
-    data?: object;
-}) => Promise<ImageUploadResponseType>;
-interface ImageUploadResponseType {
+declare const getUseFileUpload: (route: string) => () => (file: File | Blob, type: string, data?: object) => Promise<FileUploadResponseType>;
+interface FileUploadResponseType {
     url?: string;
-    response?: object;
+    onUploadResponse?: object;
 }
 
-export { type ImageUploadResponseType, getHandleImageUpload };
+export { getUseFileUpload };

package/dist/file/client.d.ts

@@ -1,13 +1,7 @@
-declare const getHandleImageUpload: (route: string) => ({ file, type, token, data, sync, }: {
-    file?: File | Blob;
-    token: string;
-    type: string;
-    sync?: boolean;
-    data?: object;
-}) => Promise<ImageUploadResponseType>;
-interface ImageUploadResponseType {
+declare const getUseFileUpload: (route: string) => () => (file: File | Blob, type: string, data?: object) => Promise<FileUploadResponseType>;
+interface FileUploadResponseType {
     url?: string;
-    response?: object;
+    onUploadResponse?: object;
 }
 
-export { type ImageUploadResponseType, getHandleImageUpload };
+export { getUseFileUpload };

package/dist/file/client.esm.js

@@ -1,26 +1,23 @@
 // src/file/client.ts
-var getHandleImageUpload = (route) => ({
-  file,
-  type,
-  token,
-  data,
-  sync
-}) => {
-  const formData = new FormData();
-  formData.append("type", type);
-  if (file) formData.append("file", file);
-  if (sync) formData.append("sync", sync.toString());
-  if (data) formData.append("data", JSON.stringify(data));
-  return fetch(route, {
-    method: "PUT",
-    body: formData,
-    headers: {
-      Authorization: `Bearer ${token}`
-    }
-  }).then(
-    async (res) => await res.json() || null
-  );
+import { useToken } from "naystack/auth/email/client";
+var getUseFileUpload = (route) => () => {
+  const token = useToken();
+  return (file, type, data) => {
+    const formData = new FormData();
+    formData.append("type", type);
+    formData.append("file", file);
+    if (data) formData.append("data", JSON.stringify(data));
+    return fetch(route, {
+      method: "PUT",
+      body: formData,
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    }).then(
+      async (res) => await res.json() || null
+    );
+  };
 };
 export {
-  getHandleImageUpload
+  getUseFileUpload
 };