Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-05-31 20:24:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use a promise cache to only refresh tokens one time on client side navigation

Browse Source
This commit is contained in:
Zoe Roux 2023-12-04 22:27:22 +01:00
parent f9a2185748
commit eed764c6e0
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.dev.yml
View File

@ -57,7 +57,7 @@ services:
ports: ports:
- "7666:7666" - "7666:7666"
restart: on-failure restart: on-failure
cpus: 0.2 cpus: 1
env_file: env_file:
- ./.env - ./.env
volumes: volumes:

50
front/packages/models/src/login.ts
View File

@ -23,6 +23,7 @@ import { KyooErrors } from "./kyoo-errors";
import { Account, Token, TokenP } from "./accounts"; import { Account, Token, TokenP } from "./accounts";
import { UserP } from "./resources"; import { UserP } from "./resources";
import { addAccount, getCurrentAccount, removeAccounts, updateAccount } from "./account-internal"; import { addAccount, getCurrentAccount, removeAccounts, updateAccount } from "./account-internal";
import { Platform } from "react-native";
type Result<A, B> = type Result<A, B> =
| { ok: true; value: A; error?: undefined } | { ok: true; value: A; error?: undefined }
@ -59,28 +60,43 @@ export const login = async (
} }
}; };
let running: ReturnType<typeof getTokenWJ> | null = null;
export const getTokenWJ = async ( export const getTokenWJ = async (
account?: Account | null, account?: Account | null,
): Promise<[string, Token] | [null, null]> => { ): ReturnType<typeof run> => {
if (account === undefined) account = getCurrentAccount(); async function run() {
if (!account) return [null, null]; if (account === undefined) account = getCurrentAccount();
if (!account) return [null, null] as const;
if (account.token.expire_at <= new Date(new Date().getTime() + 10 * 1000)) { if (account.token.expire_at <= new Date(new Date().getTime() + 10 * 1000)) {
try { console.log("refreshing token...");
const token = await queryFn( try {
{ const token = await queryFn(
path: ["auth", "refresh", `?token=${account.token.refresh_token}`], {
method: "GET", path: ["auth", "refresh", `?token=${account.token.refresh_token}`],
authenticated: false, method: "GET",
}, authenticated: false,
TokenP, },
); TokenP,
if (typeof window !== "undefined") updateAccount(account.id, { ...account, token }); );
} catch (e) { if (Platform.OS === "web" && typeof window !== "undefined")
console.error("Error refreshing token durring ssr:", e); updateAccount(account.id, { ...account, token });
} catch (e) {
console.error("Error refreshing token durring ssr:", e);
}
} }
return [`${account.token.token_type} ${account.token.access_token}`, account.token] as const;
} }
return [`${account.token.token_type} ${account.token.access_token}`, account.token];
// Do not cache promise durring ssr.
if (Platform.OS === "web" && typeof window === "undefined") return await run();
if (running) return await running;
running = run();
const ret = await running;
running = null;
return ret;
}; };
export const getToken = async (): Promise<string | null> => (await getTokenWJ())[0]; export const getToken = async (): Promise<string | null> => (await getTokenWJ())[0];