This commit is contained in:
pilcrowOnPaper 2024-10-06 15:22:40 +09:00
parent 5f41e27a21
commit 776249c829
11 changed files with 14 additions and 14 deletions

View file

@ -5,7 +5,7 @@ import { get2FARedirect } from "$lib/server/2fa";
import type { Actions, PageServerLoadEvent, RequestEvent } from "./$types"; import type { Actions, PageServerLoadEvent, RequestEvent } from "./$types";
export function load(event: PageServerLoadEvent) { export function load(event: PageServerLoadEvent) {
if (event.locals.user === null || event.locals.session === null) { if (event.locals.session === null || event.locals.user === null) {
return redirect(302, "/login"); return redirect(302, "/login");
} }
if (!event.locals.user.emailVerified) { if (!event.locals.user.emailVerified) {

View file

@ -5,7 +5,7 @@ import { getUserPasskeyCredentials } from "$lib/server/webauthn";
import type { RequestEvent } from "./$types"; import type { RequestEvent } from "./$types";
export async function load(event: RequestEvent) { export async function load(event: RequestEvent) {
if (event.locals.user === null || event.locals.session === null) { if (event.locals.session === null || event.locals.user === null) {
return redirect(302, "/login"); return redirect(302, "/login");
} }
if (!event.locals.user.emailVerified) { if (!event.locals.user.emailVerified) {

View file

@ -28,7 +28,7 @@ import type {
import type { Actions, RequestEvent } from "./$types"; import type { Actions, RequestEvent } from "./$types";
export async function load(event: RequestEvent) { export async function load(event: RequestEvent) {
if (event.locals.user === null || event.locals.session === null) { if (event.locals.session === null || event.locals.user === null) {
return redirect(302, "/login"); return redirect(302, "/login");
} }
if (!event.locals.user.emailVerified) { if (!event.locals.user.emailVerified) {

View file

@ -8,7 +8,7 @@ export const actions: Actions = {
}; };
export async function load(event: RequestEvent) { export async function load(event: RequestEvent) {
if (event.locals.user === null || event.locals.session === null) { if (event.locals.session === null || event.locals.user === null) {
return redirect(302, "/login"); return redirect(302, "/login");
} }
if (!event.locals.user.emailVerified) { if (!event.locals.user.emailVerified) {

View file

@ -5,7 +5,7 @@ import { getUserSecurityKeyCredentials } from "$lib/server/webauthn";
import type { RequestEvent } from "./$types"; import type { RequestEvent } from "./$types";
export async function load(event: RequestEvent) { export async function load(event: RequestEvent) {
if (event.locals.user === null || event.locals.session === null) { if (event.locals.session === null || event.locals.user === null) {
return redirect(302, "/login"); return redirect(302, "/login");
} }
if (!event.locals.user.emailVerified) { if (!event.locals.user.emailVerified) {

View file

@ -32,7 +32,7 @@ import type {
import type { Actions, RequestEvent } from "./$types"; import type { Actions, RequestEvent } from "./$types";
export async function load(event: RequestEvent) { export async function load(event: RequestEvent) {
if (event.locals.user === null || event.locals.session === null) { if (event.locals.session === null || event.locals.user === null) {
return redirect(302, "/login"); return redirect(302, "/login");
} }
if (!event.locals.user.emailVerified) { if (!event.locals.user.emailVerified) {

View file

@ -3,7 +3,7 @@ import { redirect } from "@sveltejs/kit";
import type { RequestEvent } from "./$types"; import type { RequestEvent } from "./$types";
export async function load(event: RequestEvent) { export async function load(event: RequestEvent) {
if (event.locals.user === null || event.locals.session === null) { if (event.locals.session === null || event.locals.user === null) {
return redirect(302, "/login"); return redirect(302, "/login");
} }
if (!event.locals.user.emailVerified) { if (!event.locals.user.emailVerified) {

View file

@ -6,7 +6,7 @@ import { setSessionAs2FAVerified } from "$lib/server/session";
import type { Actions, RequestEvent } from "./$types"; import type { Actions, RequestEvent } from "./$types";
export async function load(event: RequestEvent) { export async function load(event: RequestEvent) {
if (event.locals.user === null || event.locals.session === null) { if (event.locals.session === null || event.locals.user === null) {
return redirect(302, "/login"); return redirect(302, "/login");
} }
if (!event.locals.user.emailVerified) { if (!event.locals.user.emailVerified) {

View file

@ -9,7 +9,7 @@ import { get2FARedirect } from "$lib/server/2fa";
import type { Actions, RequestEvent } from "./$types"; import type { Actions, RequestEvent } from "./$types";
export async function load(event: RequestEvent) { export async function load(event: RequestEvent) {
if (event.locals.user === null || event.locals.session === null) { if (event.locals.session === null || event.locals.user === null) {
return redirect(302, "/login"); return redirect(302, "/login");
} }
if (!event.locals.user.emailVerified) { if (!event.locals.user.emailVerified) {

View file

@ -5,7 +5,7 @@ import { get2FARedirect } from "$lib/server/2fa";
import type { RequestEvent } from "./$types"; import type { RequestEvent } from "./$types";
export async function load(event: RequestEvent) { export async function load(event: RequestEvent) {
if (event.locals.user === null || event.locals.session === null) { if (event.locals.session === null || event.locals.user === null) {
return redirect(302, "/login"); return redirect(302, "/login");
} }
if (!event.locals.user.emailVerified) { if (!event.locals.user.emailVerified) {

View file

@ -28,7 +28,7 @@ import type { Actions, RequestEvent } from "./$types";
import type { SessionFlags } from "$lib/server/session"; import type { SessionFlags } from "$lib/server/session";
export async function load(event: RequestEvent) { export async function load(event: RequestEvent) {
if (event.locals.user === null || event.locals.session === null) { if (event.locals.session === null || event.locals.user === null) {
return redirect(302, "/login"); return redirect(302, "/login");
} }
if (event.locals.user.registered2FA && !event.locals.session.twoFactorVerified) { if (event.locals.user.registered2FA && !event.locals.session.twoFactorVerified) {
@ -58,7 +58,7 @@ export const actions: Actions = {
}; };
async function updatePasswordAction(event: RequestEvent) { async function updatePasswordAction(event: RequestEvent) {
if (event.locals.user === null || event.locals.session === null) { if (event.locals.session === null || event.locals.user === null) {
return fail(401, { return fail(401, {
password: { password: {
message: "Not authenticated" message: "Not authenticated"
@ -207,7 +207,7 @@ async function disconnectTOTPAction(event: RequestEvent) {
} }
async function deletePasskeyAction(event: RequestEvent) { async function deletePasskeyAction(event: RequestEvent) {
if (event.locals.user === null || event.locals.session === null) { if (event.locals.session === null || event.locals.user === null) {
return fail(401); return fail(401);
} }
if (!event.locals.user.emailVerified) { if (!event.locals.user.emailVerified) {
@ -235,7 +235,7 @@ async function deletePasskeyAction(event: RequestEvent) {
} }
async function deleteSecurityKeyAction(event: RequestEvent) { async function deleteSecurityKeyAction(event: RequestEvent) {
if (event.locals.user === null || event.locals.session === null) { if (event.locals.session === null || event.locals.user === null) {
return fail(401); return fail(401);
} }
if (!event.locals.user.emailVerified) { if (!event.locals.user.emailVerified) {