Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
chore: Use secure cookies in local development and fix layout nesting (#3949)
Ivan Starkov50575df29b6e
diff --git a/apps/builder/app/env/env.server.ts b/apps/builder/app/env/env.server.tsindex 9038b2aaf6..0cf3576386 100644--- a/apps/builder/app/env/env.server.ts+++ b/apps/builder/app/env/env.server.ts@@ -100,6 +100,9 @@ const env = {POSTGREST_URL: process.env.POSTGREST_URL ?? "http://localhost:3000",POSTGREST_API_KEY: process.env.POSTGREST_API_KEY ?? "",++ SECURE_COOKIE:+ process.env.SSL === "true" || process.env.NODE_ENV === "production",};export type ServerEnv = typeof env;diff --git a/apps/builder/app/routes/auth.github.callback.tsx b/apps/builder/app/routes/auth.github_.callback.tsxsimilarity index 100%rename from apps/builder/app/routes/auth.github.callback.tsxrename to apps/builder/app/routes/auth.github_.callback.tsxdiff --git a/apps/builder/app/routes/auth.google.callback.tsx b/apps/builder/app/routes/auth.google_.callback.tsxsimilarity index 100%rename from apps/builder/app/routes/auth.google.callback.tsxrename to apps/builder/app/routes/auth.google_.callback.tsxdiff --git a/apps/builder/app/routes/rest.assets.$name.tsx b/apps/builder/app/routes/rest.assets_.$name.tsxsimilarity index 100%rename from apps/builder/app/routes/rest.assets.$name.tsxrename to apps/builder/app/routes/rest.assets_.$name.tsxdiff --git a/apps/builder/app/services/cookie.server.ts b/apps/builder/app/services/cookie.server.tsindex 4afae9b49f..cdeb9c4922 100644--- a/apps/builder/app/services/cookie.server.ts+++ b/apps/builder/app/services/cookie.server.ts@@ -1,4 +1,5 @@import { createCookie } from "@remix-run/node";+import env from "~/env/env.server";import { dashboardPath } from "~/shared/router-utils";export const returnToCookie = createCookie("returnTo", {@@ -6,7 +7,7 @@ export const returnToCookie = createCookie("returnTo", {httpOnly: true,sameSite: "lax",maxAge: 60, // 1 minute because it makes no sense to keep it for a long time- secure: process.env.NODE_ENV === "production",+ secure: env.SECURE_COOKIE,});export const returnToPath = async (request: Request) => {diff --git a/apps/builder/app/services/session.server.ts b/apps/builder/app/services/session.server.tsindex c04735112b..fd5e9e7c27 100644--- a/apps/builder/app/services/session.server.ts+++ b/apps/builder/app/services/session.server.ts@@ -10,7 +10,7 @@ export const sessionStorage = createCookieSessionStorage({path: "/", // remember to add this so the cookie will work in all routeshttpOnly: true, // for security reasons, make this cookie http onlysecrets: env.AUTH_SECRET ? [env.AUTH_SECRET] : undefined, // replace this with an actual secret- secure: process.env.NODE_ENV === "production", // enable this in prod only+ secure: env.SECURE_COOKIE,},});