@wix/astro 1.0.15 → 1.0.16

package/build-runtime/context/elevated.d.ts

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

package/build-runtime/context/elevated.js

@@ -0,0 +1,17 @@
+// src/context/elevated.ts
+import { AppStrategy, createClient } from "@wix/sdk";
+import { WIX_CLIENT_ID } from "astro:env/client";
+import {
+  WIX_CLIENT_INSTANCE_ID,
+  WIX_CLIENT_PUBLIC_KEY,
+  WIX_CLIENT_SECRET
+} from "astro:env/server";
+var elevatedContextClient = createClient({
+  auth: AppStrategy({
+    appId: WIX_CLIENT_ID,
+    appSecret: WIX_CLIENT_SECRET,
+    instanceId: WIX_CLIENT_INSTANCE_ID,
+    publicKey: WIX_CLIENT_PUBLIC_KEY
+  })
+});
+elevatedContextClient.enableContext("global", { elevated: true });

package/build-runtime/context/non-elevated.d.ts

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

package/build-runtime/context/non-elevated.js

@@ -0,0 +1,20 @@
+// src/context/non-elevated.ts
+import { createClient, OAuthStrategy } from "@wix/sdk";
+import { WIX_CLIENT_ID } from "astro:env/client";
+
+// src/utils/authAsyncLocalStorage.ts
+import { AsyncLocalStorage } from "node:async_hooks";
+var authAsyncLocalStorage = new AsyncLocalStorage();
+
+// src/context/non-elevated.ts
+var contextClient = createClient({
+  get auth() {
+    const store = authAsyncLocalStorage.getStore();
+    const auth = OAuthStrategy({
+      clientId: WIX_CLIENT_ID,
+      tokens: store?.sessionTokens?.tokens
+    });
+    return auth;
+  }
+});
+contextClient.enableContext("global");

package/build-runtime/middleware/auth.js

@@ -1,19 +1,20 @@
-// src/middleware/auth.ts
-import { AppStrategy, createClient, OAuthStrategy } from "@wix/sdk";
-import { WIX_CLIENT_ID as WIX_CLIENT_ID3 } from "astro:env/client";
-import {
-  WIX_CLIENT_INSTANCE_ID,
-  WIX_CLIENT_PUBLIC_KEY,
-  WIX_CLIENT_SECRET
-} from "astro:env/server";
-
-// src/utils/authStrategyAsyncLocalStorage.ts
+// src/utils/authAsyncLocalStorage.ts
 import { AsyncLocalStorage } from "node:async_hooks";
-var authStrategyAsyncLocalStorage = new AsyncLocalStorage();
+var authAsyncLocalStorage = new AsyncLocalStorage();
+
+// src/utils/generateVisitorTokens.ts
+import { OAuthStrategy } from "@wix/sdk";
+import { WIX_CLIENT_ID } from "astro:env/client";
+var auth = OAuthStrategy({
+  clientId: WIX_CLIENT_ID
+});
+async function generateVisitorTokens() {
+  return auth.generateVisitorTokens();
+}
 
 // src/utils/getSessionTokensFromCookie.ts
 import { TokenRole } from "@wix/sdk";
