@wix/astro 2.22.0 → 2.23.0

package/build/dependencies/astro-auth/backend-runtime/chunk-DZHZMKUF.js

@@ -0,0 +1,26 @@
+// src/utils/saveSessionTokensToCookie.ts
+import { WIX_CLIENT_ID } from "astro:env/client";
+
+// src/utils/sessionCookie.ts
+var SESSION_COOKIE_NAME = "wixSession";
+var SESSION_COOKIE_OPTIONS = {
+  path: "/",
+  secure: true,
+  ...import.meta.env.DEV && {
+    maxAge: 10800,
+    sameSite: "none"
+  }
+};
+
+// src/utils/saveSessionTokensToCookie.ts
+function saveSessionTokensToCookie(context, tokens) {
+  context.cookies.set(
+    SESSION_COOKIE_NAME,
+    { clientId: WIX_CLIENT_ID, tokens },
+    SESSION_COOKIE_OPTIONS
+  );
+}
+
+export {
+  saveSessionTokensToCookie
+};

package/build/dependencies/astro-auth/backend-runtime/middleware/auth.js

@@ -1,6 +1,6 @@
 import {
   saveSessionTokensToCookie
-} from "../chunk-HPW4ZAEJ.js";
+} from "../chunk-DZHZMKUF.js";
 import {
   contextualClient,
   elevatedContextualClient

package/build/dependencies/astro-auth/backend-runtime/routes/callback.js

@@ -1,6 +1,6 @@
 import {
   saveSessionTokensToCookie
-} from "../chunk-HPW4ZAEJ.js";
+} from "../chunk-DZHZMKUF.js";
 import {
   object,
   string

package/build/dependencies/astro-auth/backend-runtime/routes/logout-callback.js

@@ -1,6 +1,6 @@
 import {
   saveSessionTokensToCookie
-} from "../chunk-HPW4ZAEJ.js";
+} from "../chunk-DZHZMKUF.js";
 import {
   returnToQueryParamName
 } from "../chunk-24J7STEA.js";

package/build/dependencies/astro-auth/browser-runtime/setup.js

@@ -3,17 +3,48 @@ import { resolveContext } from "@wix/sdk-runtime/context";
 
 // src/runtime/client/utils.ts
 import { headlessSite } from "@wix/headless-site";
-import { createClient } from "@wix/sdk";
-import { SiteSessionAuth } from "@wix/sdk/auth/site-session";
+import { createClient, EMPTY_TOKENS, OAuthStrategy } from "@wix/sdk";
+
+// src/utils/sessionCookie.ts
+var SESSION_COOKIE_NAME = "wixSession";
+var SESSION_COOKIE_OPTIONS = {
+  path: "/",
+  secure: true,
+  ...import.meta.env.DEV && {
+    maxAge: 10800,
+    sameSite: "none"
+  }
+};
+
+// src/runtime/client/utils.ts
 function getSessionClient(options) {
+  const cookieStorage = {
+    getTokens: () => getCookieAsJson(SESSION_COOKIE_NAME)?.tokens ?? EMPTY_TOKENS,
+    setTokens: (tokens) => {
+      document.cookie = buildSessionCookieString(options.clientId, tokens);
+    }
+  };
   return createClient({
-    auth: SiteSessionAuth({
-      tokens: getCookieAsJson("wixSession")?.tokens,
+    auth: OAuthStrategy({
+      tokenStorage: cookieStorage,
       ...options
     }),
     host: headlessSite.host({})
   });
 }
+function buildSessionCookieString(clientId, tokens) {
+  const cookieValue = encodeURIComponent(
+    JSON.stringify({ clientId, tokens })
+  );
+  let cookie = `${SESSION_COOKIE_NAME}=${cookieValue}; path=${SESSION_COOKIE_OPTIONS.path}; ${SESSION_COOKIE_OPTIONS.secure ? "secure;" : ""}`;
+  if (SESSION_COOKIE_OPTIONS.sameSite) {
+    cookie += ` samesite=${SESSION_COOKIE_OPTIONS.sameSite};`;
+  }
+  if (SESSION_COOKIE_OPTIONS.maxAge != null) {
+    cookie += ` max-age=${SESSION_COOKIE_OPTIONS.maxAge}`;
+  }
+  return cookie;
+}
 function getCookieAsJson(name) {
   const cookies = document.cookie.split("; ");
   const cookie = cookies.find((row) => row.startsWith(`${name}=`));
@@ -35,6 +66,9 @@ function isCookieValue(value) {
   if (value == null || typeof value !== "object") {
     return false;
   }
+  if (!("clientId" in value) || typeof value.clientId !== "string") {
+    return false;
+  }
   if (!("tokens" in value)) {
     return false;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/astro",
-  "version": "2.22.0",
+  "version": "2.23.0",
   "dependencies": {
     "@wix/auth-management": "^1.0.71",
     "@wix/dashboard": "^1.3.40",
@@ -9,10 +9,10 @@
     "@wix/headless-node": "^1.28.0",
     "@wix/headless-site": "^1.28.0",
     "@wix/headless-site-assets": "^1.0.9",
-    "@wix/sdk": "^1.20.0",
+    "@wix/sdk": "^1.21.2",
     "@wix/sdk-runtime": "^1.0.0",
-    "@wix/sdk-types": "^1.17.0",
-    "@wix/site": "^1.37.0"
+    "@wix/sdk-types": "^1.17.1",
+    "@wix/site": "^1.39.0"
   },
   "devDependencies": {
     "@wix/astro-auth": "0.0.0",
@@ -72,5 +72,5 @@
       ]
     }
   },
-  "falconPackageHash": "b3edababb18b3ee139ee50bc046d92810bf0a5e065efbf7927c36758"
+  "falconPackageHash": "ca13cc4226c2bea6883412b853befce37e7d41124eaa0a3bb369b47b"
 }

package/build/dependencies/astro-auth/backend-runtime/chunk-HPW4ZAEJ.js

@@ -1,23 +0,0 @@
-// src/utils/saveSessionTokensToCookie.ts
-import { WIX_CLIENT_ID } from "astro:env/client";
-function saveSessionTokensToCookie(context, tokens) {
-  const cookieOptions = {
-    path: "/",
-    secure: true
-  };
-  if (import.meta.env.DEV) {
-    cookieOptions.sameSite = "none";
-    cookieOptions.maxAge = 10800;
-  }
-  context.cookies.set("wixSession", sessionCookieJson(tokens), cookieOptions);
-}
-function sessionCookieJson(tokens) {
-  return {
-    clientId: WIX_CLIENT_ID,
-    tokens
-  };
-}
-
-export {
-  saveSessionTokensToCookie
-};