Skip to content

Commit 65829f8

Browse files
committed
fix tests by disabling secure connections in TEST environment
1 parent 9bacda5 commit 65829f8

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

src/lib/api/secondary-emails.remote.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export const reverifySecondaryEmailForm = form(
112112
expires: otp.expiresAt,
113113
path: "/",
114114
httpOnly: true,
115-
secure: !dev,
115+
secure: !dev && !env.TEST,
116116
sameSite: "lax",
117117
});
118118

@@ -121,7 +121,7 @@ export const reverifySecondaryEmailForm = form(
121121
expires: otp.expiresAt,
122122
path: "/",
123123
httpOnly: true,
124-
secure: !dev,
124+
secure: !dev && !env.TEST,
125125
sameSite: "lax",
126126
});
127127

@@ -196,7 +196,7 @@ export const addSecondaryEmailForm = form(addSecondaryEmailSchema, async ({ emai
196196
expires: otp.expiresAt,
197197
path: "/",
198198
httpOnly: true,
199-
secure: !dev,
199+
secure: !dev && !env.TEST,
200200
sameSite: "lax",
201201
});
202202

@@ -205,7 +205,7 @@ export const addSecondaryEmailForm = form(addSecondaryEmailSchema, async ({ emai
205205
expires: otp.expiresAt,
206206
path: "/",
207207
httpOnly: true,
208-
secure: !dev,
208+
secure: !dev && !env.TEST,
209209
sameSite: "lax",
210210
});
211211

src/lib/server/auth/email.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { encodeBase32LowerCaseNoPadding } from "@oslojs/encoding";
55
import * as table from "$lib/server/db/schema";
66
import { eq } from "drizzle-orm";
77
import { dev } from "$app/environment";
8+
import { env } from "$lib/server/env";
89
import { sendMemberEmail } from "$lib/server/emails";
910

1011
import type { EmailOTP } from "$lib/server/db/schema";
@@ -18,7 +19,7 @@ export function setEmailCookie(event: RequestEvent, email: string, expiresAt: Da
1819
expires: expiresAt,
1920
path: "/",
2021
httpOnly: true,
21-
secure: !dev,
22+
secure: !dev && !env.TEST,
2223
sameSite: "lax",
2324
});
2425
}
@@ -87,7 +88,7 @@ export function setEmailOTPCookie(event: RequestEvent, otp: EmailOTP): void {
8788
event.cookies.set(emailOTPCookieName, otp.id, {
8889
httpOnly: true,
8990
path: "/",
90-
secure: !dev,
91+
secure: !dev && !env.TEST,
9192
sameSite: "lax",
9293
expires: otp.expiresAt,
9394
});
@@ -97,7 +98,7 @@ export function deleteEmailOTPCookie(event: RequestEvent): void {
9798
event.cookies.delete(emailOTPCookieName, {
9899
httpOnly: true,
99100
path: "/",
100-
secure: !dev,
101+
secure: !dev && !env.TEST,
101102
sameSite: "lax",
102103
maxAge: 0,
103104
});

src/lib/server/auth/session.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { eq } from "drizzle-orm";
33
import { sha256 } from "@oslojs/crypto/sha2";
44
import { encodeBase64url, encodeHexLowerCase } from "@oslojs/encoding";
55
import { dev } from "$app/environment";
6+
import { env } from "$lib/server/env";
67
import { db } from "$lib/server/db";
78
import * as table from "$lib/server/db/schema";
89
const DAY_IN_MS = 1000 * 60 * 60 * 24;
@@ -78,7 +79,7 @@ export function setSessionTokenCookie(event: RequestEvent, token: string, expire
7879
expires: expiresAt,
7980
path: "/",
8081
httpOnly: true,
81-
secure: !dev,
82+
secure: !dev && !env.TEST,
8283
sameSite: "lax",
8384
});
8485
}

0 commit comments

Comments
 (0)