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

abort sequenced actions whenever you callback

Browse Source
This commit is contained in:
ansuz 2018-09-17 14:29:49 -04:00
parent 4025022352
commit a5cffe7eb2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
customize.dist/login.js
View File

@ -191,7 +191,10 @@ define([
// load the user's object using the legacy credentials // load the user's object using the legacy credentials
loadUserObject(opt, waitFor(function (err, rt) { loadUserObject(opt, waitFor(function (err, rt) {
if (err) { return void cb(err); } if (err) {
waitFor.abort();
return void cb(err);
}
// if a proxy is marked as deprecated, it is because someone had a non-owned drive // if a proxy is marked as deprecated, it is because someone had a non-owned drive
// but changed their password, and couldn't delete their old data. // but changed their password, and couldn't delete their old data.
@ -199,6 +202,7 @@ define([
// allow them to proceed. In time, their old drive should get deleted, since // allow them to proceed. In time, their old drive should get deleted, since
// it will should be pinned by anyone's drive. // it will should be pinned by anyone's drive.
if (rt.proxy[Constants.deprecatedKey]) { if (rt.proxy[Constants.deprecatedKey]) {
waitFor.abort();
return void cb('NO_SUCH_USER', res); return void cb('NO_SUCH_USER', res);
} }