web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix an API change that caused a typeError

Browse Source
This commit is contained in:
ansuz 2020-02-03 18:47:18 -05:00
parent 88be40ede3
commit 46dfa026f0
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/commands/core.js
View File

@ -59,14 +59,18 @@ Core.getSession = function (Sessions, key) {
return user; return user;
}; };
Core.expireSession = function (Sessions, key, cb) { Core.expireSession = function (Sessions, safeKey) {
var session = Sessions[safeKey];
if (!session) { return; }
if (session.blobstage) {
session.blobstage.close();
}
delete Sessions[safeKey];
};
Core.expireSessionAsync = function (Env, safeKey, cb) {
setTimeout(function () { setTimeout(function () {
var session = Sessions[key]; Core.expireSession(Sessions, safeKey);
if (!session) { return; }
if (session.blobstage) {
session.blobstage.close();
}
delete Sessions[key];
cb(void 0, 'OK'); cb(void 0, 'OK');
}); });
}; };
@ -77,10 +81,10 @@ var isTooOld = function (time, now) {
Core.expireSessions = function (Sessions) { Core.expireSessions = function (Sessions) {
var now = +new Date(); var now = +new Date();
Object.keys(Sessions).forEach(function (key) { Object.keys(Sessions).forEach(function (safeKey) {
var session = Sessions[key]; var session = Sessions[safeKey];
if (session && isTooOld(session.atime, now)) { if (session && isTooOld(session.atime, now)) {
Core.expireSession(Sessions, key); Core.expireSession(Sessions, safeKey);
} }
}); });
}; };

2
lib/rpc.js
View File

@ -130,7 +130,7 @@ const AUTHENTICATED_USER_SCOPED = {
GET_TOTAL_SIZE: Pinning.getTotalSize, GET_TOTAL_SIZE: Pinning.getTotalSize,
UPDATE_LIMITS: Quota.updateLimits, UPDATE_LIMITS: Quota.updateLimits,
GET_LIMIT: Pinning.getLimit, GET_LIMIT: Pinning.getLimit,
EXPIRE_SESSION: Core.expireSession, EXPIRE_SESSION: Core.expireSessionAsync,
REMOVE_PINS: Pinning.removePins, REMOVE_PINS: Pinning.removePins,
TRIM_PINS: Pinning.trimPins, TRIM_PINS: Pinning.trimPins,
SET_METADATA: Metadata.setMetadata, SET_METADATA: Metadata.setMetadata,