Skip to content

Fix Safari dev session cookies in SolidStart v2 templates #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
obask wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Safari dev session cookies in SolidStart v2 templates #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion solid-start-v2/with-auth/src/auth/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,18 @@ export interface Session {
email: string;
}

const SESSION_COOKIE_NAME = "solid_start_auth_session";

export const getSession = () =>
useSession<Session>({
password: process.env.SESSION_SECRET ?? "default_password_which_should_be_long_enough"
name: SESSION_COOKIE_NAME,
password: process.env.SESSION_SECRET ?? "default_password_which_should_be_long_enough",
cookie: {
httpOnly: true,
path: "/",
sameSite: "lax",
secure: process.env.NODE_ENV === "production"
}
});

export async function createSession(user: Session, redirectTo?: string) {
Expand Down
11 changes: 10 additions & 1 deletion solid-start-v2/with-drizzle/src/api/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { eq } from "drizzle-orm";
import { db } from "./db";
import { Users } from "../../drizzle/schema";

const SESSION_COOKIE_NAME = "solid_start_drizzle_session";

function validateUsername(username: unknown) {
if (typeof username !== "string" || username.length < 3) {
return `Usernames must be at least 3 characters long`;
Expand All @@ -31,7 +33,14 @@ async function register(username: string, password: string) {

function getSession() {
return useSession({
password: process.env.SESSION_SECRET ?? "areallylongsecretthatyoushouldreplace"
name: SESSION_COOKIE_NAME,
password: process.env.SESSION_SECRET ?? "areallylongsecretthatyoushouldreplace",
cookie: {
httpOnly: true,
path: "/",
sameSite: "lax",
secure: process.env.NODE_ENV === "production"
}
});
}

Expand Down
11 changes: 10 additions & 1 deletion solid-start-v2/with-prisma/src/lib/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useSession } from "@solidjs/start/http";
import { db } from "./db";

const SESSION_COOKIE_NAME = "solid_start_prisma_session";

export function validateUsername(username: unknown) {
if (typeof username !== "string" || username.length < 3) {
return `Usernames must be at least 3 characters long`;
Expand Down Expand Up @@ -36,6 +38,13 @@ export async function register(username: string, password: string) {

export function getSession() {
return useSession({
password: process.env.SESSION_SECRET ?? "areallylongsecretthatyoushouldreplace"
name: SESSION_COOKIE_NAME,
password: process.env.SESSION_SECRET ?? "areallylongsecretthatyoushouldreplace",
cookie: {
httpOnly: true,
path: "/",
sameSite: "lax",
secure: process.env.NODE_ENV === "production"
}
});
}