naystack 1.7.6 → 1.7.10

package/dist/auth/client.cjs.js

@@ -123,7 +123,7 @@ function AuthChildComponent({ getRefreshToken }) {
   useAuthFetch({ getRefreshToken });
   return null;
 }
-function useAuthFetch({ getRefreshToken, skip }) {
+function useAuthFetch({ getRefreshToken, skip } = {}) {
   const setToken = useSetToken();
   const fetchToken = async () => {
     const token = getRefreshToken ? await getRefreshToken() : null;

package/dist/auth/client.esm.js

@@ -85,7 +85,7 @@ function AuthChildComponent({ getRefreshToken }) {
   useAuthFetch({ getRefreshToken });
   return null;
 }
-function useAuthFetch({ getRefreshToken, skip }) {
+function useAuthFetch({ getRefreshToken, skip } = {}) {
   const setToken = useSetToken();
   const fetchToken = async () => {
     const token = getRefreshToken ? await getRefreshToken() : null;

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

@@ -120,7 +120,7 @@ function AuthChildComponent({ getRefreshToken }) {
   useAuthFetch({ getRefreshToken });
   return null;
 }
-function useAuthFetch({ getRefreshToken, skip }) {
+function useAuthFetch({ getRefreshToken, skip } = {}) {
   const setToken = useSetToken();
   const fetchToken = async () => {
     const token = getRefreshToken ? await getRefreshToken() : null;

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

@@ -54,7 +54,7 @@ declare const AuthWrapper: ({ children, onTokenUpdate, getRefreshToken, skipInit
  *
  * @category Auth
  */
-declare function useAuthFetch({ getRefreshToken, skip }: {
+declare function useAuthFetch({ getRefreshToken, skip }?: {
     getRefreshToken?: () => Promise<string | null>;
     skip?: boolean;
 }): void;

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

@@ -54,7 +54,7 @@ declare const AuthWrapper: ({ children, onTokenUpdate, getRefreshToken, skipInit
  *
  * @category Auth
  */
-declare function useAuthFetch({ getRefreshToken, skip }: {
+declare function useAuthFetch({ getRefreshToken, skip }?: {
     getRefreshToken?: () => Promise<string | null>;
     skip?: boolean;
 }): void;

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

@@ -85,7 +85,7 @@ function AuthChildComponent({ getRefreshToken }) {
   useAuthFetch({ getRefreshToken });
   return null;
 }
-function useAuthFetch({ getRefreshToken, skip }) {
+function useAuthFetch({ getRefreshToken, skip } = {}) {
   const setToken = useSetToken();
   const fetchToken = async () => {
     const token = getRefreshToken ? await getRefreshToken() : null;

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

@@ -70,6 +70,15 @@ function withCors(handler, allowedOrigins) {
     Object.entries(corsHeaders).forEach(([key, value]) => {
       response.headers.set(key, value);
     });
+    if (response instanceof import_server.NextResponse) {
+      const refreshCookie = response.cookies.get(REFRESH_COOKIE_NAME);
+      if (refreshCookie) {
+        response.cookies.set(refreshCookie.name, refreshCookie.value, {
+          ...refreshCookie,
+          sameSite: "none"
+        });
+      }
+    }
     return response;
   });
 }
@@ -147,14 +156,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
   });
   if (!accessToken) {
     response.cookies.set(REFRESH_COOKIE_NAME, "", {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
     response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
     });

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

@@ -32,6 +32,15 @@ function withCors(handler, allowedOrigins) {
     Object.entries(corsHeaders).forEach(([key, value]) => {
       response.headers.set(key, value);
     });
+    if (response instanceof NextResponse) {
+      const refreshCookie = response.cookies.get(REFRESH_COOKIE_NAME);
+      if (refreshCookie) {
+        response.cookies.set(refreshCookie.name, refreshCookie.value, {
+          ...refreshCookie,
+          sameSite: "none"
+        });
+      }
+    }
     return response;
   });
 }
@@ -109,14 +118,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
   });
   if (!accessToken) {
     response.cookies.set(REFRESH_COOKIE_NAME, "", {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
     response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
     });

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

@@ -92,14 +92,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
   });
   if (!accessToken) {
     response.cookies.set(REFRESH_COOKIE_NAME, "", {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
     response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
     });

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

@@ -66,14 +66,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
   });
   if (!accessToken) {
     response.cookies.set(REFRESH_COOKIE_NAME, "", {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
     response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
     });

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

@@ -96,14 +96,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
   });
   if (!accessToken) {
     response.cookies.set(REFRESH_COOKIE_NAME, "", {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
     response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
     });

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

@@ -70,14 +70,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
   });
   if (!accessToken) {
     response.cookies.set(REFRESH_COOKIE_NAME, "", {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
     response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
     });

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

@@ -109,14 +109,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
   });
   if (!accessToken) {
     response.cookies.set(REFRESH_COOKIE_NAME, "", {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
     response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
     });

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

@@ -85,14 +85,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
   });
   if (!accessToken) {
     response.cookies.set(REFRESH_COOKIE_NAME, "", {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
     response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
     });

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

@@ -108,14 +108,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
   });
   if (!accessToken) {
     response.cookies.set(REFRESH_COOKIE_NAME, "", {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
     response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
     });

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

@@ -82,14 +82,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
   });
   if (!accessToken) {
     response.cookies.set(REFRESH_COOKIE_NAME, "", {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
     response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
     });

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

@@ -104,14 +104,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
   });
   if (!accessToken) {
     response.cookies.set(REFRESH_COOKIE_NAME, "", {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
     response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
     });

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

@@ -74,14 +74,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
   });
   if (!accessToken) {
     response.cookies.set(REFRESH_COOKIE_NAME, "", {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
     response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
     });

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

@@ -88,6 +88,11 @@ function getEnv(key, skipCheck) {
 var REFRESH_COOKIE_NAME = "refresh";
 
 // src/auth/email/token.ts
+function generateAccessToken(id, signingKey) {
+  return (0, import_jsonwebtoken.sign)({ id }, signingKey, {
+    expiresIn: "2h"
+  });
+}
 function generateRefreshToken(id, refreshKey) {
   return (0, import_jsonwebtoken.sign)({ id }, refreshKey);
 }
@@ -109,7 +114,14 @@ var getGoogleGetRoute = ({
     const error = req.nextUrl.searchParams.get("error");
     if (!code && !error) {
       const data = req.nextUrl.searchParams.get("data");
-      const stateData = { data, id: (0, import_uuid.v4)() };
+      const requestRedirectURL = req.nextUrl.searchParams.get("redirectURL") || void 0;
+      const requestErrorRedirectURL = req.nextUrl.searchParams.get("errorRedirectURL") || void 0;
+      const stateData = {
+        data,
+        id: (0, import_uuid.v4)(),
+        redirectURL: requestRedirectURL,
+        errorRedirectURL: requestErrorRedirectURL
+      };
       const state2 = JSON.stringify(stateData);
       const authorizationUrl = oauth2Client.generateAuthUrl({
         scope: [
@@ -128,14 +140,25 @@ var getGoogleGetRoute = ({
       });
       return res;
     }
-    const errorURL = errorRedirectURL || redirectURL;
+    const localState = req.cookies.get("state")?.value;
+    let stateRedirectURL;
+    let stateErrorRedirectURL;
+    if (localState) {
+      try {
+        const parsed = JSON.parse(localState);
+        stateRedirectURL = parsed.redirectURL || void 0;
+        stateErrorRedirectURL = parsed.errorRedirectURL || void 0;
+      } catch {
+      }
+    }
+    const finalRedirectURL = stateRedirectURL || redirectURL;
+    const finalErrorURL = stateErrorRedirectURL || errorRedirectURL || finalRedirectURL;
     if (error) {
-      return import_server2.NextResponse.redirect(errorURL);
+      return import_server2.NextResponse.redirect(finalErrorURL);
     }
     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(errorURL);
+      if (localState !== state) return import_server2.NextResponse.redirect(finalErrorURL);
       const { tokens } = await oauth2Client.getToken(code);
       oauth2Client.setCredentials(tokens);
       const userInfoRequest = await import_googleapis.google.oauth2({
@@ -147,7 +170,13 @@ var getGoogleGetRoute = ({
         const { data } = JSON.parse(localState);
         const id = await getUserIdFromEmail(user, data);
         if (id) {
-          const res = import_server2.NextResponse.redirect(redirectURL);
+          const accessToken = generateAccessToken(
+            id,
+            getEnv("SIGNING_KEY" /* SIGNING_KEY */)
+          );
+          const targetUrl = new URL(finalRedirectURL, req.nextUrl.origin);
+          targetUrl.searchParams.set("accessToken", accessToken);
+          const res = import_server2.NextResponse.redirect(targetUrl);
           res.cookies.set(
             REFRESH_COOKIE_NAME,
             generateRefreshToken(id, getEnv("REFRESH_KEY" /* REFRESH_KEY */)),
@@ -165,7 +194,7 @@ var getGoogleGetRoute = ({
         }
       }
     }
-    return import_server2.NextResponse.redirect(errorURL);
+    return import_server2.NextResponse.redirect(finalErrorURL);
   };
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -64,6 +64,11 @@ function getEnv(key, skipCheck) {
 var REFRESH_COOKIE_NAME = "refresh";
 
 // src/auth/email/token.ts
+function generateAccessToken(id, signingKey) {
+  return sign({ id }, signingKey, {
+    expiresIn: "2h"
+  });
+}
 function generateRefreshToken(id, refreshKey) {
   return sign({ id }, refreshKey);
 }
@@ -85,7 +90,14 @@ var getGoogleGetRoute = ({
     const error = req.nextUrl.searchParams.get("error");
     if (!code && !error) {
       const data = req.nextUrl.searchParams.get("data");
-      const stateData = { data, id: v4() };
+      const requestRedirectURL = req.nextUrl.searchParams.get("redirectURL") || void 0;
+      const requestErrorRedirectURL = req.nextUrl.searchParams.get("errorRedirectURL") || void 0;
+      const stateData = {
+        data,
+        id: v4(),
+        redirectURL: requestRedirectURL,
+        errorRedirectURL: requestErrorRedirectURL
+      };
       const state2 = JSON.stringify(stateData);
       const authorizationUrl = oauth2Client.generateAuthUrl({
         scope: [
@@ -104,14 +116,25 @@ var getGoogleGetRoute = ({
       });
       return res;
     }
-    const errorURL = errorRedirectURL || redirectURL;
+    const localState = req.cookies.get("state")?.value;
+    let stateRedirectURL;
+    let stateErrorRedirectURL;
+    if (localState) {
+      try {
+        const parsed = JSON.parse(localState);
+        stateRedirectURL = parsed.redirectURL || void 0;
+        stateErrorRedirectURL = parsed.errorRedirectURL || void 0;
+      } catch {
+      }
+    }
+    const finalRedirectURL = stateRedirectURL || redirectURL;
+    const finalErrorURL = stateErrorRedirectURL || errorRedirectURL || finalRedirectURL;
     if (error) {
-      return NextResponse2.redirect(errorURL);
+      return NextResponse2.redirect(finalErrorURL);
     }
     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(errorURL);
+      if (localState !== state) return NextResponse2.redirect(finalErrorURL);
       const { tokens } = await oauth2Client.getToken(code);
       oauth2Client.setCredentials(tokens);
       const userInfoRequest = await google.oauth2({
@@ -123,7 +146,13 @@ var getGoogleGetRoute = ({
         const { data } = JSON.parse(localState);
         const id = await getUserIdFromEmail(user, data);
         if (id) {
-          const res = NextResponse2.redirect(redirectURL);
+          const accessToken = generateAccessToken(
+            id,
+            getEnv("SIGNING_KEY" /* SIGNING_KEY */)
+          );
+          const targetUrl = new URL(finalRedirectURL, req.nextUrl.origin);
+          targetUrl.searchParams.set("accessToken", accessToken);
+          const res = NextResponse2.redirect(targetUrl);
           res.cookies.set(
             REFRESH_COOKIE_NAME,
             generateRefreshToken(id, getEnv("REFRESH_KEY" /* REFRESH_KEY */)),
@@ -141,7 +170,7 @@ var getGoogleGetRoute = ({
         }
       }
     }
-    return NextResponse2.redirect(errorURL);
+    return NextResponse2.redirect(finalErrorURL);
   };
 };
 export {

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

@@ -90,6 +90,11 @@ function getEnv(key, skipCheck) {
 var REFRESH_COOKIE_NAME = "refresh";
 
 // src/auth/email/token.ts
+function generateAccessToken(id, signingKey) {
+  return (0, import_jsonwebtoken.sign)({ id }, signingKey, {
+    expiresIn: "2h"
+  });
+}
 function generateRefreshToken(id, refreshKey) {
   return (0, import_jsonwebtoken.sign)({ id }, refreshKey);
 }
@@ -111,7 +116,14 @@ var getGoogleGetRoute = ({
     const error = req.nextUrl.searchParams.get("error");
     if (!code && !error) {
       const data = req.nextUrl.searchParams.get("data");
-      const stateData = { data, id: (0, import_uuid.v4)() };
+      const requestRedirectURL = req.nextUrl.searchParams.get("redirectURL") || void 0;
+      const requestErrorRedirectURL = req.nextUrl.searchParams.get("errorRedirectURL") || void 0;
+      const stateData = {
+        data,
+        id: (0, import_uuid.v4)(),
+        redirectURL: requestRedirectURL,
+        errorRedirectURL: requestErrorRedirectURL
+      };
       const state2 = JSON.stringify(stateData);
       const authorizationUrl = oauth2Client.generateAuthUrl({
         scope: [
@@ -130,14 +142,25 @@ var getGoogleGetRoute = ({
       });
       return res;
     }
-    const errorURL = errorRedirectURL || redirectURL;
+    const localState = req.cookies.get("state")?.value;
+    let stateRedirectURL;
+    let stateErrorRedirectURL;
+    if (localState) {
+      try {
+        const parsed = JSON.parse(localState);
+        stateRedirectURL = parsed.redirectURL || void 0;
+        stateErrorRedirectURL = parsed.errorRedirectURL || void 0;
+      } catch {
+      }
+    }
+    const finalRedirectURL = stateRedirectURL || redirectURL;
+    const finalErrorURL = stateErrorRedirectURL || errorRedirectURL || finalRedirectURL;
     if (error) {
-      return import_server2.NextResponse.redirect(errorURL);
+      return import_server2.NextResponse.redirect(finalErrorURL);
     }
     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(errorURL);
+      if (localState !== state) return import_server2.NextResponse.redirect(finalErrorURL);
       const { tokens } = await oauth2Client.getToken(code);
       oauth2Client.setCredentials(tokens);
       const userInfoRequest = await import_googleapis.google.oauth2({
@@ -149,7 +172,13 @@ var getGoogleGetRoute = ({
         const { data } = JSON.parse(localState);
         const id = await getUserIdFromEmail(user, data);
         if (id) {
-          const res = import_server2.NextResponse.redirect(redirectURL);
+          const accessToken = generateAccessToken(
+            id,
+            getEnv("SIGNING_KEY" /* SIGNING_KEY */)
+          );
+          const targetUrl = new URL(finalRedirectURL, req.nextUrl.origin);
+          targetUrl.searchParams.set("accessToken", accessToken);
+          const res = import_server2.NextResponse.redirect(targetUrl);
           res.cookies.set(
             REFRESH_COOKIE_NAME,
             generateRefreshToken(id, getEnv("REFRESH_KEY" /* REFRESH_KEY */)),
@@ -167,7 +196,7 @@ var getGoogleGetRoute = ({
         }
       }
     }
-    return import_server2.NextResponse.redirect(errorURL);
+    return import_server2.NextResponse.redirect(finalErrorURL);
   };
 };
 

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

@@ -64,6 +64,11 @@ function getEnv(key, skipCheck) {
 var REFRESH_COOKIE_NAME = "refresh";
 
 // src/auth/email/token.ts
+function generateAccessToken(id, signingKey) {
+  return sign({ id }, signingKey, {
+    expiresIn: "2h"
+  });
+}
 function generateRefreshToken(id, refreshKey) {
   return sign({ id }, refreshKey);
 }
@@ -85,7 +90,14 @@ var getGoogleGetRoute = ({
     const error = req.nextUrl.searchParams.get("error");
     if (!code && !error) {
       const data = req.nextUrl.searchParams.get("data");
-      const stateData = { data, id: v4() };
+      const requestRedirectURL = req.nextUrl.searchParams.get("redirectURL") || void 0;
+      const requestErrorRedirectURL = req.nextUrl.searchParams.get("errorRedirectURL") || void 0;
+      const stateData = {
+        data,
+        id: v4(),
+        redirectURL: requestRedirectURL,
+        errorRedirectURL: requestErrorRedirectURL
+      };
       const state2 = JSON.stringify(stateData);
       const authorizationUrl = oauth2Client.generateAuthUrl({
         scope: [
@@ -104,14 +116,25 @@ var getGoogleGetRoute = ({
       });
       return res;
     }
-    const errorURL = errorRedirectURL || redirectURL;
+    const localState = req.cookies.get("state")?.value;
+    let stateRedirectURL;
+    let stateErrorRedirectURL;
+    if (localState) {
+      try {
+        const parsed = JSON.parse(localState);
+        stateRedirectURL = parsed.redirectURL || void 0;
+        stateErrorRedirectURL = parsed.errorRedirectURL || void 0;
+      } catch {
+      }
+    }
+    const finalRedirectURL = stateRedirectURL || redirectURL;
+    const finalErrorURL = stateErrorRedirectURL || errorRedirectURL || finalRedirectURL;
     if (error) {
-      return NextResponse2.redirect(errorURL);
+      return NextResponse2.redirect(finalErrorURL);
     }
     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(errorURL);
+      if (localState !== state) return NextResponse2.redirect(finalErrorURL);
       const { tokens } = await oauth2Client.getToken(code);
       oauth2Client.setCredentials(tokens);
       const userInfoRequest = await google.oauth2({
@@ -123,7 +146,13 @@ var getGoogleGetRoute = ({
         const { data } = JSON.parse(localState);
         const id = await getUserIdFromEmail(user, data);
         if (id) {
-          const res = NextResponse2.redirect(redirectURL);
+          const accessToken = generateAccessToken(
+            id,
+            getEnv("SIGNING_KEY" /* SIGNING_KEY */)
+          );
+          const targetUrl = new URL(finalRedirectURL, req.nextUrl.origin);
+          targetUrl.searchParams.set("accessToken", accessToken);
+          const res = NextResponse2.redirect(targetUrl);
           res.cookies.set(
             REFRESH_COOKIE_NAME,
             generateRefreshToken(id, getEnv("REFRESH_KEY" /* REFRESH_KEY */)),
@@ -141,7 +170,7 @@ var getGoogleGetRoute = ({
         }
       }
     }
-    return NextResponse2.redirect(errorURL);
+    return NextResponse2.redirect(finalErrorURL);
   };
 };
 

package/dist/auth/index.cjs.js

@@ -76,6 +76,15 @@ function withCors(handler, allowedOrigins) {
     Object.entries(corsHeaders).forEach(([key, value]) => {
       response.headers.set(key, value);
     });
+    if (response instanceof import_server.NextResponse) {
+      const refreshCookie = response.cookies.get(REFRESH_COOKIE_NAME);
+      if (refreshCookie) {
+        response.cookies.set(refreshCookie.name, refreshCookie.value, {
+          ...refreshCookie,
+          sameSite: "none"
+        });
+      }
+    }
     return response;
   });
 }
@@ -153,14 +162,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
   });
   if (!accessToken) {
     response.cookies.set(REFRESH_COOKIE_NAME, "", {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
     response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
     });
@@ -464,7 +473,14 @@ var getGoogleGetRoute = ({
     const error = req.nextUrl.searchParams.get("error");
     if (!code && !error) {
       const data = req.nextUrl.searchParams.get("data");
-      const stateData = { data, id: (0, import_uuid.v4)() };
+      const requestRedirectURL = req.nextUrl.searchParams.get("redirectURL") || void 0;
+      const requestErrorRedirectURL = req.nextUrl.searchParams.get("errorRedirectURL") || void 0;
+      const stateData = {
+        data,
+        id: (0, import_uuid.v4)(),
+        redirectURL: requestRedirectURL,
+        errorRedirectURL: requestErrorRedirectURL
+      };
       const state2 = JSON.stringify(stateData);
       const authorizationUrl = oauth2Client.generateAuthUrl({
         scope: [
@@ -483,14 +499,25 @@ var getGoogleGetRoute = ({
       });
       return res;
     }
-    const errorURL = errorRedirectURL || redirectURL;
+    const localState = req.cookies.get("state")?.value;
+    let stateRedirectURL;
+    let stateErrorRedirectURL;
+    if (localState) {
+      try {
+        const parsed = JSON.parse(localState);
+        stateRedirectURL = parsed.redirectURL || void 0;
+        stateErrorRedirectURL = parsed.errorRedirectURL || void 0;
+      } catch {
+      }
+    }
+    const finalRedirectURL = stateRedirectURL || redirectURL;
+    const finalErrorURL = stateErrorRedirectURL || errorRedirectURL || finalRedirectURL;
     if (error) {
-      return import_server6.NextResponse.redirect(errorURL);
+      return import_server6.NextResponse.redirect(finalErrorURL);
     }
     const state = req.nextUrl.searchParams.get("state") || void 0;
     if (code && state) {
-      const localState = req.cookies.get("state")?.value;
-      if (localState !== state) return import_server6.NextResponse.redirect(errorURL);
+      if (localState !== state) return import_server6.NextResponse.redirect(finalErrorURL);
       const { tokens } = await oauth2Client.getToken(code);
       oauth2Client.setCredentials(tokens);
       const userInfoRequest = await import_googleapis.google.oauth2({
@@ -502,7 +529,13 @@ var getGoogleGetRoute = ({
         const { data } = JSON.parse(localState);
         const id = await getUserIdFromEmail(user, data);
         if (id) {
-          const res = import_server6.NextResponse.redirect(redirectURL);
+          const accessToken = generateAccessToken(
+            id,
+            getEnv("SIGNING_KEY" /* SIGNING_KEY */)
+          );
+          const targetUrl = new URL(finalRedirectURL, req.nextUrl.origin);
+          targetUrl.searchParams.set("accessToken", accessToken);
+          const res = import_server6.NextResponse.redirect(targetUrl);
           res.cookies.set(
             REFRESH_COOKIE_NAME,
             generateRefreshToken(id, getEnv("REFRESH_KEY" /* REFRESH_KEY */)),
@@ -520,7 +553,7 @@ var getGoogleGetRoute = ({
         }
       }
     }
-    return import_server6.NextResponse.redirect(errorURL);
+    return import_server6.NextResponse.redirect(finalErrorURL);
   };
 };
 

package/dist/auth/index.esm.js

@@ -32,6 +32,15 @@ function withCors(handler, allowedOrigins) {
     Object.entries(corsHeaders).forEach(([key, value]) => {
       response.headers.set(key, value);
     });
+    if (response instanceof NextResponse) {
+      const refreshCookie = response.cookies.get(REFRESH_COOKIE_NAME);
+      if (refreshCookie) {
+        response.cookies.set(refreshCookie.name, refreshCookie.value, {
+          ...refreshCookie,
+          sameSite: "none"
+        });
+      }
+    }
     return response;
   });
 }
@@ -109,14 +118,14 @@ function getTokenizedResponse(accessToken, refreshToken) {
   });
   if (!accessToken) {
     response.cookies.set(REFRESH_COOKIE_NAME, "", {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: 0
     });
   }
   if (refreshToken !== void 0) {
     response.cookies.set(REFRESH_COOKIE_NAME, refreshToken, {
-      secure: false,
+      secure: true,
       httpOnly: true,
       expires: refreshToken === "" ? 0 : new Date(Date.now() + 60 * 60 * 24 * 365 * 1e3)
     });
@@ -424,7 +433,14 @@ var getGoogleGetRoute = ({
     const error = req.nextUrl.searchParams.get("error");
     if (!code && !error) {
       const data = req.nextUrl.searchParams.get("data");
-      const stateData = { data, id: v4() };
+      const requestRedirectURL = req.nextUrl.searchParams.get("redirectURL") || void 0;
+      const requestErrorRedirectURL = req.nextUrl.searchParams.get("errorRedirectURL") || void 0;
+      const stateData = {
+        data,
+        id: v4(),
+        redirectURL: requestRedirectURL,
+        errorRedirectURL: requestErrorRedirectURL
+      };
       const state2 = JSON.stringify(stateData);
       const authorizationUrl = oauth2Client.generateAuthUrl({
         scope: [
@@ -443,14 +459,25 @@ var getGoogleGetRoute = ({
       });
       return res;
     }
-    const errorURL = errorRedirectURL || redirectURL;
+    const localState = req.cookies.get("state")?.value;
+    let stateRedirectURL;
+    let stateErrorRedirectURL;
+    if (localState) {
+      try {
+        const parsed = JSON.parse(localState);
+        stateRedirectURL = parsed.redirectURL || void 0;
+        stateErrorRedirectURL = parsed.errorRedirectURL || void 0;
+      } catch {
+      }
+    }
+    const finalRedirectURL = stateRedirectURL || redirectURL;
+    const finalErrorURL = stateErrorRedirectURL || errorRedirectURL || finalRedirectURL;
     if (error) {
-      return NextResponse5.redirect(errorURL);
+      return NextResponse5.redirect(finalErrorURL);
     }
     const state = req.nextUrl.searchParams.get("state") || void 0;
     if (code && state) {
-      const localState = req.cookies.get("state")?.value;
-      if (localState !== state) return NextResponse5.redirect(errorURL);
+      if (localState !== state) return NextResponse5.redirect(finalErrorURL);
       const { tokens } = await oauth2Client.getToken(code);
       oauth2Client.setCredentials(tokens);
       const userInfoRequest = await google.oauth2({
@@ -462,7 +489,13 @@ var getGoogleGetRoute = ({
         const { data } = JSON.parse(localState);
         const id = await getUserIdFromEmail(user, data);
         if (id) {
-          const res = NextResponse5.redirect(redirectURL);
+          const accessToken = generateAccessToken(
+            id,
+            getEnv("SIGNING_KEY" /* SIGNING_KEY */)
+          );
+          const targetUrl = new URL(finalRedirectURL, req.nextUrl.origin);
+          targetUrl.searchParams.set("accessToken", accessToken);
+          const res = NextResponse5.redirect(targetUrl);
           res.cookies.set(
             REFRESH_COOKIE_NAME,
             generateRefreshToken(id, getEnv("REFRESH_KEY" /* REFRESH_KEY */)),
@@ -480,7 +513,7 @@ var getGoogleGetRoute = ({
         }
       }
     }
-    return NextResponse5.redirect(errorURL);
+    return NextResponse5.redirect(finalErrorURL);
   };
 };
 

package/dist/graphql/index.cjs.js

@@ -660,6 +660,15 @@ function withCors(handler, allowedOrigins) {
     Object.entries(corsHeaders).forEach(([key, value]) => {
       response.headers.set(key, value);
     });
+    if (response instanceof import_server.NextResponse) {
+      const refreshCookie = response.cookies.get(REFRESH_COOKIE_NAME);
+      if (refreshCookie) {
+        response.cookies.set(refreshCookie.name, refreshCookie.value, {
+          ...refreshCookie,
+          sameSite: "none"
+        });
+      }
+    }
     return response;
   });
 }

package/dist/graphql/index.esm.js

@@ -645,6 +645,15 @@ function withCors(handler, allowedOrigins) {
     Object.entries(corsHeaders).forEach(([key, value]) => {
       response.headers.set(key, value);
     });
+    if (response instanceof NextResponse) {
+      const refreshCookie = response.cookies.get(REFRESH_COOKIE_NAME);
+      if (refreshCookie) {
+        response.cookies.set(refreshCookie.name, refreshCookie.value, {
+          ...refreshCookie,
+          sameSite: "none"
+        });
+      }
+    }
     return response;
   });
 }

package/dist/graphql/init.cjs.js

@@ -111,6 +111,15 @@ function withCors(handler, allowedOrigins) {
     Object.entries(corsHeaders).forEach(([key, value]) => {
       response.headers.set(key, value);
     });
+    if (response instanceof import_server.NextResponse) {
+      const refreshCookie = response.cookies.get(REFRESH_COOKIE_NAME);
+      if (refreshCookie) {
+        response.cookies.set(refreshCookie.name, refreshCookie.value, {
+          ...refreshCookie,
+          sameSite: "none"
+        });
+      }
+    }
     return response;
   });
 }

package/dist/graphql/init.esm.js

@@ -92,6 +92,15 @@ function withCors(handler, allowedOrigins) {
     Object.entries(corsHeaders).forEach(([key, value]) => {
       response.headers.set(key, value);
     });
+    if (response instanceof NextResponse) {
+      const refreshCookie = response.cookies.get(REFRESH_COOKIE_NAME);
+      if (refreshCookie) {
+        response.cookies.set(refreshCookie.name, refreshCookie.value, {
+          ...refreshCookie,
+          sameSite: "none"
+        });
+      }
+    }
     return response;
   });
 }

package/dist/utils/route.cjs.js

@@ -27,6 +27,7 @@ module.exports = __toCommonJS(route_exports);
 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
@@ -53,6 +54,15 @@ function withCors(handler, allowedOrigins) {
     Object.entries(corsHeaders).forEach(([key, value]) => {
       response.headers.set(key, value);
     });
+    if (response instanceof import_server.NextResponse) {
+      const refreshCookie = response.cookies.get(REFRESH_COOKIE_NAME);
+      if (refreshCookie) {
+        response.cookies.set(refreshCookie.name, refreshCookie.value, {
+          ...refreshCookie,
+          sameSite: "none"
+        });
+      }
+    }
     return response;
   });
 }

package/dist/utils/route.esm.js

@@ -2,6 +2,7 @@
 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
@@ -28,6 +29,15 @@ function withCors(handler, allowedOrigins) {
     Object.entries(corsHeaders).forEach(([key, value]) => {
       response.headers.set(key, value);
     });
+    if (response instanceof NextResponse) {
+      const refreshCookie = response.cookies.get(REFRESH_COOKIE_NAME);
+      if (refreshCookie) {
+        response.cookies.set(refreshCookie.name, refreshCookie.value, {
+          ...refreshCookie,
+          sameSite: "none"
+        });
+      }
+    }
     return response;
   });
 }

package/package.json

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