diff options
| -rw-r--r-- | examples/ssr/src/api.ts | 29 | ||||
| -rw-r--r-- | examples/ssr/src/components/Header.astro | 2 | ||||
| -rw-r--r-- | examples/ssr/src/pages/cart.astro | 2 | ||||
| -rw-r--r-- | examples/ssr/src/pages/index.astro | 2 | ||||
| -rw-r--r-- | examples/ssr/src/pages/products/[id].astro | 2 |
5 files changed, 19 insertions, 18 deletions
diff --git a/examples/ssr/src/api.ts b/examples/ssr/src/api.ts index 64dfe17d3..8a903b217 100644 --- a/examples/ssr/src/api.ts +++ b/examples/ssr/src/api.ts @@ -17,11 +17,12 @@ interface Cart { }>; } -const { MODE } = import.meta.env; -const origin = MODE === 'development' ? `http://127.0.0.1:3000` : `http://127.0.0.1:8085`; +function getOrigin(request: Request): string { + return new URL(request.url).origin.replace('localhost', '127.0.0.1'); +} -async function get<T>(endpoint: string, cb: (response: Response) => Promise<T>): Promise<T> { - const response = await fetch(`${origin}${endpoint}`, { +async function get<T>(incomingReq: Request, endpoint: string, cb: (response: Response) => Promise<T>): Promise<T> { + const response = await fetch(`${getOrigin(incomingReq)}${endpoint}`, { credentials: 'same-origin', }); if (!response.ok) { @@ -31,36 +32,36 @@ async function get<T>(endpoint: string, cb: (response: Response) => Promise<T>): return cb(response); } -export async function getProducts(): Promise<Product[]> { - return get<Product[]>('/api/products', async (response) => { +export async function getProducts(incomingReq: Request): Promise<Product[]> { + return get<Product[]>(incomingReq, '/api/products', async (response) => { const products: Product[] = await response.json(); return products; }); } -export async function getProduct(id: number): Promise<Product> { - return get<Product>(`/api/products/${id}`, async (response) => { +export async function getProduct(incomingReq: Request, id: number): Promise<Product> { + return get<Product>(incomingReq, `/api/products/${id}`, async (response) => { const product: Product = await response.json(); return product; }); } -export async function getUser(): Promise<User> { - return get<User>(`/api/user`, async (response) => { +export async function getUser(incomingReq: Request): Promise<User> { + return get<User>(incomingReq, `/api/user`, async (response) => { const user: User = await response.json(); return user; }); } -export async function getCart(): Promise<Cart> { - return get<Cart>(`/api/cart`, async (response) => { +export async function getCart(incomingReq: Request): Promise<Cart> { + return get<Cart>(incomingReq, `/api/cart`, async (response) => { const cart: Cart = await response.json(); return cart; }); } -export async function addToUserCart(id: number | string, name: string): Promise<void> { - await fetch(`${origin}/api/cart`, { +export async function addToUserCart( id: number | string, name: string): Promise<void> { + await fetch(`${location.origin}/api/cart`, { credentials: 'same-origin', method: 'POST', mode: 'no-cors', diff --git a/examples/ssr/src/components/Header.astro b/examples/ssr/src/components/Header.astro index c4d925a5f..426fb4be5 100644 --- a/examples/ssr/src/components/Header.astro +++ b/examples/ssr/src/components/Header.astro @@ -3,7 +3,7 @@ import TextDecorationSkip from './TextDecorationSkip.astro'; import Cart from './Cart.svelte'; import { getCart } from '../api'; -const cart = await getCart(); +const cart = await getCart(Astro.request); const cartCount = cart.items.reduce((sum, item) => sum + item.count, 0); --- <style> diff --git a/examples/ssr/src/pages/cart.astro b/examples/ssr/src/pages/cart.astro index e4a00183e..3277ff2db 100644 --- a/examples/ssr/src/pages/cart.astro +++ b/examples/ssr/src/pages/cart.astro @@ -11,7 +11,7 @@ if(!isLoggedIn(Astro.request)) { // They must be logged in. const user = { name: 'test'}; // getUser? -const cart = await getCart(); +const cart = await getCart(Astro.request); --- <html> <head> diff --git a/examples/ssr/src/pages/index.astro b/examples/ssr/src/pages/index.astro index ea2c6c2f6..8eb04ffa6 100644 --- a/examples/ssr/src/pages/index.astro +++ b/examples/ssr/src/pages/index.astro @@ -5,7 +5,7 @@ import ProductListing from '../components/ProductListing.astro'; import { getProducts } from '../api'; import '../styles/common.css'; -const products = await getProducts(); +const products = await getProducts(Astro.request); --- <html> <head> diff --git a/examples/ssr/src/pages/products/[id].astro b/examples/ssr/src/pages/products/[id].astro index 317cea635..f6ac67f82 100644 --- a/examples/ssr/src/pages/products/[id].astro +++ b/examples/ssr/src/pages/products/[id].astro @@ -6,7 +6,7 @@ import { getProduct } from '../../api'; import '../../styles/common.css'; const id = Number(Astro.params.id); -const product = await getProduct(id); +const product = await getProduct(Astro.request, id); --- <html lang="en"> |