naystack 1.7.21 → 1.7.24

package/dist/auth/index.d.mts

@@ -3,7 +3,7 @@ export { SetupGoogleAuthOptions, setupGoogleAuth } from './google/index.mjs';
 export { SetupInstagramAuthOptions, setupInstagramAuth } from './instagram/index.mjs';
 export { getRefreshToken } from './utils/token.mjs';
 export { AuthFetch, AuthWrapper } from './email/next.mjs';
-export { checkAuthStatus, generateAccessToken, generateRefreshToken } from './email/token.mjs';
+export { checkAuthStatus, getTokenizedResponse } from './email/token.mjs';
 export { getContext } from './email/utils.mjs';
 export { getRefreshedInstagramAccessToken } from './instagram/utils.mjs';
 import 'next/server';

package/dist/auth/index.d.ts

@@ -3,7 +3,7 @@ export { SetupGoogleAuthOptions, setupGoogleAuth } from './google/index.js';
 export { SetupInstagramAuthOptions, setupInstagramAuth } from './instagram/index.js';
 export { getRefreshToken } from './utils/token.js';
 export { AuthFetch, AuthWrapper } from './email/next.js';
-export { checkAuthStatus, generateAccessToken, generateRefreshToken } from './email/token.js';
+export { checkAuthStatus, getTokenizedResponse } from './email/token.js';
 export { getContext } from './email/utils.js';
 export { getRefreshedInstagramAccessToken } from './instagram/utils.js';
 import 'next/server';

package/dist/auth/index.esm.js

