Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/lemon-birds-switch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@medusajs/framework": patch
"@medusajs/types": patch
---

feat(framework,types): add cookie options to project options
29 changes: 24 additions & 5 deletions packages/admin/admin-bundler/src/utils/config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { VIRTUAL_MODULES } from "@medusajs/admin-shared"
import path from "path"
import type { InlineConfig } from "vite"
import type { HmrOptions, InlineConfig } from "vite"
import { injectTailwindCSS } from "../plugins/inject-tailwindcss"
import { writeStaticFiles } from "../plugins/write-static-files"
import { BundlerOptions } from "../types"
Expand All @@ -13,7 +13,10 @@ export async function getViteConfig(
const { default: medusa } = await import("@medusajs/admin-vite-plugin")

const getPort = await import("get-port")
const hmrPort = await getPort.default()
const hmrPort = process.env.HMR_PORT
? parseInt(process.env.HMR_PORT)
: await getPort.default()
const hmrOptions = getHmrConfig(hmrPort)

const root = path.resolve(process.cwd(), ".medusa/client")

Expand Down Expand Up @@ -49,9 +52,7 @@ export async function getViteConfig(
fs: {
allow: [searchForWorkspaceRoot(process.cwd())],
},
hmr: {
port: hmrPort,
},
hmr: hmrOptions,
},
plugins: [
writeStaticFiles({
Expand All @@ -76,3 +77,21 @@ export async function getViteConfig(

return baseConfig
}

function getHmrConfig(hmrPort: number): HmrOptions | boolean {
const options: HmrOptions = {
port: hmrPort,
}

if (process.env.HMR_PROTOCOL) {
options.protocol = process.env.HMR_PROTOCOL
}
if (process.env.HMR_HOST) {
options.host = process.env.HMR_HOST
}
if (process.env.HMR_CLIENT_PORT) {
options.clientPort = parseInt(process.env.HMR_CLIENT_PORT)
}

return options
}
7 changes: 4 additions & 3 deletions packages/core/framework/src/http/express-loader.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { dynamicImport } from "@medusajs/utils"
import createStore from "connect-redis"
import cookieParser from "cookie-parser"
import express, { Express, RequestHandler } from "express"
import session from "express-session"
import Redis from "ioredis"
import morgan from "morgan"
import path from "path"
import { logger } from "../logger"
import { configManager } from "../config"
import { logger } from "../logger"
import { MedusaRequest, MedusaResponse } from "./types"
import { dynamicImport } from "@medusajs/utils"

const NOISY_ENDPOINTS_CHUNKS = ["@fs", "@id", "@vite", "@react", "node_modules"]

Expand All @@ -33,7 +33,7 @@ export async function expressLoader({ app }: { app: Express }): Promise<{
sameSite = "none"
}

const { http, sessionOptions } = configModule.projectConfig
const { http, sessionOptions, cookieOptions } = configModule.projectConfig
const sessionOpts = {
name: sessionOptions?.name ?? "connect.sid",
resave: sessionOptions?.resave ?? true,
Expand All @@ -45,6 +45,7 @@ export async function expressLoader({ app }: { app: Express }): Promise<{
sameSite,
secure,
maxAge: sessionOptions?.ttl ?? 10 * 60 * 60 * 1000,
...cookieOptions,
},
store: null,
}
Expand Down
18 changes: 18 additions & 0 deletions packages/core/types/src/common/config-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,22 @@ export type SessionOptions = {
}
}

/**
* @interface
*
* Options to pass to `express-session`.
*/
export type CookieOptions = Record<string, any> & {
secure?: boolean
sameSite?: "lax" | "strict" | "none"
maxAge?: number
httpOnly?: boolean
priority?: "low" | "medium" | "high"
domain?: string
path?: string
signed?: boolean
}

/**
* @interface
*
Expand Down Expand Up @@ -413,6 +429,8 @@ export type ProjectConfigOptions = {
*/
sessionOptions?: SessionOptions

cookieOptions?: CookieOptions

/**
* Configure the number of staged jobs that are polled from the database. Default is `1000`.
*
Expand Down