tea/browsertrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix auth not persisting on reload (#360)

Browse Source
This commit is contained in:
sua yoo 2022-11-15 13:17:29 -08:00 committed by GitHub
parent 8c4348b9f8
commit 1ef9f7df6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
frontend/src/utils/AuthService.ts
View File

@ -159,18 +159,18 @@ export default class AuthService {
private async checkFreshness() { private async checkFreshness() {
window.clearTimeout(this.timerId); window.clearTimeout(this.timerId);
console.debug("checkFreshness authState:", this._authState); // console.debug("checkFreshness authState:", this._authState);
if (!this._authState) return; if (!this._authState) return;
const paddedNow = Date.now() + FRESHNESS_TIMER_INTERVAL; const paddedNow = Date.now() + FRESHNESS_TIMER_INTERVAL - 500; // tweak padding to account for API fetch time
if (this._authState.sessionExpiresAt > paddedNow) { if (this._authState.sessionExpiresAt > paddedNow) {
if (this._authState.tokenExpiresAt > paddedNow) { if (this._authState.tokenExpiresAt > paddedNow) {
console.debug( // console.debug(
"fresh! restart timer tokenExpiresAt:", // "fresh! restart timer tokenExpiresAt:",
new Date(this._authState.tokenExpiresAt) // new Date(this._authState.tokenExpiresAt)
); // );
console.debug("fresh! restart timer paddedNow:", new Date(paddedNow)); // console.debug("fresh! restart timer paddedNow:", new Date(paddedNow));
// Restart timer // Restart timer
this.timerId = window.setTimeout(() => { this.timerId = window.setTimeout(() => {
this.checkFreshness(); this.checkFreshness();
@ -180,15 +180,16 @@ export default class AuthService {
const auth = await this.refresh(); const auth = await this.refresh();
this._authState.headers = auth.headers; this._authState.headers = auth.headers;
this._authState.tokenExpiresAt = auth.tokenExpiresAt; this._authState.tokenExpiresAt = auth.tokenExpiresAt;
this.persist(this._authState);
console.debug( // console.debug(
"refreshed. restart timer tokenExpiresAt:", // "refreshed. restart timer tokenExpiresAt:",
new Date(this._authState.tokenExpiresAt) // new Date(this._authState.tokenExpiresAt)
); // );
console.debug( // console.debug(
"refreshed. restart timer paddedNow:", // "refreshed. restart timer paddedNow:",
new Date(paddedNow) // new Date(paddedNow)
); // );
// Restart timer // Restart timer
this.timerId = window.setTimeout(() => { this.timerId = window.setTimeout(() => {