@@ -6,7 +6,6 @@ import { NextResponse } from "next/server";
 
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
-var REFRESH_HEADER_NAME = "X-Refresh-Token";
 
 // src/utils/route.ts
 function getCorsHeaders(origin, allowedOrigins) {
@@ -14,7 +13,7 @@ function getCorsHeaders(origin, allowedOrigins) {
   return {
     "Access-Control-Allow-Origin": origin,
     "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
-    "Access-Control-Allow-Headers": `Content-Type, Authorization, ${REFRESH_HEADER_NAME}`,
+    "Access-Control-Allow-Headers": `Content-Type, Authorization`,
     "Access-Control-Allow-Credentials": "true"
   };
 }
@@ -111,9 +110,10 @@ function generateAccessToken(id) {
 function generateRefreshToken(id) {
   return sign({ id }, getEnv("REFRESH_KEY" /* REFRESH_KEY */));
 }
-function getTokenizedResponse(accessToken, refreshToken) {
-  const body = { accessToken, refreshToken };
-  const response = NextResponse2.json(body, {
+function getTokenizedResponse(id) {
+  const accessToken = id ? generateAccessToken(id) : void 0;
+  const refreshToken = id ? generateRefreshToken(id) : void 0;
+  const response = NextResponse2.json(accessToken, {
     status: 200
   });
   if (!accessToken) {
@@ -254,12 +254,12 @@ var getDeleteRoute = (options) => async (req) => {
     const body = await req.json();
     await options.onLogout?.(ctx.userId, body);
   }
-  return getTokenizedResponse(void 0, "");
+  return getTokenizedResponse();
 };
 
 // src/auth/email/routes/get.ts
 var getGetRoute = (options) => async (req) => {
-  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value || req.headers.get(REFRESH_HEADER_NAME) || void 0;
+  const refresh = req.cookies.get(REFRESH_COOKIE_NAME)?.value || void 0;
   const userID = getUserIdFromRefreshToken(refresh);
   if (userID) {
     if (options.onRefresh) {
@@ -267,7 +267,7 @@ var getGetRoute = (options) => async (req) => {
       await options.onRefresh?.(userID, body);
     }
     return getTokenizedResponse(
-      generateAccessToken(userID)
+      userID
     );
   }
   return getTokenizedResponse();
@@ -282,10 +282,7 @@ var getPostRoute = (options) => async (req) => {
   if (existingUser) {
     if (await verifyUser(existingUser, data.password)) {
       return getTokenizedResponse(
-        generateAccessToken(existingUser.id),
-        generateRefreshToken(
-          existingUser.id
-        )
+        existingUser.id
       );
     }
     return handleError(400, "A user already exists", options.onError);
@@ -300,8 +297,7 @@ var getPostRoute = (options) => async (req) => {
       await options.onSignUp?.(newUser.id, data);
     }
     return getTokenizedResponse(
-      generateAccessToken(newUser.id),
-      generateRefreshToken(newUser.id)
+      newUser.id
     );
   }
   return getTokenizedResponse();
@@ -319,8 +315,7 @@ var getPutRoute = (options) => async (req) => {
       await options.onLogin?.(user.id, data);
     }
     return getTokenizedResponse(
-      generateAccessToken(user.id),
-      generateRefreshToken(user.id)
+      user.id
     );
   }
   return handleError(403, "Invalid password", options.onError);
@@ -385,8 +380,8 @@ function AuthFetch() {
     }
   );
 }
-function AuthWrapper({ children, getRefreshToken: getRefreshToken2, onTokenUpdate, skipInitialFetch }) {
-  return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(AuthWrapperClient, { skipInitialFetch: true, getRefreshToken: getRefreshToken2, onTokenUpdate }, !skipInitialFetch && /* @__PURE__ */ React2.createElement(AuthFetch, null), children));
+function AuthWrapper({ children, skipInitialFetch }) {
+  return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(AuthWrapperClient, { skipInitialFetch: true }, !skipInitialFetch && /* @__PURE__ */ React2.createElement(AuthFetch, null), children));
 }
 
 // src/auth/email/index.ts
@@ -488,17 +483,11 @@ var getGoogleGetRoute = ({
         const { data } = JSON.parse(localState);
         const id = await getUserIdFromEmail(user, data);
         if (id) {
-          const accessToken = generateAccessToken(
-            id
-          );
-          const refreshToken = generateRefreshToken(id);
           const targetUrl = new URL(finalRedirectURL, req.nextUrl.origin);
-          targetUrl.searchParams.set("accessToken", accessToken);
-          targetUrl.searchParams.set("refreshToken", refreshToken);
           const res = NextResponse5.redirect(targetUrl);
           res.cookies.set(
             REFRESH_COOKIE_NAME,
-            refreshToken,
+            generateRefreshToken(id),
             {
               httpOnly: true,
               secure: true
@@ -640,11 +629,10 @@ export {
   AuthFetch,
   AuthWrapper,
   checkAuthStatus,
-  generateAccessToken,
-  generateRefreshToken,
   getContext,
   getRefreshToken,
   getRefreshedInstagramAccessToken,
+  getTokenizedResponse,
   setupEmailAuth,
   setupGoogleAuth,
   setupInstagramAuth

package/dist/graphql/index.cjs.js

@@ -634,7 +634,6 @@ var import_server = require("next/server");
 
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
-var REFRESH_HEADER_NAME = "X-Refresh-Token";
 
 // src/utils/route.ts
 function getCorsHeaders(origin, allowedOrigins) {
@@ -642,7 +641,7 @@ function getCorsHeaders(origin, allowedOrigins) {
   return {
     "Access-Control-Allow-Origin": origin,
     "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
-    "Access-Control-Allow-Headers": `Content-Type, Authorization, ${REFRESH_HEADER_NAME}`,
+    "Access-Control-Allow-Headers": `Content-Type, Authorization`,
     "Access-Control-Allow-Credentials": "true"
   };
 }

package/dist/graphql/index.esm.js

@@ -619,7 +619,6 @@ import { NextResponse } from "next/server";
 
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
-var REFRESH_HEADER_NAME = "X-Refresh-Token";
 
 // src/utils/route.ts
 function getCorsHeaders(origin, allowedOrigins) {
@@ -627,7 +626,7 @@ function getCorsHeaders(origin, allowedOrigins) {
   return {
     "Access-Control-Allow-Origin": origin,
     "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
-    "Access-Control-Allow-Headers": `Content-Type, Authorization, ${REFRESH_HEADER_NAME}`,
+    "Access-Control-Allow-Headers": `Content-Type, Authorization`,
     "Access-Control-Allow-Credentials": "true"
   };
 }

package/dist/graphql/init.cjs.js

@@ -85,7 +85,6 @@ var import_server = require("next/server");
 
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
-var REFRESH_HEADER_NAME = "X-Refresh-Token";
 
 // src/utils/route.ts
 function getCorsHeaders(origin, allowedOrigins) {
@@ -93,7 +92,7 @@ function getCorsHeaders(origin, allowedOrigins) {
   return {
     "Access-Control-Allow-Origin": origin,
     "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
-    "Access-Control-Allow-Headers": `Content-Type, Authorization, ${REFRESH_HEADER_NAME}`,
+    "Access-Control-Allow-Headers": `Content-Type, Authorization`,
     "Access-Control-Allow-Credentials": "true"
   };
 }

package/dist/graphql/init.esm.js

@@ -66,7 +66,6 @@ import { NextResponse } from "next/server";
 
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
-var REFRESH_HEADER_NAME = "X-Refresh-Token";
 
 // src/utils/route.ts
 function getCorsHeaders(origin, allowedOrigins) {
@@ -74,7 +73,7 @@ function getCorsHeaders(origin, allowedOrigins) {
   return {
     "Access-Control-Allow-Origin": origin,
     "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
-    "Access-Control-Allow-Headers": `Content-Type, Authorization, ${REFRESH_HEADER_NAME}`,
+    "Access-Control-Allow-Headers": `Content-Type, Authorization`,
     "Access-Control-Allow-Credentials": "true"
   };
 }

package/dist/utils/route.cjs.js

@@ -28,7 +28,6 @@ var import_server = require("next/server");
 
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
-var REFRESH_HEADER_NAME = "X-Refresh-Token";
 
 // src/utils/route.ts
 function getCorsHeaders(origin, allowedOrigins) {
@@ -36,7 +35,7 @@ function getCorsHeaders(origin, allowedOrigins) {
   return {
     "Access-Control-Allow-Origin": origin,
     "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
-    "Access-Control-Allow-Headers": `Content-Type, Authorization, ${REFRESH_HEADER_NAME}`,
+    "Access-Control-Allow-Headers": `Content-Type, Authorization`,
     "Access-Control-Allow-Credentials": "true"
   };
 }

package/dist/utils/route.esm.js

@@ -3,7 +3,6 @@ import { NextResponse } from "next/server";
 
 // src/auth/constants.ts
 var REFRESH_COOKIE_NAME = "refresh";
-var REFRESH_HEADER_NAME = "X-Refresh-Token";
 
 // src/utils/route.ts
 function getCorsHeaders(origin, allowedOrigins) {
@@ -11,7 +10,7 @@ function getCorsHeaders(origin, allowedOrigins) {
   return {
     "Access-Control-Allow-Origin": origin,
     "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",
-    "Access-Control-Allow-Headers": `Content-Type, Authorization, ${REFRESH_HEADER_NAME}`,
+    "Access-Control-Allow-Headers": `Content-Type, Authorization`,
     "Access-Control-Allow-Credentials": "true"
   };
 }

package/package.json

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