-import { WIX_CLIENT_ID } from "astro:env/client";
+import { WIX_CLIENT_ID as WIX_CLIENT_ID2 } from "astro:env/client";
 import { z } from "astro/zod";
 var tokensSchema = z.object({
   clientId: z.string(),
@@ -29,23 +30,23 @@ var tokensSchema = z.object({
   })
 });
 function getSessionTokensFromCookie(context) {
-  if (context.isPrerendered) {
-    return;
-  }
-  const rawCookie = context.cookies.get("wixSession")?.json();
-  if (rawCookie) {
-    const tokensParseResult = tokensSchema.safeParse(rawCookie);
-    if (tokensParseResult.success && tokensParseResult.data.clientId === WIX_CLIENT_ID) {
-      return tokensParseResult.data;
+  if (!context.isPrerendered) {
+    const rawCookie = context.cookies.get("wixSession")?.json();
+    if (rawCookie) {
+      const tokensParseResult = tokensSchema.safeParse(rawCookie);
+      if (tokensParseResult.success && tokensParseResult.data.clientId === WIX_CLIENT_ID2) {
+        return tokensParseResult.data;
+      }
     }
   }
+  return null;
 }
 
 // src/utils/saveSessionTokensToCookie.ts
-import { WIX_CLIENT_ID as WIX_CLIENT_ID2 } from "astro:env/client";
+import { WIX_CLIENT_ID as WIX_CLIENT_ID3 } from "astro:env/client";
 function sessionCookieJson(tokens) {
   return {
-    clientId: WIX_CLIENT_ID2,
+    clientId: WIX_CLIENT_ID3,
     tokens
   };
 }
@@ -57,59 +58,15 @@ function saveSessionTokensToCookie(context, tokens) {
 }
 
 // src/middleware/auth.ts
-var contextClient = createClient({
-  auth: {
-    async getAuthHeaders(host) {
-      const store = authStrategyAsyncLocalStorage.getStore();
-      if (!store?.auth) {
-        throw new Error(
-          "No authentication strategy found in the current context"
-        );
-      }
-      return store.auth.getAuthHeaders(host);
-    }
-  }
-});
-var elevatedContextClient = createClient({
-  auth: {
-    async getAuthHeaders(host) {
-      const store = authStrategyAsyncLocalStorage.getStore();
-      if (!store?.elevatedAuth) {
-        throw new Error(
-          "No elevated authentication strategy found in the current context"
-        );
-      }
-      return store.elevatedAuth.getAuthHeaders(host);
-    }
-  }
-});
-contextClient.enableContext("global");
-elevatedContextClient.enableContext("global", { elevated: true });
 var onRequest = async (context, next) => {
-  const sessionTokensFromCookie = getSessionTokensFromCookie(context);
-  const auth = OAuthStrategy({
-    clientId: WIX_CLIENT_ID3
-  });
-  if (sessionTokensFromCookie) {
-    auth.setTokens(sessionTokensFromCookie.tokens);
-  } else {
-    auth.setTokens(await auth.generateVisitorTokens());
-  }
-  const elevatedAuth = AppStrategy({
-    appId: WIX_CLIENT_ID3,
-    appSecret: WIX_CLIENT_SECRET,
-    instanceId: WIX_CLIENT_INSTANCE_ID,
-    publicKey: WIX_CLIENT_PUBLIC_KEY
+  const store = {
+    sessionTokens: getSessionTokensFromCookie(context)
+  };
+  const response = await authAsyncLocalStorage.run(store, () => {
+    return next();
   });
-  const response = await authStrategyAsyncLocalStorage.run(
-    {
-      auth,
-      elevatedAuth
-    },
-    () => next()
-  );
-  if (!context.isPrerendered && sessionTokensFromCookie?.tokens.accessToken.expiresAt !== auth.getTokens().accessToken.expiresAt) {
-    saveSessionTokensToCookie(context, auth.getTokens());
+  if (!context.isPrerendered && store.sessionTokens == null) {
+    saveSessionTokensToCookie(context, await generateVisitorTokens());
   }
   return response;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/astro",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "devDependencies": {
     "@wix/dashboard": "^1.3.35",
     "@wix/sdk": "^1.15.17",
@@ -46,5 +46,5 @@
       ]
     }
   },
-  "falconPackageHash": "03baaa6edb871e335e34c1c6f47130585ee742e48350a4b908c708b5"
+  "falconPackageHash": "6148e131e45c16f42c1c8b3fa4778e5d51ffc096a593673996084c97"
 }

package/src/context/elevated.ts

@@ -0,0 +1,18 @@
+import { AppStrategy, createClient } from '@wix/sdk';
+import { WIX_CLIENT_ID } from 'astro:env/client';
+import {
+  WIX_CLIENT_INSTANCE_ID,
+  WIX_CLIENT_PUBLIC_KEY,
+  WIX_CLIENT_SECRET,
+} from 'astro:env/server';
+
+const elevatedContextClient = createClient({
+  auth: AppStrategy({
+    appId: WIX_CLIENT_ID,
+    appSecret: WIX_CLIENT_SECRET,
+    instanceId: WIX_CLIENT_INSTANCE_ID,
+    publicKey: WIX_CLIENT_PUBLIC_KEY,
+  }),
+});
+
+elevatedContextClient.enableContext('global', { elevated: true });

package/src/context/non-elevated.ts

@@ -0,0 +1,18 @@
+import { createClient, OAuthStrategy } from '@wix/sdk';
+import { WIX_CLIENT_ID } from 'astro:env/client';
+import { authAsyncLocalStorage } from '../utils/authAsyncLocalStorage.js';
+
+const contextClient = createClient({
+  get auth() {
+    const store = authAsyncLocalStorage.getStore();
+
+    const auth = OAuthStrategy({
+      clientId: WIX_CLIENT_ID,
+      tokens: store?.sessionTokens?.tokens,
+    });
+
+    return auth;
+  },
+});
+
+contextClient.enableContext('global');

package/src/directories.ts

@@ -1,6 +1,5 @@
 import { join } from 'node:path';
 
-const SRC_DIR = 'src';
-
+export const SRC_DIR = 'src';
 export const GIT_IGNORED_DIR = '.wix';
 export const EXTENSIONS_DIR = join(SRC_DIR, 'extensions');

package/src/index.ts

@@ -8,6 +8,7 @@ import type { Model } from './types.js';
 import { EXTENSIONS_DIR, GIT_IGNORED_DIR } from './directories.js';
 import { patchAstroInlineScripts } from './plugins/patchAstroInlineScripts.js';
 import { patchGlobal } from './plugins/patchGlobal.js';
+import { setupSsrContext } from './plugins/setupSsrContext.js';
 import { createProjectModel } from './utils/createProjectModel.js';
 import { outputDir, writeJson } from './utils/fs-utils.js';
 import { generateAppManifest } from './utils/generateAppManifest.js';
@@ -117,7 +118,11 @@ const createIntegration = (): AstroIntegration => {
             service: passthroughImageService(),
           },
           vite: {
-            plugins: [patchGlobal(), patchAstroInlineScripts()],
+            plugins: [
+              patchGlobal(),
+              patchAstroInlineScripts(),
+              setupSsrContext(rootDir),
+            ],
           },
         });
 

