Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Use LRUCache for extendSessionOnUse #8683

Open
wants to merge 14 commits into
base: alpha
Choose a base branch
from
Open

fix: Use LRUCache for extendSessionOnUse #8683

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
135be44
Update Auth.js
dblythy Jul 6, 2023
89f28c7
wip
dblythy Jul 6, 2023
f6b2113
Update Auth.js
dblythy Jul 6, 2023
ba02bb4
Merge branch 'alpha' into extend-session-fix
dblythy Jul 7, 2023
295ec23
Merge remote-tracking branch 'upstream/alpha' into extend-session-fix
dblythy Jan 13, 2025
24df469
Update Auth.js
dblythy Jan 13, 2025
9c11700
Merge branch 'alpha' into extend-session-fix
mtrezza Jan 16, 2025
2437410
Merge branch 'alpha' into extend-session-fix
dblythy Jan 28, 2025
a71fd7e
Merge branch 'alpha' into extend-session-fix
mtrezza Jan 29, 2025
7c77d64
Update Auth.js
dblythy Jan 29, 2025
70783d1
Update Auth.js
dblythy Jan 29, 2025
2aeaf9a
Update Auth.js
dblythy Jan 29, 2025
149ce03
Merge branch 'alpha' into extend-session-fix
mtrezza Feb 3, 2025
626c2c4
Merge branch 'alpha' into extend-session-fix
mtrezza Feb 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions spec/Auth.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ describe('Auth', () => {
updatedAt: updatedAt.toISOString(),
}
);
Parse.Server.cacheController.clear();
Copy link
Member

@mtrezza mtrezza Feb 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we convert this to async while already at it? Would that be a lot of work? Then we could also remove the 1s sleep below, which adds to the CI time.

await new Promise(resolve => setTimeout(resolve, 1000));
await session.fetch();
await new Promise(resolve => setTimeout(resolve, 1000));
await session.fetch();
Expand Down
60 changes: 26 additions & 34 deletions src/Auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { isDeepStrictEqual } from 'util';
import { getRequestObject, resolveError } from './triggers';
import Deprecator from './Deprecator/Deprecator';
import { logger } from './logger';
import RestQuery from './RestQuery';
import RestWrite from './RestWrite';

// An Auth object tells you who is requesting something and whether
Expand Down Expand Up @@ -73,39 +72,33 @@ const renewSessionIfNeeded = async ({ config, session, sessionToken }) => {
if (!config?.extendSessionOnUse) {
return;
}
clearTimeout(throttle[sessionToken]);
throttle[sessionToken] = setTimeout(async () => {
try {
if (!session) {
const { results } = await new RestQuery(
config,
master(config),
'_Session',
{ sessionToken },
{ limit: 1 }
).execute();
session = results[0];
}
const lastUpdated = new Date(session?.updatedAt);
const yesterday = new Date();
yesterday.setDate(yesterday.getDate() - 1);
if (lastUpdated > yesterday || !session) {
return;
}
const expiresAt = config.generateSessionExpiresAt();
await new RestWrite(
config,
master(config),
'_Session',
{ objectId: session.objectId },
{ expiresAt: Parse._encode(expiresAt) }
).execute();
} catch (e) {
if (e?.code !== Parse.Error.OBJECT_NOT_FOUND) {
logger.error('Could not update session expiry: ', e);
}
}
if (throttle[sessionToken]) {
return;
}
throttle[sessionToken] = true;
setTimeout(() => {
delete throttle[sessionToken];
dblythy marked this conversation as resolved.
Show resolved Hide resolved
}, 500);
try {
const lastUpdated = new Date(session?.updatedAt);
const yesterday = new Date();
yesterday.setDate(yesterday.getDate() - 1);
if (lastUpdated > yesterday || !session) {
return;
}
const expiresAt = config.generateSessionExpiresAt();
await new RestWrite(
config,
master(config),
'_Session',
{ objectId: session.objectId },
{ expiresAt: Parse._encode(expiresAt) }
).execute();
} catch (e) {
if (e?.code !== Parse.Error.OBJECT_NOT_FOUND) {
logger.error('Could not update session expiry: ', e);
}
}
};

// Returns a promise that resolves to an Auth object
Expand All @@ -120,7 +113,6 @@ const getAuthForSessionToken = async function ({
const userJSON = await cacheController.user.get(sessionToken);
if (userJSON) {
const cachedUser = Parse.Object.fromJSON(userJSON);
renewSessionIfNeeded({ config, sessionToken });
return Promise.resolve(
new Auth({
config,
Expand Down