naystack 1.4.2 → 1.4.4

package/dist/auth/index.esm.js

@@ -4,7 +4,14 @@ import { verify as verify2 } from "jsonwebtoken";
 // 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 generateAccessToken(id, signingKey) {
   return sign({ id }, signingKey, {
     expiresIn: "2h"
@@ -19,14 +26,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)
@@ -119,7 +126,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 };
@@ -149,7 +156,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) {
@@ -230,18 +237,14 @@ import { NextResponse as NextResponse3 } from "next/server";
 import { v4 } from "uuid";
 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");
@@ -255,7 +258,7 @@ var getGoogleGetRoute = ({
         state: state2,
         include_granted_scopes: true,
         prompt: "consent",
-        redirect_uri: authRoute
+        redirect_uri: url
       });
       const res = NextResponse3.redirect(authorizationUrl);
       res.cookies.set("state", state2, {
@@ -264,13 +267,14 @@ var getGoogleGetRoute = ({
       });
       return res;
     }
+    const errorURL = errorRedirectURL || redirectURL;
     if (error) {
-      return NextResponse3.redirect(errorRedirectURL);
+      return NextResponse3.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 NextResponse3.redirect(errorRedirectURL);
+      if (localState !== state) return NextResponse3.redirect(errorURL);
       const { tokens } = await oauth2Client.getToken(code);
       oauth2Client.setCredentials(tokens);
       const userInfoRequest = await google.oauth2({
@@ -280,12 +284,16 @@ var getGoogleGetRoute = ({
       const user = userInfoRequest.data;
       if (user.email) {
         const id = await getUserIdFromEmail(user);
-        const res = NextResponse3.redirect(successRedirectURL);
+        const res = NextResponse3.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,
@@ -295,7 +303,7 @@ var getGoogleGetRoute = ({
         return res;
       }
     }
-    return NextResponse3.redirect(errorRedirectURL);
+    return NextResponse3.redirect(errorURL);
   };
 };
 

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

@@ -30,6 +30,8 @@ var import_server3 = require("next/server");
 // 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");
 function getUserIdFromAccessToken(refreshToken) {
   if (refreshToken && process.env.SIGNING_KEY)

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

@@ -4,6 +4,8 @@ import { NextResponse as NextResponse3 } from "next/server";
 // 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";
 function getUserIdFromAccessToken(refreshToken) {
   if (refreshToken && process.env.SIGNING_KEY)

package/dist/auth/instagram/route.cjs.js

@@ -28,6 +28,8 @@ var import_server3 = require("next/server");
 // 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");
 function getUserIdFromAccessToken(refreshToken) {
   if (refreshToken && process.env.SIGNING_KEY)

package/dist/auth/instagram/route.esm.js

@@ -4,6 +4,8 @@ import { NextResponse as NextResponse3 } from "next/server";
 // 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";
 function getUserIdFromAccessToken(refreshToken) {
   if (refreshToken && process.env.SIGNING_KEY)

package/dist/file/index.cjs.js

@@ -34,7 +34,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 getUserIdFromRefreshToken(refreshKey, refreshToken) {
   if (refreshToken)
     try {
@@ -55,7 +62,7 @@ var import_server2 = require("next/server");
 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 };

package/dist/file/index.esm.js

@@ -8,7 +8,14 @@ import { verify as verify2 } from "jsonwebtoken";
 // 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 getUserIdFromRefreshToken(refreshKey, refreshToken) {
   if (refreshToken)
     try {
@@ -29,7 +36,7 @@ import { NextResponse as NextResponse2 } from "next/server";
 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 };

package/dist/file/put.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 getUserIdFromRefreshToken(refreshKey, refreshToken) {
   if (refreshToken)
     try {
@@ -53,7 +60,7 @@ var import_server2 = require("next/server");
 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 };

package/dist/file/put.esm.js

@@ -8,7 +8,14 @@ import { verify as verify2 } from "jsonwebtoken";
 // 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 getUserIdFromRefreshToken(refreshKey, refreshToken) {
   if (refreshToken)
     try {
@@ -29,7 +36,7 @@ import { NextResponse as NextResponse2 } from "next/server";
 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 };

package/dist/file/setup.cjs.js

@@ -34,7 +34,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 getUserIdFromRefreshToken(refreshKey, refreshToken) {
   if (refreshToken)
     try {
@@ -55,7 +62,7 @@ var import_server2 = require("next/server");
 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 };

package/dist/file/setup.esm.js

@@ -8,7 +8,14 @@ import { verify as verify2 } from "jsonwebtoken";
 // 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 getUserIdFromRefreshToken(refreshKey, refreshToken) {
   if (refreshToken)
     try {
@@ -29,7 +36,7 @@ import { NextResponse as NextResponse2 } from "next/server";
 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 };

package/dist/graphql/server.cjs.js

@@ -61,9 +61,9 @@ var getGraphQLQuery = ({ uri }) => {
           Cookie: options?.noCookie ? void 0 : await (0, import_headers.cookies)()
         },
         fetchOptions: {
-          cache: options?.revalidate === void 0 ? "force-cache" : void 0,
+          cache: options?.revalidate ? "force-cache" : void 0,
           next: {
-            revalidate: options?.revalidate,
+            revalidate: options?.revalidate || 0,
             tags: options?.tags
           }
         }

package/dist/graphql/server.esm.js

@@ -40,9 +40,9 @@ var getGraphQLQuery = ({ uri }) => {
           Cookie: options?.noCookie ? void 0 : await cookies()
         },
         fetchOptions: {
-          cache: options?.revalidate === void 0 ? "force-cache" : void 0,
+          cache: options?.revalidate ? "force-cache" : void 0,
           next: {
-            revalidate: options?.revalidate,
+            revalidate: options?.revalidate || 0,
             tags: options?.tags
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naystack",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "A stack built with Next + GraphQL + S3 + Auth",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",