naystack 1.4.16 → 1.4.20

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

@@ -24,6 +24,13 @@ __export(put_exports, {
 });
 module.exports = __toCommonJS(put_exports);
 
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
 // src/auth/utils/errors.ts
 var import_server = require("next/server");
 function handleError(status, message, onError) {
@@ -85,12 +92,13 @@ async function massageRequest(req, options) {
     return {
       error: handleError(400, "Missing password", options.onError)
     };
-  if (options.turnstileKey) {
+  const turnstileKey = getEnv("TURNSTILE_KEY" /* TURNSTILE_KEY */, true);
+  if (turnstileKey) {
     if (!data.captchaToken)
       return {
         error: handleError(400, "Missing captchaToken", options.onError)
       };
-    if (!await verifyCaptcha(data.captchaToken, options.turnstileKey))
+    if (!await verifyCaptcha(data.captchaToken, turnstileKey))
       return {
         error: handleError(400, "Invalid captcha", options.onError)
       };
@@ -136,8 +144,8 @@ var getPutRoute = (options) => async (req) => {
       await options.onLogin?.(user.id, data);
     }
     return getTokenizedResponse(
-      generateAccessToken(user.id, options.keys.signing),
-      generateRefreshToken(user.id, options.keys.refresh)
+      generateAccessToken(user.id, getEnv("SIGNING_KEY" /* SIGNING_KEY */)),
+      generateRefreshToken(user.id, getEnv("REFRESH_KEY" /* REFRESH_KEY */))
     );
   }
   return handleError(403, "Invalid password", options.onError);

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

@@ -1,3 +1,10 @@
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
 // src/auth/utils/errors.ts
 import { NextResponse } from "next/server";
 function handleError(status, message, onError) {
@@ -59,12 +66,13 @@ async function massageRequest(req, options) {
     return {
       error: handleError(400, "Missing password", options.onError)
     };
-  if (options.turnstileKey) {
+  const turnstileKey = getEnv("TURNSTILE_KEY" /* TURNSTILE_KEY */, true);
+  if (turnstileKey) {
     if (!data.captchaToken)
       return {
         error: handleError(400, "Missing captchaToken", options.onError)
       };
-    if (!await verifyCaptcha(data.captchaToken, options.turnstileKey))
+    if (!await verifyCaptcha(data.captchaToken, turnstileKey))
       return {
         error: handleError(400, "Invalid captcha", options.onError)
       };
@@ -110,8 +118,8 @@ var getPutRoute = (options) => async (req) => {
       await options.onLogin?.(user.id, data);
     }
     return getTokenizedResponse(
-      generateAccessToken(user.id, options.keys.signing),
-      generateRefreshToken(user.id, options.keys.refresh)
+      generateAccessToken(user.id, getEnv("SIGNING_KEY" /* SIGNING_KEY */)),
+      generateRefreshToken(user.id, getEnv("REFRESH_KEY" /* REFRESH_KEY */))
     );
   }
   return handleError(403, "Invalid password", options.onError);

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

@@ -35,6 +35,13 @@ var import_headers = require("next/headers");
 var import_navigation = require("next/navigation");
 var import_server = require("next/server");
 
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
 
@@ -81,9 +88,9 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
   return null;
 }
 function getUserIdFromAccessToken(refreshToken) {
-  if (refreshToken && process.env.SIGNING_KEY)
+  if (refreshToken)
     try {
-      const decoded = (0, import_jsonwebtoken.verify)(refreshToken, process.env.SIGNING_KEY);
+      const decoded = (0, import_jsonwebtoken.verify)(refreshToken, getEnv("SIGNING_KEY" /* SIGNING_KEY */));
       if (typeof decoded !== "string" && typeof decoded.id === "number")
         return decoded.id;
     } catch (e) {

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

@@ -5,6 +5,13 @@ import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 import { NextResponse } from "next/server";
 
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
 
@@ -51,9 +58,9 @@ function getUserIdFromRefreshToken(refreshKey, refreshToken) {
   return null;
 }
 function getUserIdFromAccessToken(refreshToken) {
-  if (refreshToken && process.env.SIGNING_KEY)
+  if (refreshToken)
     try {
-      const decoded = verify(refreshToken, process.env.SIGNING_KEY);
+      const decoded = verify(refreshToken, getEnv("SIGNING_KEY" /* SIGNING_KEY */));
       if (typeof decoded !== "string" && typeof decoded.id === "number")
         return decoded.id;
     } catch (e) {

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

@@ -5,16 +5,10 @@ type InitRoutesOptions = {
     getUser: (data: any) => Promise<UserOutput | undefined>;
     createUser: (user: any) => Promise<UserOutput | undefined>;
     onError?: ErrorHandler;
-    keys: AuthKeys;
-    turnstileKey?: string;
     onSignUp?: (userId: number | null, body: any) => Promise<void>;
     onLogin?: (userId: number | null, body: any) => Promise<void>;
     onRefresh?: (userId: number | null, body: any) => Promise<void>;
     onLogout?: (userId: number | null, body: any) => Promise<void>;
 };
-interface AuthKeys {
-    signing: string;
-    refresh: string;
-}
 
-export type { AuthKeys, InitRoutesOptions };
+export type { InitRoutesOptions };

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

@@ -5,16 +5,10 @@ type InitRoutesOptions = {
     getUser: (data: any) => Promise<UserOutput | undefined>;
     createUser: (user: any) => Promise<UserOutput | undefined>;
     onError?: ErrorHandler;
-    keys: AuthKeys;
-    turnstileKey?: string;
     onSignUp?: (userId: number | null, body: any) => Promise<void>;
     onLogin?: (userId: number | null, body: any) => Promise<void>;
     onRefresh?: (userId: number | null, body: any) => Promise<void>;
     onLogout?: (userId: number | null, body: any) => Promise<void>;
 };
-interface AuthKeys {
-    signing: string;
-    refresh: string;
-}
 
-export type { AuthKeys, InitRoutesOptions };
+export type { InitRoutesOptions };

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

@@ -34,6 +34,13 @@ var import_headers = require("next/headers");
 var import_navigation = require("next/navigation");
 var import_server = require("next/server");
 
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
 
@@ -66,12 +73,13 @@ async function massageRequest(req, options) {
     return {
       error: handleError(400, "Missing password", options.onError)
     };
-  if (options.turnstileKey) {
+  const turnstileKey = getEnv("TURNSTILE_KEY" /* TURNSTILE_KEY */, true);
+  if (turnstileKey) {
     if (!data.captchaToken)
       return {
         error: handleError(400, "Missing captchaToken", options.onError)
       };
-    if (!await verifyCaptcha(data.captchaToken, options.turnstileKey))
+    if (!await verifyCaptcha(data.captchaToken, turnstileKey))
       return {
         error: handleError(400, "Invalid captcha", options.onError)
       };
@@ -104,17 +112,20 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
-var getContext = (keys, req) => {
+var getContext = (req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
-    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
+    const userId = getUserIdFromRefreshToken(
+      getEnv("REFRESH_KEY" /* REFRESH_KEY */),
+      refresh
+    );
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = (0, import_jsonwebtoken2.verify)(token, keys.signing);
+    const res = (0, import_jsonwebtoken2.verify)(token, getEnv("SIGNING_KEY" /* SIGNING_KEY */));
     if (typeof res === "string") {
       return { userId: null };
     }

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

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

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

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

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

@@ -8,6 +8,13 @@ import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 import { NextResponse } from "next/server";
 
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
 
@@ -40,12 +47,13 @@ async function massageRequest(req, options) {
     return {
       error: handleError(400, "Missing password", options.onError)
     };
-  if (options.turnstileKey) {
+  const turnstileKey = getEnv("TURNSTILE_KEY" /* TURNSTILE_KEY */, true);
+  if (turnstileKey) {
     if (!data.captchaToken)
       return {
         error: handleError(400, "Missing captchaToken", options.onError)
       };
-    if (!await verifyCaptcha(data.captchaToken, options.turnstileKey))
+    if (!await verifyCaptcha(data.captchaToken, turnstileKey))
       return {
         error: handleError(400, "Invalid captcha", options.onError)
       };
@@ -78,17 +86,20 @@ async function verifyCaptcha(token, secret) {
   }
   return false;
 }
-var getContext = (keys, req) => {
+var getContext = (req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
     const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
-    const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
+    const userId = getUserIdFromRefreshToken(
+      getEnv("REFRESH_KEY" /* REFRESH_KEY */),
+      refresh
+    );
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
   }
   const token = bearer.slice(7);
   try {
-    const res = verify2(token, keys.signing);
+    const res = verify2(token, getEnv("SIGNING_KEY" /* SIGNING_KEY */));
     if (typeof res === "string") {
       return { userId: null };
     }

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

@@ -34,6 +34,13 @@ var import_headers = require("next/headers");
 var import_navigation = require("next/navigation");
 var import_server = require("next/server");
 
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
 
@@ -46,13 +53,14 @@ function generateRefreshToken(id, refreshKey) {
 var getGoogleGetRoute = ({
   getUserIdFromEmail,
   redirectURL,
-  errorRedirectURL,
-  clientId,
-  clientSecret,
-  keys
+  errorRedirectURL
 }) => {
-  const url = process.env.NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT;
-  const oauth2Client = new import_googleapis.google.auth.OAuth2(clientId, clientSecret, url);
+  const url = getEnv("NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT" /* NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT */);
+  const oauth2Client = new import_googleapis.google.auth.OAuth2(
+    getEnv("GOOGLE_CLIENT_ID" /* GOOGLE_CLIENT_ID */),
+    getEnv("GOOGLE_CLIENT_SECRET" /* GOOGLE_CLIENT_SECRET */),
+    url
+  );
   return async (req) => {
     const code = req.nextUrl.searchParams.get("code");
     const error = req.nextUrl.searchParams.get("error");
@@ -96,7 +104,7 @@ var getGoogleGetRoute = ({
         if (id) {
           res.cookies.set(
             REFRESH_COOKIE_NAME,
-            generateRefreshToken(id, keys.refresh),
+            generateRefreshToken(id, getEnv("REFRESH_KEY" /* REFRESH_KEY */)),
             {
               httpOnly: true,
               secure: true

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

@@ -1,9 +1,7 @@
 import { NextRequest, NextResponse } from 'next/server';
 import { InitGoogleAuthOptions } from './index.mjs';
 import 'googleapis';
-import '../email/types.mjs';
-import '../types.mjs';
 
-declare const getGoogleGetRoute: ({ getUserIdFromEmail, redirectURL, errorRedirectURL, clientId, clientSecret, keys, }: InitGoogleAuthOptions) => (req: NextRequest) => Promise<NextResponse<unknown>>;
+declare const getGoogleGetRoute: ({ getUserIdFromEmail, redirectURL, errorRedirectURL, }: InitGoogleAuthOptions) => (req: NextRequest) => Promise<NextResponse<unknown>>;
 
 export { getGoogleGetRoute };

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

@@ -1,9 +1,7 @@
 import { NextRequest, NextResponse } from 'next/server';
 import { InitGoogleAuthOptions } from './index.js';
 import 'googleapis';
-import '../email/types.js';
-import '../types.js';
 
-declare const getGoogleGetRoute: ({ getUserIdFromEmail, redirectURL, errorRedirectURL, clientId, clientSecret, keys, }: InitGoogleAuthOptions) => (req: NextRequest) => Promise<NextResponse<unknown>>;
+declare const getGoogleGetRoute: ({ getUserIdFromEmail, redirectURL, errorRedirectURL, }: InitGoogleAuthOptions) => (req: NextRequest) => Promise<NextResponse<unknown>>;
 
 export { getGoogleGetRoute };

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

@@ -10,6 +10,13 @@ import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 import { NextResponse } from "next/server";
 
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
 
@@ -22,13 +29,14 @@ function generateRefreshToken(id, refreshKey) {
 var getGoogleGetRoute = ({
   getUserIdFromEmail,
   redirectURL,
-  errorRedirectURL,
-  clientId,
-  clientSecret,
-  keys
+  errorRedirectURL
 }) => {
-  const url = process.env.NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT;
-  const oauth2Client = new google.auth.OAuth2(clientId, clientSecret, url);
+  const url = getEnv("NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT" /* NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT */);
+  const oauth2Client = new google.auth.OAuth2(
+    getEnv("GOOGLE_CLIENT_ID" /* GOOGLE_CLIENT_ID */),
+    getEnv("GOOGLE_CLIENT_SECRET" /* GOOGLE_CLIENT_SECRET */),
+    url
+  );
   return async (req) => {
     const code = req.nextUrl.searchParams.get("code");
     const error = req.nextUrl.searchParams.get("error");
@@ -72,7 +80,7 @@ var getGoogleGetRoute = ({
         if (id) {
           res.cookies.set(
             REFRESH_COOKIE_NAME,
-            generateRefreshToken(id, keys.refresh),
+            generateRefreshToken(id, getEnv("REFRESH_KEY" /* REFRESH_KEY */)),
             {
               httpOnly: true,
               secure: true

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

@@ -36,6 +36,13 @@ var import_headers = require("next/headers");
 var import_navigation = require("next/navigation");
 var import_server = require("next/server");
 
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
 
@@ -48,13 +55,14 @@ function generateRefreshToken(id, refreshKey) {
 var getGoogleGetRoute = ({
   getUserIdFromEmail,
   redirectURL,
-  errorRedirectURL,
-  clientId,
-  clientSecret,
-  keys
+  errorRedirectURL
 }) => {
-  const url = process.env.NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT;
-  const oauth2Client = new import_googleapis.google.auth.OAuth2(clientId, clientSecret, url);
+  const url = getEnv("NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT" /* NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT */);
+  const oauth2Client = new import_googleapis.google.auth.OAuth2(
+    getEnv("GOOGLE_CLIENT_ID" /* GOOGLE_CLIENT_ID */),
+    getEnv("GOOGLE_CLIENT_SECRET" /* GOOGLE_CLIENT_SECRET */),
+    url
+  );
   return async (req) => {
     const code = req.nextUrl.searchParams.get("code");
     const error = req.nextUrl.searchParams.get("error");
@@ -98,7 +106,7 @@ var getGoogleGetRoute = ({
         if (id) {
           res.cookies.set(
             REFRESH_COOKIE_NAME,
-            generateRefreshToken(id, keys.refresh),
+            generateRefreshToken(id, getEnv("REFRESH_KEY" /* REFRESH_KEY */)),
             {
               httpOnly: true,
               secure: true

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

@@ -1,16 +1,11 @@
 import * as next_server from 'next/server';
 import { oauth2_v2 } from 'googleapis';
-import { AuthKeys } from '../email/types.mjs';
-import '../types.mjs';
 
 type Schema$Userinfo = oauth2_v2.Schema$Userinfo;
 interface InitGoogleAuthOptions {
     getUserIdFromEmail: (email: Schema$Userinfo) => Promise<number | null>;
     redirectURL: string;
     errorRedirectURL?: string;
-    clientId: string;
-    clientSecret: string;
-    keys: AuthKeys;
 }
 declare function initGoogleAuth(props: InitGoogleAuthOptions): {
     GET: (req: next_server.NextRequest) => Promise<next_server.NextResponse<unknown>>;

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

@@ -1,16 +1,11 @@
 import * as next_server from 'next/server';
 import { oauth2_v2 } from 'googleapis';
-import { AuthKeys } from '../email/types.js';
-import '../types.js';
 
 type Schema$Userinfo = oauth2_v2.Schema$Userinfo;
 interface InitGoogleAuthOptions {
     getUserIdFromEmail: (email: Schema$Userinfo) => Promise<number | null>;
     redirectURL: string;
     errorRedirectURL?: string;
-    clientId: string;
-    clientSecret: string;
-    keys: AuthKeys;
 }
 declare function initGoogleAuth(props: InitGoogleAuthOptions): {
     GET: (req: next_server.NextRequest) => Promise<next_server.NextResponse<unknown>>;

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

@@ -10,6 +10,13 @@ import { cookies } from "next/headers";
 import { redirect } from "next/navigation";
 import { NextResponse } from "next/server";
 
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
 
@@ -22,13 +29,14 @@ function generateRefreshToken(id, refreshKey) {
 var getGoogleGetRoute = ({
   getUserIdFromEmail,
   redirectURL,
-  errorRedirectURL,
-  clientId,
-  clientSecret,
-  keys
+  errorRedirectURL
 }) => {
-  const url = process.env.NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT;
-  const oauth2Client = new google.auth.OAuth2(clientId, clientSecret, url);
+  const url = getEnv("NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT" /* NEXT_PUBLIC_GOOGLE_AUTH_ENDPOINT */);
+  const oauth2Client = new google.auth.OAuth2(
+    getEnv("GOOGLE_CLIENT_ID" /* GOOGLE_CLIENT_ID */),
+    getEnv("GOOGLE_CLIENT_SECRET" /* GOOGLE_CLIENT_SECRET */),
+    url
+  );
   return async (req) => {
     const code = req.nextUrl.searchParams.get("code");
     const error = req.nextUrl.searchParams.get("error");
@@ -72,7 +80,7 @@ var getGoogleGetRoute = ({
         if (id) {
           res.cookies.set(
             REFRESH_COOKIE_NAME,
-            generateRefreshToken(id, keys.refresh),
+            generateRefreshToken(id, getEnv("REFRESH_KEY" /* REFRESH_KEY */)),
             {
               httpOnly: true,
               secure: true