@wix/astro 0.2.17 → 0.3.1

package/dist/auth-context.d.ts

@@ -1,5 +1,5 @@
 import { AsyncLocalStorage } from "node:async_hooks";
-import { AuthenticationStrategy } from "@wix/sdk";
+import type { AuthenticationStrategy } from "@wix/sdk";
 export declare const authStrategyAsyncLocalStorage: AsyncLocalStorage<{
     auth: AuthenticationStrategy<void>;
 }>;

package/dist/components/login-helpers/login-helpers.d.ts

@@ -31,9 +31,12 @@ export interface TokenResponse {
     scope?: string | null;
 }
 export declare const getMemberTokensForDirectLogin: (sessionToken: string) => Promise<{
-    accessToken: AccessToken;
-    refreshToken: {
-        value: string;
-        role: TokenRole;
+    clientId: string;
+    tokens: {
+        accessToken: AccessToken;
+        refreshToken: {
+            value: string;
+            role: TokenRole;
+        };
     };
 }>;

package/dist/components/login-helpers/login-helpers.js

@@ -92,11 +92,14 @@ const getMemberTokens = async (code, state, oauthData) => {
         codeVerifier: oauthData.codeVerifier,
     });
     return {
-        accessToken: createAccessToken(tokensResponse.access_token, tokensResponse.expires_in),
-        refreshToken: {
-            value: tokensResponse.refresh_token,
-            role: TokenRole.MEMBER,
-        },
+        clientId: wixContext['clientId'],
+        tokens: {
+            accessToken: createAccessToken(tokensResponse.access_token, tokensResponse.expires_in),
+            refreshToken: {
+                value: tokensResponse.refresh_token,
+                role: TokenRole.MEMBER,
+            },
+        }
     };
 };
 export const getMemberTokensForDirectLogin = async (sessionToken) => {

package/dist/components/login.astro

@@ -283,6 +283,8 @@
   import { authentication, verification, recovery } from '@wix/identity';
   import { getMemberTokensForDirectLogin } from './login-helpers/login-helpers.js';
   import { wixContext } from '@wix/sdk-context';
+  import type { WixClient } from '@wix/sdk';
+  import type { SiteSessionAuth } from "@wix/sdk/auth/site-session";
 
   class LoginForm extends HTMLElement {
     constructor() {
@@ -478,8 +480,11 @@
             response.sessionToken!
           );
 
+          // Update context
+          (wixContext['client'] as WixClient<undefined, ReturnType<typeof SiteSessionAuth>>).auth.setTokens(tokens.tokens);
+
           // Set cookie
-          this.setCookie('wixSession', JSON.stringify(tokens.refreshToken), 2);
+          this.setCookie('wixSession', JSON.stringify(tokens), 2);
 
           // Show success animation
           this.showSuccessMessage();
@@ -544,14 +549,15 @@
     }
 
     setCookie(name, value, days) {
-      // Using a simplified cookie setter for demonstration
       let expires = '';
       if (days) {
         const date = new Date();
         date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
         expires = "; expires=" + date.toUTCString();
       }
-      document.cookie = name + "=" + (value || "")  + expires + "; path=/";
+      const encodedName = encodeURIComponent(name);
+      const encodedValue = encodeURIComponent(value || '');
+      document.cookie = `${encodedName}=${encodedValue}${expires}; path=/`;
     }
 
     onCaptchaChange(token) {

package/dist/helpers/index.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/helpers/index.js

@@ -0,0 +1 @@
+export {};

package/dist/integration.d.ts

@@ -2,7 +2,21 @@ import type { AstroIntegration } from "astro";
 import { wixBlogLoader } from "./loaders/blog.js";
 export { wixBlogLoader };
 export type { Runtime } from "./entrypoints/server.js";
-export declare function createIntegration(opts?: {
+export interface WixAstroIntegrationOptions {
+    /**
+     * Name of the cookie used for the Wix session
+     * @default "wixSession"
+     */
     sessionCookieName?: string;
+    /**
+     * Whether to pre-warm the redirect session by injecting an iframe to cookie.wix.com
+     * @default false
+     */
+    preWarmRedirectSession?: boolean;
+    /***
+     * Wether to inect routes for Wix Auth
+     * @default true
+     */
     useWixAuth?: boolean;
-}): AstroIntegration;
+}
+export declare function createIntegration(opts?: WixAstroIntegrationOptions): AstroIntegration;

package/dist/integration.js

@@ -14,14 +14,16 @@ export { wixBlogLoader };
 export function createIntegration(opts = {
     sessionCookieName: "wixSession",
     useWixAuth: true,
+    preWarmRedirectSession: false,
 }) {
     const sessionCookieName = opts.sessionCookieName ?? "wixSession";
+    const preWarmRedirectSession = opts.preWarmRedirectSession ?? false;
     let _config;
     let _buildOutput;
     return {
         name: "@wix/astro",
         hooks: {
-            "astro:config:setup": async ({ config, updateConfig, addMiddleware, injectRoute, logger, }) => {
+            "astro:config:setup": async ({ config, updateConfig, addMiddleware, injectRoute, injectScript, logger, }) => {
                 const aRequire = buildResolver(fileURLToPath(import.meta.url), {
                     resolveToAbsolute: true,
                 });
@@ -67,6 +69,9 @@ export function createIntegration(opts = {
               `);
                     throw new Error(`${chalk.magenta(`WIX_CLIENT_ID`)} not found in loaded environment variables`);
                 }
+                if (preWarmRedirectSession) {
+                    injectScript('page', `import { getAuth } from '@wix/astro/runtime/client'; getAuth().syncToWixPages();`);
+                }
                 updateConfig({
                     env: {
                         schema: {

package/dist/routes/auth/callback.js

@@ -1,5 +1,5 @@
 import pRetry from "p-retry";
-import { getAuth } from "../../runtime.js";
+import { getAuth } from "../../runtime.server.js";
 import { OAUTH_COOKIE_STATE, WIX_LOGIN_REDIRECT } from "./constants.js";
 import { sessionCookieJson } from "./runtime.js";
 export const prerender = false;
@@ -36,7 +36,7 @@ export async function GET({ url, cookies, redirect }) {
         cookies.set("wixSession", sessionCookieJson(memberTokens), {
             maxAge: 60 * 60 * 24 * 2,
             path: "/",
-            httpOnly: true,
+            secure: true,
         });
         return redirect(originalUrl);
     }

package/dist/routes/auth/login.js

@@ -1,5 +1,5 @@
 import { AUTH_CALLBACK_PATHNAME, AUTH_LOGIN_CALLBACK_PARAM, OAUTH_COOKIE_STATE, PROMPT_QUERY_PARAM, } from "./constants.js";
-import { getAuth } from "../../runtime.js";
+import { getAuth } from "../../runtime.server.js";
 export const prerender = false;
 export async function GET({ url }) {
     // Extract search parameters from the URL

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

@@ -1,4 +1,4 @@
-import { getAuth } from "../../runtime.js";
+import { getAuth } from "../../runtime.server.js";
 import { sessionCookieJson } from "./runtime.js";
 export const prerender = false;
 export const GET = async ({ request, redirect, cookies }) => {

package/dist/routes/auth/logout.js

@@ -1,4 +1,4 @@
-import { getAuth } from "../../runtime.js";
+import { getAuth } from "../../runtime.server.js";
 export const prerender = false;
 export async function GET({ request, redirect }) {
     const returnTo = request.headers.get("Referer") ?? "/";

package/dist/runtime-client.d.ts

@@ -0,0 +1,3 @@
+import type { WixClient } from "@wix/sdk";
+import type { SiteSessionAuth } from "@wix/sdk/auth/site-session";
+export declare function getWixClient(): WixClient<undefined, ReturnType<typeof SiteSessionAuth>>;

package/dist/runtime-client.js

@@ -0,0 +1,4 @@
+import { wixContext } from '@wix/sdk-context';
+export function getWixClient() {
+    return wixContext['client'];
+}

package/dist/runtime.client.d.ts

@@ -0,0 +1,2 @@
+import type { SiteSessionAuth } from "@wix/sdk/auth/site-session";
+export declare function getAuth(): ReturnType<typeof SiteSessionAuth>;

package/dist/runtime.client.js

@@ -0,0 +1,4 @@
+import { wixContext } from '@wix/sdk-context';
+export function getAuth() {
+    return wixContext['client'].auth;
+}

package/dist/runtime.d.ts

@@ -1,2 +1,5 @@
 import { OAuthStrategy } from "@wix/sdk/auth/oauth2";
+import type { WixClient } from "@wix/sdk";
+import type { SiteSessionAuth } from "@wix/sdk/auth/site-session";
 export declare function getAuth(): ReturnType<typeof OAuthStrategy>;
+export declare function getWixClient(): WixClient<undefined, ReturnType<typeof SiteSessionAuth>>;

package/dist/runtime.js

@@ -1,4 +1,5 @@
 import { authStrategyAsyncLocalStorage } from "./auth-context.js";
+import { wixContext } from '@wix/sdk-context';
 export function getAuth() {
     const auth = authStrategyAsyncLocalStorage.getStore()?.auth;
     if (!auth) {
@@ -6,3 +7,6 @@ export function getAuth() {
     }
     return auth;
 }
+export function getWixClient() {
+    return wixContext['client'];
+}

package/dist/runtime.server.d.ts

@@ -0,0 +1,2 @@
+import { OAuthStrategy } from "@wix/sdk/auth/oauth2";
+export declare function getAuth(): ReturnType<typeof OAuthStrategy>;

package/dist/runtime.server.js

@@ -0,0 +1,8 @@
+import { authStrategyAsyncLocalStorage } from "./auth-context.js";
+export function getAuth() {
+    const auth = authStrategyAsyncLocalStorage.getStore()?.auth;
+    if (!auth) {
+        throw new Error("No authentication strategy found in the current context");
+    }
+    return auth;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wix/astro",
   "description": "Develop your Astro site on the Wix Platform",
-  "version": "0.2.17",
+  "version": "0.3.1",
   "type": "module",
   "license": "MIT",
   "keywords": [
@@ -14,7 +14,8 @@
     "./loaders": "./dist/loaders/index.js",
     "./entrypoints/server.js": "./dist/entrypoints/server.js",
     "./package.json": "./package.json",
-    "./runtime": "./dist/runtime.js",
+    "./runtime/client": "./dist/runtime.client.js",
+    "./runtime/server": "./dist/runtime.server.js",
     "./components/login.astro": "./dist/components/login.astro"
   },
   "files": [
@@ -32,7 +33,7 @@
     "@wix/blog": "^1.0.345",
     "@wix/data": "^1.0.194",
     "@wix/identity": "^1.0.125",
-    "@wix/sdk": "^1.15.14",
+    "@wix/sdk": "^1.15.18",
     "chalk": "^5.4.1",
     "esm-resolve": "^1.0.11",
     "globby": "^14.0.2",