naystack 1.4.2 → 1.4.4

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

@@ -30,7 +30,14 @@ var import_uuid = require("uuid");
 // src/auth/email/token.ts
 var import_bcryptjs = require("bcryptjs");
 var import_jsonwebtoken = require("jsonwebtoken");
+var import_headers = require("next/headers");
+var import_navigation = require("next/navigation");
 var import_server = require("next/server");
+
+// src/auth/constants.ts
+var REFRESH_COOKIE_NAME = "refresh";
+
+// src/auth/email/token.ts
 function generateRefreshToken(id, refreshKey) {
   return (0, import_jsonwebtoken.sign)({ id }, refreshKey);
 }
@@ -38,18 +45,14 @@ function generateRefreshToken(id, refreshKey) {
 // src/auth/google/get.ts
 var getGoogleGetRoute = ({
   getUserIdFromEmail,
-  successRedirectURL,
+  redirectURL,
   errorRedirectURL,
-  authRoute,
+  url,
   clientId,
   clientSecret,
-  refreshKey
+  keys
 }) => {
-  const oauth2Client = new import_googleapis.google.auth.OAuth2(
-    clientId,
-    clientSecret,
-    authRoute
-  );
+  const oauth2Client = new import_googleapis.google.auth.OAuth2(clientId, clientSecret, url);
   return async (req) => {
     const code = req.nextUrl.searchParams.get("code");
     const error = req.nextUrl.searchParams.get("error");
@@ -63,7 +66,7 @@ var getGoogleGetRoute = ({
         state: state2,
         include_granted_scopes: true,
         prompt: "consent",
-        redirect_uri: authRoute
+        redirect_uri: url
       });
       const res = import_server2.NextResponse.redirect(authorizationUrl);
       res.cookies.set("state", state2, {
@@ -72,13 +75,14 @@ var getGoogleGetRoute = ({
       });
       return res;
     }
+    const errorURL = errorRedirectURL || redirectURL;
     if (error) {
-      return import_server2.NextResponse.redirect(errorRedirectURL);
+      return import_server2.NextResponse.redirect(errorURL);
     }
     const state = req.nextUrl.searchParams.get("state") || void 0;
     if (code && state) {
       const localState = req.cookies.get("state")?.value;
-      if (localState !== state) return import_server2.NextResponse.redirect(errorRedirectURL);
+      if (localState !== state) return import_server2.NextResponse.redirect(errorURL);
       const { tokens } = await oauth2Client.getToken(code);
       oauth2Client.setCredentials(tokens);
       const userInfoRequest = await import_googleapis.google.oauth2({
@@ -88,12 +92,16 @@ var getGoogleGetRoute = ({
       const user = userInfoRequest.data;
       if (user.email) {
         const id = await getUserIdFromEmail(user);
-        const res = import_server2.NextResponse.redirect(successRedirectURL);
+        const res = import_server2.NextResponse.redirect(redirectURL);
         if (id) {
-          res.cookies.set("refresh", generateRefreshToken(id, refreshKey), {
-            httpOnly: true,
-            secure: true
-          });
+          res.cookies.set(
+            REFRESH_COOKIE_NAME,
+            generateRefreshToken(id, keys.refresh),
+            {
+              httpOnly: true,
+              secure: true
+            }
+          );
         }
         res.cookies.set("state", "", {
           httpOnly: true,
@@ -103,7 +111,7 @@ var getGoogleGetRoute = ({
         return res;
       }
     }
-    return import_server2.NextResponse.redirect(errorRedirectURL);
+    return import_server2.NextResponse.redirect(errorURL);
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

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

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

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

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

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

@@ -6,7 +6,14 @@ import { v4 } from "uuid";
 // src/auth/email/token.ts
 import { compare } from "bcryptjs";
 import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
+import { cookies } from "next/headers";
+import { redirect } from "next/navigation";
 import { NextResponse } from "next/server";
+
+// src/auth/constants.ts
+var REFRESH_COOKIE_NAME = "refresh";
+
+// src/auth/email/token.ts
 function generateRefreshToken(id, refreshKey) {
   return sign({ id }, refreshKey);
 }
@@ -14,18 +21,14 @@ function generateRefreshToken(id, refreshKey) {
 // src/auth/google/get.ts
 var getGoogleGetRoute = ({
   getUserIdFromEmail,
-  successRedirectURL,
+  redirectURL,
   errorRedirectURL,
-  authRoute,
+  url,
   clientId,
   clientSecret,
-  refreshKey
+  keys
 }) => {
-  const oauth2Client = new google.auth.OAuth2(
-    clientId,
-    clientSecret,
-    authRoute
-  );
+  const oauth2Client = new google.auth.OAuth2(clientId, clientSecret, url);
   return async (req) => {
     const code = req.nextUrl.searchParams.get("code");
     const error = req.nextUrl.searchParams.get("error");
@@ -39,7 +42,7 @@ var getGoogleGetRoute = ({
         state: state2,
         include_granted_scopes: true,
         prompt: "consent",
-        redirect_uri: authRoute
+        redirect_uri: url
       });
       const res = NextResponse2.redirect(authorizationUrl);
       res.cookies.set("state", state2, {
@@ -48,13 +51,14 @@ var getGoogleGetRoute = ({
       });
       return res;
     }
+    const errorURL = errorRedirectURL || redirectURL;
     if (error) {
-      return NextResponse2.redirect(errorRedirectURL);
+      return NextResponse2.redirect(errorURL);
     }
     const state = req.nextUrl.searchParams.get("state") || void 0;
     if (code && state) {
       const localState = req.cookies.get("state")?.value;
-      if (localState !== state) return NextResponse2.redirect(errorRedirectURL);
+      if (localState !== state) return NextResponse2.redirect(errorURL);
       const { tokens } = await oauth2Client.getToken(code);
       oauth2Client.setCredentials(tokens);
       const userInfoRequest = await google.oauth2({
@@ -64,12 +68,16 @@ var getGoogleGetRoute = ({
       const user = userInfoRequest.data;
       if (user.email) {
         const id = await getUserIdFromEmail(user);
-        const res = NextResponse2.redirect(successRedirectURL);
+        const res = NextResponse2.redirect(redirectURL);
         if (id) {
-          res.cookies.set("refresh", generateRefreshToken(id, refreshKey), {
-            httpOnly: true,
-            secure: true
-          });
+          res.cookies.set(
+            REFRESH_COOKIE_NAME,
+            generateRefreshToken(id, keys.refresh),
+            {
+              httpOnly: true,
+              secure: true
+            }
+          );
         }
         res.cookies.set("state", "", {
           httpOnly: true,
@@ -79,7 +87,7 @@ var getGoogleGetRoute = ({
         return res;
       }
     }
-    return NextResponse2.redirect(errorRedirectURL);
+    return NextResponse2.redirect(errorURL);
   };
 };
 export {

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

@@ -32,7 +32,14 @@ var import_uuid = require("uuid");
 // src/auth/email/token.ts
 var import_bcryptjs = require("bcryptjs");
 var import_jsonwebtoken = require("jsonwebtoken");
+var import_headers = require("next/headers");
+var import_navigation = require("next/navigation");
 var import_server = require("next/server");
+
+// src/auth/constants.ts
+var REFRESH_COOKIE_NAME = "refresh";
+
+// src/auth/email/token.ts
 function generateRefreshToken(id, refreshKey) {
   return (0, import_jsonwebtoken.sign)({ id }, refreshKey);
 }
@@ -40,18 +47,14 @@ function generateRefreshToken(id, refreshKey) {
 // src/auth/google/get.ts
 var getGoogleGetRoute = ({
   getUserIdFromEmail,
-  successRedirectURL,
+  redirectURL,
   errorRedirectURL,
-  authRoute,
+  url,
   clientId,
   clientSecret,
-  refreshKey
+  keys
 }) => {
-  const oauth2Client = new import_googleapis.google.auth.OAuth2(
-    clientId,
-    clientSecret,
-    authRoute
-  );
+  const oauth2Client = new import_googleapis.google.auth.OAuth2(clientId, clientSecret, url);
   return async (req) => {
     const code = req.nextUrl.searchParams.get("code");
     const error = req.nextUrl.searchParams.get("error");
@@ -65,7 +68,7 @@ var getGoogleGetRoute = ({
         state: state2,
         include_granted_scopes: true,
         prompt: "consent",
-        redirect_uri: authRoute
+        redirect_uri: url
       });
       const res = import_server2.NextResponse.redirect(authorizationUrl);
       res.cookies.set("state", state2, {
@@ -74,13 +77,14 @@ var getGoogleGetRoute = ({
       });
       return res;
     }
+    const errorURL = errorRedirectURL || redirectURL;
     if (error) {
-      return import_server2.NextResponse.redirect(errorRedirectURL);
+      return import_server2.NextResponse.redirect(errorURL);
     }
     const state = req.nextUrl.searchParams.get("state") || void 0;
     if (code && state) {
       const localState = req.cookies.get("state")?.value;
-      if (localState !== state) return import_server2.NextResponse.redirect(errorRedirectURL);
+      if (localState !== state) return import_server2.NextResponse.redirect(errorURL);
       const { tokens } = await oauth2Client.getToken(code);
       oauth2Client.setCredentials(tokens);
       const userInfoRequest = await import_googleapis.google.oauth2({
@@ -90,12 +94,16 @@ var getGoogleGetRoute = ({
       const user = userInfoRequest.data;
       if (user.email) {
         const id = await getUserIdFromEmail(user);
-        const res = import_server2.NextResponse.redirect(successRedirectURL);
+        const res = import_server2.NextResponse.redirect(redirectURL);
         if (id) {
-          res.cookies.set("refresh", generateRefreshToken(id, refreshKey), {
-            httpOnly: true,
-            secure: true
-          });
+          res.cookies.set(
+            REFRESH_COOKIE_NAME,
+            generateRefreshToken(id, keys.refresh),
+            {
+              httpOnly: true,
+              secure: true
+            }
+          );
         }
         res.cookies.set("state", "", {
           httpOnly: true,
@@ -105,7 +113,7 @@ var getGoogleGetRoute = ({
         return res;
       }
     }
-    return import_server2.NextResponse.redirect(errorRedirectURL);
+    return import_server2.NextResponse.redirect(errorURL);
   };
 };
 

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

@@ -1,15 +1,17 @@
 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>;
-    successRedirectURL: string;
-    errorRedirectURL: string;
-    authRoute: string;
+    redirectURL: string;
+    errorRedirectURL?: string;
+    url: string;
     clientId: string;
     clientSecret: string;
-    refreshKey: 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,15 +1,17 @@
 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>;
-    successRedirectURL: string;
-    errorRedirectURL: string;
-    authRoute: string;
+    redirectURL: string;
+    errorRedirectURL?: string;
+    url: string;
     clientId: string;
     clientSecret: string;
-    refreshKey: 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

@@ -6,7 +6,14 @@ import { v4 } from "uuid";
 // src/auth/email/token.ts
 import { compare } from "bcryptjs";
 import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
+import { cookies } from "next/headers";
+import { redirect } from "next/navigation";
 import { NextResponse } from "next/server";
+
+// src/auth/constants.ts
+var REFRESH_COOKIE_NAME = "refresh";
+
+// src/auth/email/token.ts
 function generateRefreshToken(id, refreshKey) {
   return sign({ id }, refreshKey);
 }
@@ -14,18 +21,14 @@ function generateRefreshToken(id, refreshKey) {
 // src/auth/google/get.ts
 var getGoogleGetRoute = ({
   getUserIdFromEmail,
-  successRedirectURL,
+  redirectURL,
   errorRedirectURL,
-  authRoute,
+  url,
   clientId,
   clientSecret,
-  refreshKey
+  keys
 }) => {
-  const oauth2Client = new google.auth.OAuth2(
-    clientId,
-    clientSecret,
-    authRoute
-  );
+  const oauth2Client = new google.auth.OAuth2(clientId, clientSecret, url);
   return async (req) => {
     const code = req.nextUrl.searchParams.get("code");
     const error = req.nextUrl.searchParams.get("error");
@@ -39,7 +42,7 @@ var getGoogleGetRoute = ({
         state: state2,
         include_granted_scopes: true,
         prompt: "consent",
-        redirect_uri: authRoute
+        redirect_uri: url
       });
       const res = NextResponse2.redirect(authorizationUrl);
       res.cookies.set("state", state2, {
@@ -48,13 +51,14 @@ var getGoogleGetRoute = ({
       });
       return res;
     }
+    const errorURL = errorRedirectURL || redirectURL;
     if (error) {
-      return NextResponse2.redirect(errorRedirectURL);
+      return NextResponse2.redirect(errorURL);
     }
     const state = req.nextUrl.searchParams.get("state") || void 0;
     if (code && state) {
       const localState = req.cookies.get("state")?.value;
-      if (localState !== state) return NextResponse2.redirect(errorRedirectURL);
+      if (localState !== state) return NextResponse2.redirect(errorURL);
       const { tokens } = await oauth2Client.getToken(code);
       oauth2Client.setCredentials(tokens);
       const userInfoRequest = await google.oauth2({
@@ -64,12 +68,16 @@ var getGoogleGetRoute = ({
       const user = userInfoRequest.data;
       if (user.email) {
         const id = await getUserIdFromEmail(user);
-        const res = NextResponse2.redirect(successRedirectURL);
+        const res = NextResponse2.redirect(redirectURL);
         if (id) {
-          res.cookies.set("refresh", generateRefreshToken(id, refreshKey), {
-            httpOnly: true,
-            secure: true
-          });
+          res.cookies.set(
+            REFRESH_COOKIE_NAME,
+            generateRefreshToken(id, keys.refresh),
+            {
+              httpOnly: true,
+              secure: true
+            }
+          );
         }
         res.cookies.set("state", "", {
           httpOnly: true,
@@ -79,7 +87,7 @@ var getGoogleGetRoute = ({
         return res;
       }
     }
-    return NextResponse2.redirect(errorRedirectURL);
+    return NextResponse2.redirect(errorURL);
   };
 };
 

package/dist/auth/index.cjs.js

@@ -32,7 +32,14 @@ var import_jsonwebtoken2 = require("jsonwebtoken");
 // src/auth/email/token.ts
 var import_bcryptjs = require("bcryptjs");
 var import_jsonwebtoken = require("jsonwebtoken");
+var import_headers = require("next/headers");
+var import_navigation = require("next/navigation");
 var import_server = require("next/server");
+
+// src/auth/constants.ts
+var REFRESH_COOKIE_NAME = "refresh";
+
+// src/auth/email/token.ts
 function generateAccessToken(id, signingKey) {
   return (0, import_jsonwebtoken.sign)({ id }, signingKey, {
     expiresIn: "2h"
@@ -47,14 +54,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
     status: 200
   });
   if (!accessToken) {
-    response.cookies.set("refresh", "", {
+    response.cookies.set(REFRESH_COOKIE_NAME, "", {
       secure: false,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
-    response.cookies.set("refresh", refreshToken, {
+    response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
       secure: false,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
@@ -147,7 +154,7 @@ async function verifyCaptcha(token, secret) {
 var getContext = (keys, req) => {
   const bearer = req.headers.get("authorization");
   if (!bearer) {
-    const refresh = req.cookies.get("refresh")?.value;
+    const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
     const userId = getUserIdFromRefreshToken(keys.refresh, refresh);
     if (userId) return { userId, isRefreshID: true };
     return { userId: null };
@@ -177,7 +184,7 @@ var getDeleteRoute = (options) => async (req) => {
 
 // src/auth/email/routes/get.ts
 var getGetRoute = (options) => async (req) => {
-  const refresh = req.cookies.get("refresh")?.value;
+  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value;
   const userID = getUserIdFromRefreshToken(options.keys.refresh, refresh);
   if (userID) {
     if (options.onRefresh) {
@@ -258,18 +265,14 @@ var import_server3 = require("next/server");
 var import_uuid = require("uuid");
 var getGoogleGetRoute = ({
   getUserIdFromEmail,
-  successRedirectURL,
+  redirectURL,
   errorRedirectURL,
-  authRoute,
+  url,
   clientId,
   clientSecret,
-  refreshKey
+  keys
 }) => {
-  const oauth2Client = new import_googleapis.google.auth.OAuth2(
-    clientId,
-    clientSecret,
-    authRoute
-  );
+  const oauth2Client = new import_googleapis.google.auth.OAuth2(clientId, clientSecret, url);
   return async (req) => {
     const code = req.nextUrl.searchParams.get("code");
     const error = req.nextUrl.searchParams.get("error");
@@ -283,7 +286,7 @@ var getGoogleGetRoute = ({
         state: state2,
         include_granted_scopes: true,
         prompt: "consent",
-        redirect_uri: authRoute
+        redirect_uri: url
       });
       const res = import_server3.NextResponse.redirect(authorizationUrl);
       res.cookies.set("state", state2, {
@@ -292,13 +295,14 @@ var getGoogleGetRoute = ({
       });
       return res;
     }
+    const errorURL = errorRedirectURL || redirectURL;
     if (error) {
-      return import_server3.NextResponse.redirect(errorRedirectURL);
+      return import_server3.NextResponse.redirect(errorURL);
     }
     const state = req.nextUrl.searchParams.get("state") || void 0;
     if (code && state) {
       const localState = req.cookies.get("state")?.value;
-      if (localState !== state) return import_server3.NextResponse.redirect(errorRedirectURL);
+      if (localState !== state) return import_server3.NextResponse.redirect(errorURL);
       const { tokens } = await oauth2Client.getToken(code);
       oauth2Client.setCredentials(tokens);
       const userInfoRequest = await import_googleapis.google.oauth2({
@@ -308,12 +312,16 @@ var getGoogleGetRoute = ({
       const user = userInfoRequest.data;
       if (user.email) {
         const id = await getUserIdFromEmail(user);
-        const res = import_server3.NextResponse.redirect(successRedirectURL);
+        const res = import_server3.NextResponse.redirect(redirectURL);
         if (id) {
-          res.cookies.set("refresh", generateRefreshToken(id, refreshKey), {
-            httpOnly: true,
-            secure: true
-          });
+          res.cookies.set(
+            REFRESH_COOKIE_NAME,
+            generateRefreshToken(id, keys.refresh),
+            {
+              httpOnly: true,
+              secure: true
+            }
+          );
         }
         res.cookies.set("state", "", {
           httpOnly: true,
@@ -323,7 +331,7 @@ var getGoogleGetRoute = ({
         return res;
       }
     }
-    return import_server3.NextResponse.redirect(errorRedirectURL);
+    return import_server3.NextResponse.redirect(errorURL);
   };
 };