web/turnstile: refresh turnstile if it expires in background

also renamed `turnstileLoaded` to `turnstileSolved` for more clarity
This commit is contained in:
wukko
2024-11-18 21:05:47 +06:00
parent e09e098b27
commit b38cb77952
5 changed files with 31 additions and 17 deletions

View File

@@ -5,7 +5,7 @@ import lazySettingGetter from "$lib/settings/lazy-get";
import { getSession } from "$lib/api/session";
import { currentApiURL } from "$lib/api/api-url";
import { turnstileLoaded } from "$lib/state/turnstile";
import { turnstileSolved } from "$lib/state/turnstile";
import { cachedInfo, getServerInfo } from "$lib/api/server-info";
import type { Optional } from "$lib/types/generic";
@@ -49,7 +49,7 @@ const request = async (url: string) => {
} as CobaltErrorResponse;
}
if (getCachedInfo?.info?.cobalt?.turnstileSitekey && !get(turnstileLoaded)) {
if (getCachedInfo?.info?.cobalt?.turnstileSitekey && !get(turnstileSolved)) {
return {
status: "error",
error: {

View File

@@ -1,3 +1,5 @@
import { turnstileSolved } from "$lib/state/turnstile";
const getResponse = () => {
const turnstileElement = document.getElementById("turnstile-widget");
@@ -12,13 +14,28 @@ const update = () => {
const turnstileElement = document.getElementById("turnstile-widget");
if (turnstileElement) {
turnstileSolved.set(false);
return window?.turnstile?.reset(turnstileElement);
}
return null;
}
const refreshIfExpired = () => {
const turnstileElement = document.getElementById("turnstile-widget");
if (turnstileElement) {
const isExpired = window?.turnstile?.isExpired(turnstileElement);
if (isExpired) {
console.log("expired, refreshing the turnstile widget rn");
return update();
}
console.log("turnstile not expired, nothing to do");
}
}
export default {
getResponse,
update,
refreshIfExpired,
}

View File

@@ -1,4 +1,4 @@
import { writable } from "svelte/store";
export const turnstileLoaded = writable(false);
export const turnstileSolved = writable(false);
export const turnstileCreated = writable(false);