rythondev/dsec-notebook
1
0
Fork 0
mirror of https://github.com/dsec-hub/dsec-notebook.git synced 2026-09-22 15:43:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix auth redirects

Browse source
This commit is contained in:
liyunze 2026-08-31 19:28:01 +08:00
parent f826141940
commit 35b0d8020d
3 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/lib/stores/auth.ts
View file

@ -7,22 +7,28 @@ export const isAuthenticated = writable(false);
const STORAGE_KEY = "dsec_session"; const STORAGE_KEY = "dsec_session";
export async function initAuth() { let initPromise: Promise<void> | null = null;
const stored = localStorage.getItem(STORAGE_KEY);
if (stored) { export function initAuth(): Promise<void> {
try { if (initPromise) return initPromise;
const { token } = JSON.parse(stored); initPromise = (async () => {
const user = await query("users:getByToken", { token }); const stored = localStorage.getItem(STORAGE_KEY);
if (user) { if (stored) {
currentUser.set(user as UserDoc); try {
isAuthenticated.set(true); const { token } = JSON.parse(stored);
} else { const user = await query("users:getByToken", { token });
if (user) {
currentUser.set(user as UserDoc);
isAuthenticated.set(true);
} else {
localStorage.removeItem(STORAGE_KEY);
}
} catch {
localStorage.removeItem(STORAGE_KEY); localStorage.removeItem(STORAGE_KEY);
} }
} catch {
localStorage.removeItem(STORAGE_KEY);
} }
} })();
return initPromise;
} }
function setSession(result: { userId: string; token: string; name: string }, email: string) { function setSession(result: { userId: string; token: string; name: string }, email: string) {

5
src/routes/post/note/+page.svelte
View file

@ -1,6 +1,6 @@
<script lang="ts"> <script lang="ts">
import { query, mutation } from "$lib/api"; import { query, mutation } from "$lib/api";
import { isAuthenticated, getToken } from "$lib/stores/auth"; import { isAuthenticated, getToken, initAuth } from "$lib/stores/auth";
import { goto } from "$app/navigation"; import { goto } from "$app/navigation";
import { onMount } from "svelte"; import { onMount } from "svelte";
import { get } from "svelte/store"; import { get } from "svelte/store";
@ -19,8 +19,9 @@
let success = $state(""); let success = $state("");
onMount(async () => { onMount(async () => {
await initAuth();
if (!get(isAuthenticated)) { if (!get(isAuthenticated)) {
goto("/auth/login"); goto("/auth/login", { replaceState: true });
return; return;
} }
const [t, u] = await Promise.all([query("topics:getAll"), query("units:getAll")]); const [t, u] = await Promise.all([query("topics:getAll"), query("units:getAll")]);

5
src/routes/post/question/+page.svelte
View file

@ -1,6 +1,6 @@
<script lang="ts"> <script lang="ts">
import { query, mutation } from "$lib/api"; import { query, mutation } from "$lib/api";
import { isAuthenticated, getToken } from "$lib/stores/auth"; import { isAuthenticated, getToken, initAuth } from "$lib/stores/auth";
import { goto } from "$app/navigation"; import { goto } from "$app/navigation";
import { onMount } from "svelte"; import { onMount } from "svelte";
import { get } from "svelte/store"; import { get } from "svelte/store";
@ -19,8 +19,9 @@
let success = $state(""); let success = $state("");
onMount(async () => { onMount(async () => {
await initAuth();
if (!get(isAuthenticated)) { if (!get(isAuthenticated)) {
goto("/auth/login"); goto("/auth/login", { replaceState: true });
return; return;
} }
const [t, u] = await Promise.all([query("topics:getAll"), query("units:getAll")]); const [t, u] = await Promise.all([query("topics:getAll"), query("units:getAll")]);