Skip to content

Commit 04e9f9f

Browse files
committed
feat: renewSessions to automatically renew Parse Sessions
1 parent 177891e commit 04e9f9f

File tree

7 files changed

+102
-2
lines changed

7 files changed

+102
-2
lines changed

spec/Auth.spec.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,31 @@ describe('Auth', () => {
9494
});
9595
});
9696

97+
it('can use renewSessions', async () => {
98+
await reconfigureServer({
99+
renewSessions: true,
100+
});
101+
102+
const user = new Parse.User();
103+
await user.signUp({
104+
username: 'hello',
105+
password: 'password',
106+
});
107+
const session = await new Parse.Query(Parse.Session).first();
108+
const updatedAt = new Date('2010');
109+
const expiry = new Date();
110+
111+
await Parse.Server.database.update(
112+
'_Session',
113+
{ objectId: session.id },
114+
{ updatedAt: Parse._encode(updatedAt), expiresAt: Parse._encode(expiry) }
115+
);
116+
await session.fetch();
117+
await new Promise(resolve => setTimeout(resolve, 1000));
118+
await session.fetch();
119+
expect(session.get('expiresAt') > expiry).toBeTrue();
120+
});
121+
97122
it('should load auth without a config', async () => {
98123
const user = new Parse.User();
99124
await user.signUp({

spec/index.spec.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,22 @@ describe('server', () => {
367367
});
368368
});
369369

370+
it('should throw when renewSessions is invalid', async () => {
371+
await expectAsync(
372+
reconfigureServer({
373+
renewSessions: 'yolo',
374+
})
375+
).toBeRejectedWith('renewSessions must be a boolean value');
376+
});
377+
378+
it('should throw when revokeSessionOnPasswordReset is invalid', async () => {
379+
await expectAsync(
380+
reconfigureServer({
381+
revokeSessionOnPasswordReset: 'yolo',
382+
})
383+
).toBeRejectedWith('revokeSessionOnPasswordReset must be a boolean value');
384+
});
385+
370386
it('fails if the session length is not a number', done => {
371387
reconfigureServer({ sessionLength: 'test' })
372388
.then(done.fail)

src/Auth.js

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,47 @@ function nobody(config) {
6666
return new Auth({ config, isMaster: false });
6767
}
6868

69+
const throttle = {};
70+
const renewSessionIfNeeded = async ({ config, session, sessionToken }) => {
71+
if (!config?.renewSessions) {
72+
return;
73+
}
74+
clearTimeout(throttle[sessionToken]);
75+
throttle[sessionToken] = setTimeout(async () => {
76+
try {
77+
if (!session) {
78+
const RestQuery = require('./RestQuery');
79+
const { results } = await new RestQuery(
80+
config,
81+
master(config),
82+
'_Session',
83+
{ sessionToken },
84+
{ limit: 1 }
85+
).execute();
86+
session = results[0];
87+
}
88+
const lastUpdated = new Date(session?.updatedAt);
89+
const yesterday = new Date();
90+
yesterday.setDate(yesterday.getDate() - 1);
91+
if (lastUpdated > yesterday || !session) {
92+
return;
93+
}
94+
await config.database.update(
95+
'_Session',
96+
{ objectId: session.objectId },
97+
{
98+
expiresAt: Parse._encode(config.generateSessionExpiresAt()),
99+
updatedAt: Parse._encode(new Date()),
100+
}
101+
);
102+
} catch (e) {
103+
if (e?.code !== Parse.Error.OBJECT_NOT_FOUND) {
104+
logger.error('Could not update session expiry: ', e);
105+
}
106+
}
107+
}, 500);
108+
};
109+
69110
// Returns a promise that resolves to an Auth object
70111
const getAuthForSessionToken = async function ({
71112
config,
@@ -78,6 +119,7 @@ const getAuthForSessionToken = async function ({
78119
const userJSON = await cacheController.user.get(sessionToken);
79120
if (userJSON) {
80121
const cachedUser = Parse.Object.fromJSON(userJSON);
122+
renewSessionIfNeeded({ config, sessionToken });
81123
return Promise.resolve(
82124
new Auth({
83125
config,
@@ -112,18 +154,20 @@ const getAuthForSessionToken = async function ({
112154
if (results.length !== 1 || !results[0]['user']) {
113155
throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'Invalid session token');
114156
}
157+
const session = results[0];
115158
const now = new Date(),
116-
expiresAt = results[0].expiresAt ? new Date(results[0].expiresAt.iso) : undefined;
159+
expiresAt = session.expiresAt ? new Date(session.expiresAt.iso) : undefined;
117160
if (expiresAt < now) {
118161
throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'Session token is expired.');
119162
}
120-
const obj = results[0]['user'];
163+
const obj = session.user;
121164
delete obj.password;
122165
obj['className'] = '_User';
123166
obj['sessionToken'] = sessionToken;
124167
if (cacheController) {
125168
cacheController.user.put(sessionToken, obj);
126169
}
170+
renewSessionIfNeeded({ config, session, sessionToken });
127171
const userObject = Parse.Object.fromJSON(obj);
128172
return new Auth({
129173
config,

src/Config.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ export class Config {
8686
logLevels,
8787
rateLimit,
8888
databaseOptions,
89+
renewSessions,
8990
}) {
9091
if (masterKey === readOnlyMasterKey) {
9192
throw new Error('masterKey and readOnlyMasterKey should be different');
@@ -103,6 +104,10 @@ export class Config {
103104
throw 'revokeSessionOnPasswordReset must be a boolean value';
104105
}
105106

107+
if (typeof renewSessions !== 'boolean') {
108+
throw 'renewSessions must be a boolean value';
109+
}
110+
106111
if (publicServerURL) {
107112
if (!publicServerURL.startsWith('http://') && !publicServerURL.startsWith('https://')) {
108113
throw 'publicServerURL should be a valid HTTPS URL starting with https://';

src/Options/Definitions.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,12 @@ module.exports.ParseServerOptions = {
435435
env: 'PARSE_SERVER_READ_ONLY_MASTER_KEY',
436436
help: 'Read-only key, which has the same capabilities as MasterKey without writes',
437437
},
438+
renewSessions: {
439+
env: 'PARSE_SERVER_RENEW_SESSIONS',
440+
help: 'Whether Parse Server should automatically extend a valid session by the sessionLength',
441+
action: parsers.booleanParser,
442+
default: false,
443+
},
438444
requestKeywordDenylist: {
439445
env: 'PARSE_SERVER_REQUEST_KEYWORD_DENYLIST',
440446
help:

src/Options/docs.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Options/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,9 @@ export interface ParseServerOptions {
202202
/* Session duration, in seconds, defaults to 1 year
203203
:DEFAULT: 31536000 */
204204
sessionLength: ?number;
205+
/* Whether Parse Server should automatically extend a valid session by the sessionLength
206+
:DEFAULT: false */
207+
renewSessions: ?boolean;
205208
/* Default value for limit option on queries, defaults to `100`.
206209
:DEFAULT: 100 */
207210
defaultLimit: ?number;

0 commit comments

Comments
 (0)