package/src/middleware/auth.ts

@@ -1,84 +1,20 @@
 import type { MiddlewareHandler } from 'astro';
-import { AppStrategy, createClient, OAuthStrategy } from '@wix/sdk';
-import { WIX_CLIENT_ID } from 'astro:env/client';
-import {
-  WIX_CLIENT_INSTANCE_ID,
-  WIX_CLIENT_PUBLIC_KEY,
-  WIX_CLIENT_SECRET,
-} from 'astro:env/server';
-import { authStrategyAsyncLocalStorage } from '../utils/authStrategyAsyncLocalStorage.js';
+import { authAsyncLocalStorage } from '../utils/authAsyncLocalStorage.js';
+import { generateVisitorTokens } from '../utils/generateVisitorTokens.js';
 import { getSessionTokensFromCookie } from '../utils/getSessionTokensFromCookie.js';
 import { saveSessionTokensToCookie } from '../utils/saveSessionTokensToCookie.js';
 
-const contextClient = createClient({
-  auth: {
-    async getAuthHeaders(host) {
-      const store = authStrategyAsyncLocalStorage.getStore();
-
-      if (!store?.auth) {
-        throw new Error(
-          'No authentication strategy found in the current context'
-        );
-      }
-
-      return store.auth.getAuthHeaders(host);
-    },
-  },
-});
-
-const elevatedContextClient = createClient({
-  auth: {
-    async getAuthHeaders(host) {
-      const store = authStrategyAsyncLocalStorage.getStore();
-
-      if (!store?.elevatedAuth) {
-        throw new Error(
-          'No elevated authentication strategy found in the current context'
-        );
-      }
-
-      return store.elevatedAuth.getAuthHeaders(host);
-    },
-  },
-});
-
-contextClient.enableContext('global');
-elevatedContextClient.enableContext('global', { elevated: true });
-
 export const onRequest: MiddlewareHandler = async (context, next) => {
-  const sessionTokensFromCookie = getSessionTokensFromCookie(context);
-
-  const auth = OAuthStrategy({
-    clientId: WIX_CLIENT_ID,
-  });
+  const store = {
+    sessionTokens: getSessionTokensFromCookie(context),
+  };
 
-  if (sessionTokensFromCookie) {
-    auth.setTokens(sessionTokensFromCookie.tokens);
-  } else {
-    auth.setTokens(await auth.generateVisitorTokens());
-  }
-
-  const elevatedAuth = AppStrategy({
-    appId: WIX_CLIENT_ID,
-    appSecret: WIX_CLIENT_SECRET,
-    instanceId: WIX_CLIENT_INSTANCE_ID,
-    publicKey: WIX_CLIENT_PUBLIC_KEY,
+  const response = await authAsyncLocalStorage.run(store, () => {
+    return next();
   });
 
-  const response = await authStrategyAsyncLocalStorage.run(
-    {
-      auth,
-      elevatedAuth,
-    },
-    () => next()
-  );
-
-  if (
-    !context.isPrerendered &&
-    sessionTokensFromCookie?.tokens.accessToken.expiresAt !==
-      auth.getTokens().accessToken.expiresAt
-  ) {
-    saveSessionTokensToCookie(context, auth.getTokens());
+  if (!context.isPrerendered && store.sessionTokens == null) {
+    saveSessionTokensToCookie(context, await generateVisitorTokens());
   }
 
   return response;

package/src/plugins/setupSsrContext.ts

@@ -0,0 +1,47 @@
+import { extname, join } from 'node:path';
+import type { PluginOption } from 'vite';
+import { outdent } from 'outdent';
+import { SRC_DIR } from '../directories.js';
+
+export function setupSsrContext(rootDir: string): PluginOption {
+  const srcDir = join(rootDir, SRC_DIR);
+
+  const nonElevatedSetupUrl = new URL(
+    '../build-runtime/context/non-elevated.js',
+    import.meta.url
+  );
+  const elevatedSetupUrl = new URL(
+    '../build-runtime/context/elevated.js',
+    import.meta.url
+  );
+
+  return {
+    applyToEnvironment(environment) {
+      return environment.name === 'ssr';
+    },
+    name: 'setup-ssr-context',
+    transform(code, id) {
+      if (!id.startsWith(srcDir)) {
+        return null;
+      }
+
+      const extension = extname(id);
+
+      if (
+        extension !== '.js' &&
+        extension !== '.astro' &&
+        extension !== '.ts' &&
+        extension !== '.tsx'
+      ) {
+        return null;
+      }
+
+      return outdent`
+        import '${nonElevatedSetupUrl}';
+        import '${elevatedSetupUrl}';
+
+        ${code}
+      `;
+    },
+  };
+}

package/src/utils/authAsyncLocalStorage.ts

@@ -0,0 +1,6 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+import type { SessionTokens } from './getSessionTokensFromCookie.js';
+
+export const authAsyncLocalStorage = new AsyncLocalStorage<{
+  sessionTokens: null | SessionTokens;
+}>();

package/src/utils/fs-utils.ts

@@ -5,7 +5,7 @@ import {
   writeFile,
 } from 'node:fs/promises';
 import { EOL } from 'node:os';
-import { dirname } from 'node:path';
+import { dirname, relative } from 'node:path';
 
 function toJsonString(object: unknown, opts?: { spaces: number }) {
   return JSON.stringify(object, null, opts?.spaces).concat(EOL);
@@ -35,3 +35,8 @@ export function pathExists(path: string) {
 export async function outputDir(dir: string) {
   await mkdir(dir, { recursive: true });
 }
+
+export function toRelativePath(from: string, to: string) {
+  const rel = relative(dirname(from), to).replaceAll('\\', '/');
+  return rel.startsWith('.') ? rel : `./${rel}`;
+}

package/src/utils/generateVisitorTokens.ts

@@ -0,0 +1,10 @@
+import { OAuthStrategy } from '@wix/sdk';
+import { WIX_CLIENT_ID } from 'astro:env/client';
+
+const auth = OAuthStrategy({
+  clientId: WIX_CLIENT_ID,
+});
+
+export async function generateVisitorTokens() {
+  return auth.generateVisitorTokens();
+}

package/src/utils/getSessionTokensFromCookie.ts

@@ -17,21 +17,25 @@ const tokensSchema = z.object({
   }),
 });
 
-export function getSessionTokensFromCookie(context: APIContext) {
-  if (context.isPrerendered) {
-    return;
-  }
+export type SessionTokens = z.infer<typeof tokensSchema>;
 
-  const rawCookie = context.cookies.get('wixSession')?.json();
+export function getSessionTokensFromCookie(
+  context: APIContext
+): null | SessionTokens {
+  if (!context.isPrerendered) {
+    const rawCookie = context.cookies.get('wixSession')?.json();
 
-  if (rawCookie) {
-    const tokensParseResult = tokensSchema.safeParse(rawCookie);
+    if (rawCookie) {
+      const tokensParseResult = tokensSchema.safeParse(rawCookie);
 
-    if (
-      tokensParseResult.success &&
-      tokensParseResult.data.clientId === WIX_CLIENT_ID
-    ) {
-      return tokensParseResult.data;
+      if (
+        tokensParseResult.success &&
+        tokensParseResult.data.clientId === WIX_CLIENT_ID
+      ) {
+        return tokensParseResult.data;
+      }
     }
   }
+
+  return null;
 }

package/src/utils/writeVirtualBackofficeExtensionFiles.ts

@@ -6,6 +6,7 @@ import { match } from 'variant';
 import type { Component } from '../components.js';
 import type { Model } from '../types.js';
 import { isValidBackofficeComponent } from '../utils/isValidBackofficeComponent.js';
+import { toRelativePath } from './fs-utils.js';
 
 export async function writeVirtualBackofficeExtensionFiles(
   model: Model,
@@ -44,7 +45,7 @@ export async function writeVirtualBackofficeExtensionFiles(
       virtualEntrypoint,
       outdent`
         ---
-        import Component from '${originalEntrypoint}';
+        import Component from '${toRelativePath(virtualEntrypoint, originalEntrypoint)}';
         ---
 
         <div>

package/src/utils/writeVirtualServicePluginExtensionFiles.ts

@@ -3,6 +3,7 @@ import { join, resolve } from 'node:path';
 import { globby } from 'globby';
 import { outdent } from 'outdent';
 import type { Model } from '../types.js';
+import { toRelativePath } from './fs-utils.js';
 import { isValidServicePluginComponent } from './isValidServicePluginComponent.js';
 
 export async function writeVirtualServicePluginExtensionFiles(
@@ -57,7 +58,7 @@ export async function writeVirtualServicePluginExtensionFiles(
 
         client.enableContext('global');
 
-        await import('${originalEntrypoint}');
+        await import('${toRelativePath(virtualEntrypoint, originalEntrypoint)}');
 
         if (olderClient) {
           olderClient.enableContext('global');

package/src/utils/writeVirtualWebhookExtensionFiles.ts

@@ -3,6 +3,7 @@ import { join, resolve } from 'node:path';
 import { globby } from 'globby';
 import { outdent } from 'outdent';
 import type { Model } from '../types.js';
+import { toRelativePath } from './fs-utils.js';
 import { isValidWebhookComponent } from './isValidWebhookComponent.js';
 
 export async function writeVirtualWebhookExtensionFiles(
@@ -55,7 +56,7 @@ export async function writeVirtualWebhookExtensionFiles(
 
         client.enableContext('global');
 
-        await import('${originalEntrypoint}');
+        await import('${toRelativePath(virtualEntrypoint, originalEntrypoint)}');
 
         if (olderClient) {
           olderClient.enableContext('global');

package/tsup.config.mjs

@@ -39,6 +39,8 @@ export default defineConfig([
       'src/middleware/auth.ts',
       'src/routes/webhooks.ts',
       'src/routes/service-plugins.ts',
+      'src/context/elevated.ts',
+      'src/context/non-elevated.ts',
     ],
     target: 'node20.9',
     format: ['esm'],

package/src/utils/authStrategyAsyncLocalStorage.ts

@@ -1,7 +0,0 @@
-import { AsyncLocalStorage } from 'node:async_hooks';
-import type { AuthenticationStrategy } from '@wix/sdk';
-
-export const authStrategyAsyncLocalStorage = new AsyncLocalStorage<{
-  auth: AuthenticationStrategy<undefined> | null;
-  elevatedAuth: AuthenticationStrategy<undefined> | null;
-}>();