naystack 1.1.12-beta.2 → 1.1.12-beta.20

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/google/index.cjs.js

@@ -0,0 +1,31 @@
+"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/auth/google/index.ts
+var google_exports = {};
+__export(google_exports, {
+  initGoogleAuth: () => initGoogleAuth
+});
+module.exports = __toCommonJS(google_exports);
+function initGoogleAuth() {
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  initGoogleAuth
+});

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

@@ -0,0 +1,3 @@
+declare function initGoogleAuth(): void;
+
+export { initGoogleAuth };

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

@@ -0,0 +1,3 @@
+declare function initGoogleAuth(): void;
+
+export { initGoogleAuth };

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

@@ -0,0 +1,6 @@
+// src/auth/google/index.ts
+function initGoogleAuth() {
+}
+export {
+  initGoogleAuth
+};

package/dist/auth/google/oauth.cjs.js

@@ -0,0 +1,35 @@
+"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/auth/google/oauth.ts
+var oauth_exports = {};
+__export(oauth_exports, {
+  oauth2Client: () => oauth2Client
+});
+module.exports = __toCommonJS(oauth_exports);
+var import_googleapis = require("googleapis");
+var oauth2Client = new import_googleapis.google.auth.OAuth2(
+  process.env.GOOGLE_CLIENT_ID,
+  process.env.GOOGLE_CLIENT_SECRET,
+  `${process.env.NEXT_PUBLIC_BACKEND_BASE_URL}/google`
+);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  oauth2Client
+});

package/dist/auth/google/oauth.d.mts

@@ -0,0 +1,5 @@
+import { OAuth2Client } from 'google-auth-library';
+
+declare const oauth2Client: OAuth2Client;
+
+export { oauth2Client };

package/dist/auth/google/oauth.d.ts

@@ -0,0 +1,5 @@
+import { OAuth2Client } from 'google-auth-library';
+
+declare const oauth2Client: OAuth2Client;
+
+export { oauth2Client };

package/dist/auth/google/oauth.esm.js

@@ -0,0 +1,10 @@
+// src/auth/google/oauth.ts
+import { google } from "googleapis";
+var oauth2Client = new google.auth.OAuth2(
+  process.env.GOOGLE_CLIENT_ID,
+  process.env.GOOGLE_CLIENT_SECRET,
+  `${process.env.NEXT_PUBLIC_BACKEND_BASE_URL}/google`
+);
+export {
+  oauth2Client
+};

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: