@wix/astro 0.2.12 → 0.2.13

package/dist/middleware.js

@@ -4,6 +4,7 @@ import { z } from "astro/zod";
 import { WIX_CLIENT_ID } from "astro:env/client";
 import { defineMiddleware } from "astro:middleware";
 import { authStrategyAsyncLocalStorage } from "./auth-context.js";
+import { sessionCookieJson } from "./routes/auth/runtime.js";
 const sessionClient = createClient({
     auth: {
         async getAuthHeaders() {
@@ -29,12 +30,12 @@ function checkIsDynamicPageRequest(context) {
         return false;
     }
 }
-export const onRequest = defineMiddleware(async (context, next) => {
-    const wixSessionCookie = checkIsDynamicPageRequest(context)
-        ? context.cookies.get("wixSession")?.json()
-        : undefined;
-    let tokens;
-    if (wixSessionCookie) {
+function getSessionTokensFromCookie(context) {
+    if (!checkIsDynamicPageRequest(context)) {
+        return;
+    }
+    const rawCookie = context.cookies.get("wixSession")?.json();
+    if (rawCookie) {
         const tokensParseResult = z
             .object({
             clientId: z.string(),
@@ -49,38 +50,41 @@ export const onRequest = defineMiddleware(async (context, next) => {
                 }),
             }),
         })
-            .safeParse(wixSessionCookie);
-        if (!tokensParseResult.success) {
-            throw new Error(`Invalid wixSession cookie: ${tokensParseResult.error}`);
-        }
-        else {
-            if (tokensParseResult.data.clientId === WIX_CLIENT_ID) {
-                tokens = tokensParseResult.data.tokens;
-            }
+            .safeParse(rawCookie);
+        if (tokensParseResult.success &&
+            tokensParseResult.data.clientId === WIX_CLIENT_ID) {
+            return tokensParseResult.data;
         }
     }
-    let response;
-    if (WIX_CLIENT_ID) {
-        const auth = OAuthStrategy({
-            clientId: WIX_CLIENT_ID,
-            tokens,
-        });
-        response = await authStrategyAsyncLocalStorage.run({
-            auth,
-        }, () => next());
-        if (checkIsDynamicPageRequest(context)) {
-            context.cookies.set("wixSession", JSON.stringify({ clientId: WIX_CLIENT_ID, tokens: auth.getTokens() }), {
-                secure: true,
-                path: "/",
-            });
-        }
+}
+function saveSessionTokensToCookie(context, tokens) {
+    context.cookies.set("wixSession", sessionCookieJson(tokens), {
+        secure: true,
+        path: "/",
+    });
+}
+export const onRequest = defineMiddleware(async (context, next) => {
+    if (!WIX_CLIENT_ID) {
+        return next();
+    }
+    const sessionTokensFromCookie = getSessionTokensFromCookie(context);
+    const auth = OAuthStrategy({
+        clientId: WIX_CLIENT_ID,
+    });
+    if (sessionTokensFromCookie) {
+        auth.setTokens(sessionTokensFromCookie.tokens);
     }
     else {
-        console.warn(`
-      No Wix client ID found in the environment. Wix APIs will not be available.
-      `);
-        response = await next();
+        auth.setTokens(await auth.generateVisitorTokens());
+    }
+    const response = await authStrategyAsyncLocalStorage.run({
+        auth,
+    }, () => next());
+    if (checkIsDynamicPageRequest(context) &&
+        sessionTokensFromCookie?.tokens.accessToken.expiresAt !==
+            auth.getTokens().accessToken.expiresAt) {
+        saveSessionTokensToCookie(context, auth.getTokens());
     }
     return response;
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9taWRkbGV3YXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHNDQUFzQztBQUN0QyxPQUFPLEVBQUUsYUFBYSxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFFbEUsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUM5QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDakQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDcEQsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFbEUsTUFBTSxhQUFhLEdBQUcsWUFBWSxDQUFDO0lBQ2pDLElBQUksRUFBRTtRQUNKLEtBQUssQ0FBQyxjQUFjO1lBQ2xCLE1BQU0sSUFBSSxHQUFHLDZCQUE2QixDQUFDLFFBQVEsRUFBRSxFQUFFLElBQUksQ0FBQztZQUM1RCxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ1YsTUFBTSxJQUFJLEtBQUssQ0FDYix5REFBeUQsQ0FDMUQsQ0FBQztZQUNKLENBQUM7WUFFRCxPQUFPLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUMvQixDQUFDO0tBQ0Y7Q0FDRixDQUFDLENBQUM7QUFFSCxhQUFhLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBRXRDOzs7O0dBSUc7QUFDSCxTQUFTLHlCQUF5QixDQUNoQyxPQUF5QztJQUV6QyxJQUFJLENBQUM7UUFDSCxPQUFPLE9BQU8sQ0FBQyxhQUFhLElBQUksSUFBSSxDQUFDO0lBQ3ZDLENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7QUFDSCxDQUFDO0FBRUQsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLGdCQUFnQixDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9taWRkbGV3YXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHNDQUFzQztBQUN0QyxPQUFPLEVBQUUsYUFBYSxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFFbEUsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUM5QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDakQsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDcEQsT0FBTyxFQUFFLDZCQUE2QixFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFDbEUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFN0QsTUFBTSxhQUFhLEdBQUcsWUFBWSxDQUFDO0lBQ2pDLElBQUksRUFBRTtRQUNKLEtBQUssQ0FBQyxjQUFjO1lBQ2xCLE1BQU0sSUFBSSxHQUFHLDZCQUE2QixDQUFDLFFBQVEsRUFBRSxFQUFFLElBQUksQ0FBQztZQUM1RCxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7Z0JBQ1YsTUFBTSxJQUFJLEtBQUssQ0FDYix5REFBeUQsQ0FDMUQsQ0FBQztZQUNKLENBQUM7WUFFRCxPQUFPLElBQUksQ0FBQyxjQUFjLEVBQUUsQ0FBQztRQUMvQixDQUFDO0tBQ0Y7Q0FDRixDQUFDLENBQUM7QUFFSCxhQUFhLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBRXRDOzs7O0dBSUc7QUFDSCxTQUFTLHlCQUF5QixDQUNoQyxPQUF5QztJQUV6QyxJQUFJLENBQUM7UUFDSCxPQUFPLE9BQU8sQ0FBQyxhQUFhLElBQUksSUFBSSxDQUFDO0lBQ3ZDLENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7QUFDSCxDQUFDO0FBRUQsU0FBUywwQkFBMEIs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

package/dist/routes/auth/callback.d.ts

@@ -1,3 +1,3 @@
 import type { APIContext } from "astro";
 export declare const prerender = false;
-export declare function GET({ url, cookies }: APIContext): Promise<Response>;
+export declare function GET({ url, cookies, redirect }: APIContext): Promise<Response>;

package/dist/routes/auth/callback.js

@@ -1,9 +1,9 @@
+import pRetry from "p-retry";
 import { getAuth } from "../../runtime.js";
-import { getSessionCookieFromTokens } from "./runtime.js";
 import { OAUTH_COOKIE_STATE, WIX_LOGIN_REDIRECT } from "./constants.js";
-import pRetry from "p-retry";
+import { sessionCookieJson } from "./runtime.js";
 export const prerender = false;
-export async function GET({ url, cookies }) {
+export async function GET({ url, cookies, redirect }) {
     // Retrieve the OauthData from cookies
     const oauthStateCookie = cookies.get(OAUTH_COOKIE_STATE);
     const oauthData = oauthStateCookie ? JSON.parse(oauthStateCookie.value) : {};
@@ -31,19 +31,14 @@ export async function GET({ url, cookies }) {
                 console.error("Error getting member tokens", error);
             },
         });
-        // Create a response that redirects to the original URL
-        const response = new Response(null, {
-            status: 302,
-            headers: {
-                Location: originalUrl,
-            },
+        cookies.delete(OAUTH_COOKIE_STATE);
+        cookies.delete(WIX_LOGIN_REDIRECT);
+        cookies.set("wixSession", sessionCookieJson(memberTokens), {
+            maxAge: 60 * 60 * 24 * 2,
+            path: "/",
+            httpOnly: true,
         });
-        // Delete the OAUTH_COOKIE_STATE and WIX_LOGIN_REDIRECT cookies
-        response.headers.append("Set-Cookie", `${OAUTH_COOKIE_STATE}=; Max-Age=0; Path=/; HttpOnly; SameSite=Lax`);
-        response.headers.append("Set-Cookie", `${WIX_LOGIN_REDIRECT}=; Max-Age=0; Path=/; HttpOnly; SameSite=Lax`);
-        // Set the sesion cookie with a 2-day expiration
-        response.headers.append("Set-Cookie", `${getSessionCookieFromTokens(memberTokens)}; Max-Age=${60 * 60 * 24 * 2}; Path=/; HttpOnly; SameSite=Lax`);
-        return response;
+        return redirect(originalUrl);
     }
     catch (error) {
         console.error("Authentication error:", error);
@@ -55,4 +50,4 @@ export async function GET({ url, cookies }) {
         });
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FsbGJhY2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcm91dGVzL2F1dGgvY2FsbGJhY2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQzNDLE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUUxRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4RSxPQUFPLE1BQU0sTUFBTSxTQUFTLENBQUM7QUFFN0IsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLEtBQUssQ0FBQztBQUUvQixNQUFNLENBQUMsS0FBSyxVQUFVLEdBQUcsQ0FBQyxFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQWM7SUFDcEQsc0NBQXNDO0lBQ3RDLE1BQU0sZ0JBQWdCLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0lBQ3pELE1BQU0sU0FBUyxHQUFHLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7SUFFN0UsZ0RBQWdEO0lBQ2hELE1BQU0sV0FBVyxHQUFHLFNBQVMsQ0FBQyxXQUFXLElBQUksR0FBRyxDQUFDO0lBRWpELHFDQUFxQztJQUNyQyxJQUFJLEdBQUcsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7UUFDaEMsT0FBTyxJQUFJLFFBQVEsQ0FBQyxJQUFJLEVBQUU7WUFDeEIsTUFBTSxFQUFFLEdBQUc7WUFDWCxPQUFPLEVBQUU7Z0JBQ1AsUUFBUSxFQUFFLFdBQVc7YUFDdEI7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0lBRUQsNENBQTRDO0lBQzVDLE1BQU0sU0FBUyxHQUFHLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQy9CLE1BQU0sS0FBSyxHQUFHLFNBQVMsQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUN4RCxNQUFNLElBQUksR0FBRyxTQUFTLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUM7SUFFdEQsSUFBSSxDQUFDO1FBQ0gsOERBQThEO1FBQzlELE1BQU0sSUFBSSxHQUFHLE9BQU8sRUFBRSxDQUFDO1FBRXZCLE1BQU0sWUFBWSxHQUFHLE1BQU0sTUFBTSxDQUMvQixHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLElBQUksRUFBRSxLQUFLLEVBQUUsU0FBUyxDQUFDLEVBQ2xEO1lBQ0UsT0FBTyxFQUFFLENBQUM7WUFDVixlQUFlLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtnQkFDekIsT0FBTyxDQUFDLEtBQUssQ0FBQyw2QkFBNkIsRUFBRSxLQUFLLENBQUMsQ0FBQztZQUN0RCxDQUFDO1NBQ0YsQ0FDRixDQUFDO1FBRUYsdURBQXVEO1FBQ3ZELE1BQU0sUUFBUSxHQUFHLElBQUksUUFBUSxDQUFDLElBQUksRUFBRTtZQUNsQyxNQUFNLEVBQUUsR0FBRztZQUNYLE9BQU8sRUFBRTtnQkFDUCxRQUFRLEVBQUUsV0FBVzthQUN0QjtTQUNGLENBQUMsQ0FBQztRQUVILCtEQUErRDtRQUMvRCxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FDckIsWUFBWSxFQUNaLEdBQUcsa0JBQWtCLDhDQUE4QyxDQUNwRSxDQUFDO1FBQ0YsUUFBUSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQ3JCLFlBQVksRUFDWixHQUFHLGtCQUFrQiw4Q0FBOEMsQ0FDcEUsQ0FBQztRQUVGLGdEQUFnRDtRQUNoRCxRQUFRLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FDckIsWUFBWSxFQUNaLEdBQUcsMEJBQTBCLENBQUMsWUFBWSxDQUFDLGFBQ3pDLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQ2pCLGtDQUFrQyxDQUNuQyxDQUFDO1FBRUYsT0FBTyxRQUFRLENBQUM7SUFDbEIsQ0FBQztJQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7UUFDZixPQUFPLENBQUMsS0FBSyxDQUFDLHVCQUF1QixFQUFFLEtBQUssQ0FBQyxDQUFDO1FBQzlDLE9BQU8sSUFBSSxRQUFRLENBQUMsSUFBSSxFQUFFO1lBQ3hCLE1BQU0sRUFBRSxHQUFHO1lBQ1gsT0FBTyxFQUFFO2dCQUNQLFFBQVEsRUFBRSxrQkFBa0I7YUFDN0I7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0FBQ0gsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2FsbGJhY2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcm91dGVzL2F1dGgvY2FsbGJhY2sudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxNQUFNLE1BQU0sU0FBUyxDQUFDO0FBQzdCLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUMzQyxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4RSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFakQsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLEtBQUssQ0FBQztBQUUvQixNQUFNLENBQUMsS0FBSyxVQUFVLEdBQUcsQ0FBQyxFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFjO0lBQzlELHNDQUFzQztJQUN0QyxNQUFNLGdCQUFnQixHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsa0JBQWtCLENBQUMsQ0FBQztJQUN6RCxNQUFNLFNBQVMsR0FBRyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBRTdFLGdEQUFnRDtJQUNoRCxNQUFNLFdBQVcsR0FBRyxTQUFTLENBQUMsV0FBVyxJQUFJLEdBQUcsQ0FBQztJQUVqRCxxQ0FBcUM7SUFDckMsSUFBSSxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDO1FBQ2hDLE9BQU8sSUFBSSxRQUFRLENBQUMsSUFBSSxFQUFFO1lBQ3hCLE1BQU0sRUFBRSxHQUFHO1lBQ1gsT0FBTyxFQUFFO2dCQUNQLFFBQVEsRUFBRSxXQUFXO2FBQ3RCO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELDRDQUE0QztJQUM1QyxNQUFNLFNBQVMsR0FBRyxJQUFJLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMvQixNQUFNLEtBQUssR0FBRyxTQUFTLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7SUFDeEQsTUFBTSxJQUFJLEdBQUcsU0FBUyxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDO0lBRXRELElBQUksQ0FBQztRQUNILDhEQUE4RDtRQUM5RCxNQUFNLElBQUksR0FBRyxPQUFPLEVBQUUsQ0FBQztRQUV2QixNQUFNLFlBQVksR0FBRyxNQUFNLE1BQU0sQ0FDL0IsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLFNBQVMsQ0FBQyxFQUNsRDtZQUNFLE9BQU8sRUFBRSxDQUFDO1lBQ1YsZUFBZSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7Z0JBQ3pCLE9BQU8sQ0FBQyxLQUFLLENBQUMsNkJBQTZCLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFDdEQsQ0FBQztTQUNGLENBQ0YsQ0FBQztRQUVGLE9BQU8sQ0FBQyxNQUFNLENBQUMsa0JBQWtCLENBQUMsQ0FBQztRQUNuQyxPQUFPLENBQUMsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUM7UUFDbkMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFZLEVBQUUsaUJBQWlCLENBQUMsWUFBWSxDQUFDLEVBQUU7WUFDekQsTUFBTSxFQUFFLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLENBQUM7WUFDeEIsSUFBSSxFQUFFLEdBQUc7WUFDVCxRQUFRLEVBQUUsSUFBSTtTQUNmLENBQUMsQ0FBQztRQUVILE9BQU8sUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0lBQy9CLENBQUM7SUFBQyxPQUFPLEtBQUssRUFBRSxDQUFDO1FBQ2YsT0FBTyxDQUFDLEtBQUssQ0FBQyx1QkFBdUIsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUM5QyxPQUFPLElBQUksUUFBUSxDQUFDLElBQUksRUFBRTtZQUN4QixNQUFNLEVBQUUsR0FBRztZQUNYLE9BQU8sRUFBRTtnQkFDUCxRQUFRLEVBQUUsa0JBQWtCO2FBQzdCO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztBQUNILENBQUMifQ==

package/dist/routes/auth/logout-callback.js

@@ -1,16 +1,10 @@
 import { getAuth } from "../../runtime.js";
-import { getSessionCookieFromTokens } from "./runtime.js";
+import { sessionCookieJson } from "./runtime.js";
 export const prerender = false;
-export const GET = async ({ request }) => {
+export const GET = async ({ request, redirect, cookies }) => {
     const returnTo = new URL(request.url).searchParams.get("returnTo") ?? "/";
     const tokens = await getAuth().generateVisitorTokens();
-    const response = new Response(null, {
-        status: 302,
-        headers: {
-            Location: returnTo,
-        },
-    });
-    response.headers.append("Set-Cookie", `${getSessionCookieFromTokens(tokens)}; Max-Age=${60 * 60 * 24 * 2}; Path=/; HttpOnly; SameSite=Lax`);
-    return response;
+    cookies.set("wixSession", sessionCookieJson(tokens));
+    return redirect(returnTo);
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nb3V0LWNhbGxiYWNrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3JvdXRlcy9hdXRoL2xvZ291dC1jYWxsYmFjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDM0MsT0FBTyxFQUFFLDBCQUEwQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRzFELE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUM7QUFFL0IsTUFBTSxDQUFDLE1BQU0sR0FBRyxHQUFhLEtBQUssRUFBRSxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUU7SUFDakQsTUFBTSxRQUFRLEdBQUcsSUFBSSxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLElBQUksR0FBRyxDQUFDO0lBRTFFLE1BQU0sTUFBTSxHQUFHLE1BQU0sT0FBTyxFQUFFLENBQUMscUJBQXFCLEVBQUUsQ0FBQztJQUV2RCxNQUFNLFFBQVEsR0FBRyxJQUFJLFFBQVEsQ0FBQyxJQUFJLEVBQUU7UUFDbEMsTUFBTSxFQUFFLEdBQUc7UUFDWCxPQUFPLEVBQUU7WUFDUCxRQUFRLEVBQUUsUUFBUTtTQUNuQjtLQUNGLENBQUMsQ0FBQztJQUVILFFBQVEsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUNyQixZQUFZLEVBQ1osR0FBRywwQkFBMEIsQ0FBQyxNQUFNLENBQUMsYUFDbkMsRUFBRSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FDakIsa0NBQWtDLENBQ25DLENBQUM7SUFFRixPQUFPLFFBQVEsQ0FBQztBQUNsQixDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nb3V0LWNhbGxiYWNrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3JvdXRlcy9hdXRoL2xvZ291dC1jYWxsYmFjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDM0MsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRWpELE1BQU0sQ0FBQyxNQUFNLFNBQVMsR0FBRyxLQUFLLENBQUM7QUFFL0IsTUFBTSxDQUFDLE1BQU0sR0FBRyxHQUFhLEtBQUssRUFBRSxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLEVBQUUsRUFBRTtJQUNwRSxNQUFNLFFBQVEsR0FBRyxJQUFJLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsSUFBSSxHQUFHLENBQUM7SUFFMUUsTUFBTSxNQUFNLEdBQUcsTUFBTSxPQUFPLEVBQUUsQ0FBQyxxQkFBcUIsRUFBRSxDQUFDO0lBRXZELE9BQU8sQ0FBQyxHQUFHLENBQUMsWUFBWSxFQUFFLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7SUFFckQsT0FBTyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUM7QUFDNUIsQ0FBQyxDQUFDIn0=

package/dist/routes/auth/logout.d.ts

@@ -1,3 +1,3 @@
 import type { APIContext } from "astro";
 export declare const prerender = false;
-export declare function GET({ request }: APIContext): Promise<Response>;
+export declare function GET({ request, redirect }: APIContext): Promise<Response>;

package/dist/routes/auth/logout.js

@@ -1,11 +1,11 @@
 import { getAuth } from "../../runtime.js";
 export const prerender = false;
-export async function GET({ request }) {
+export async function GET({ request, redirect }) {
     const returnTo = request.headers.get("Referer") ?? "/";
     const baseUrl = new URL(request.url).origin + "/" + import.meta.env.BASE_URL;
     const postFlowUrl = new URL("/api/auth/logout-callback", baseUrl);
     postFlowUrl.searchParams.set("returnTo", returnTo);
     const { logoutUrl } = await getAuth().logout(postFlowUrl.toString());
-    return Response.redirect(logoutUrl);
+    return redirect(logoutUrl);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nb3V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3JvdXRlcy9hdXRoL2xvZ291dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHM0MsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLEtBQUssQ0FBQztBQUUvQixNQUFNLENBQUMsS0FBSyxVQUFVLEdBQUcsQ0FBQyxFQUFFLE9BQU8sRUFBYztJQUMvQyxNQUFNLFFBQVEsR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsSUFBSSxHQUFHLENBQUM7SUFDdkQsTUFBTSxPQUFPLEdBQUcsSUFBSSxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sR0FBRyxHQUFHLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO0lBQzdFLE1BQU0sV0FBVyxHQUFHLElBQUksR0FBRyxDQUFDLDJCQUEyQixFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQ2xFLFdBQVcsQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFVBQVUsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUVuRCxNQUFNLEVBQUUsU0FBUyxFQUFFLEdBQUcsTUFBTSxPQUFPLEVBQUUsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7SUFFckUsT0FBTyxRQUFRLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQ3RDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nb3V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3JvdXRlcy9hdXRoL2xvZ291dC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFHM0MsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLEtBQUssQ0FBQztBQUUvQixNQUFNLENBQUMsS0FBSyxVQUFVLEdBQUcsQ0FBQyxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQWM7SUFDekQsTUFBTSxRQUFRLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLElBQUksR0FBRyxDQUFDO0lBQ3ZELE1BQU0sT0FBTyxHQUFHLElBQUksR0FBRyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLEdBQUcsR0FBRyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztJQUM3RSxNQUFNLFdBQVcsR0FBRyxJQUFJLEdBQUcsQ0FBQywyQkFBMkIsRUFBRSxPQUFPLENBQUMsQ0FBQztJQUNsRSxXQUFXLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFFbkQsTUFBTSxFQUFFLFNBQVMsRUFBRSxHQUFHLE1BQU0sT0FBTyxFQUFFLENBQUMsTUFBTSxDQUFDLFdBQVcsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBRXJFLE9BQU8sUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzdCLENBQUMifQ==

package/dist/routes/auth/runtime.d.ts

@@ -1,2 +1,5 @@
 import { Tokens } from "@wix/sdk";
-export declare function getSessionCookieFromTokens(tokens: Tokens): string;
+export declare function sessionCookieJson(tokens: Tokens): {
+    clientId: string | undefined;
+    tokens: Tokens;
+};

package/dist/routes/auth/runtime.js

@@ -1,8 +1,8 @@
 import { WIX_CLIENT_ID } from "astro:env/client";
-export function getSessionCookieFromTokens(tokens) {
-    return `wixSession=${JSON.stringify({
+export function sessionCookieJson(tokens) {
+    return {
         clientId: WIX_CLIENT_ID,
         tokens,
-    })}`;
+    };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVudGltZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9yb3V0ZXMvYXV0aC9ydW50aW1lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVqRCxNQUFNLFVBQVUsMEJBQTBCLENBQUMsTUFBYztJQUN2RCxPQUFPLGNBQWMsSUFBSSxDQUFDLFNBQVMsQ0FBQztRQUNsQyxRQUFRLEVBQUUsYUFBYTtRQUN2QixNQUFNO0tBQ1AsQ0FBQyxFQUFFLENBQUM7QUFDUCxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVudGltZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9yb3V0ZXMvYXV0aC9ydW50aW1lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUVqRCxNQUFNLFVBQVUsaUJBQWlCLENBQUMsTUFBYztJQUM5QyxPQUFPO1FBQ0wsUUFBUSxFQUFFLGFBQWE7UUFDdkIsTUFBTTtLQUNQLENBQUM7QUFDSixDQUFDIn0=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wix/astro",
   "description": "Develop your Astro site on the Wix Platform",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "type": "module",
   "license": "MIT",
   "keywords": [