Merge branch 'v1.0' into v1

This commit is contained in:
AJ ONeal 2017-06-08 21:47:47 +00:00
commit 7b0e2ac85b
1 changed files with 2 additions and 1 deletions

View File

@ -554,7 +554,7 @@ module.exports.create = function (xconfx, apiFactories, apiDeps) {
});
// TODO cache permission (although the FS is already cached, NBD)
return isThisClientAllowedToUseThisPkg(xconfx, clientUrih, pkgId).then(function (yes) {
var promise = isThisClientAllowedToUseThisPkg(xconfx, clientUrih, pkgId).then(function (yes) {
if (!yes) {
notConfigured(req, res);
return null;
@ -585,6 +585,7 @@ module.exports.create = function (xconfx, apiFactories, apiDeps) {
});
}
});
rejectableRequest(req, res, promise, "[com.daplie.walnut] load api package");
});
};
};