addons can be null in apps.backupApp

addons.backup already takes care of null.

a future commit will give defaults for all non-default manifest fields
at some point and document them as so
This commit is contained in:
Girish Ramakrishnan
2015-08-10 13:44:58 -07:00
parent d757ca02fb
commit 1cbee4d33b
2 changed files with 1 additions and 7 deletions
+1 -1
View File
@@ -675,7 +675,7 @@ function autoupdateApps(updateInfo, callback) { // updateInfo is { appId -> { ma
function backupApp(app, addonsToBackup, callback) {
assert.strictEqual(typeof app, 'object');
assert.strictEqual(typeof addonsToBackup, 'object');
assert(!addonsToBackup || typeof addonsToBackup, 'object');
assert.strictEqual(typeof callback, 'function');
function canBackupApp(app) {
-6
View File
@@ -119,9 +119,6 @@ function installApp(req, res, next) {
// allow tests to provide an appId for testing
var appId = (process.env.BOX_ENV === 'test' && typeof data.appId === 'string') ? data.appId : uuid.v4();
// addons is optional
data.manifest.addons = data.manifest.addons || {};
debug('Installing app id:%s storeid:%s loc:%s port:%j restrict:%s manifest:%j', appId, data.appStoreId, data.location, data.portBindings, data.accessRestriction, data.manifest);
apps.install(appId, data.appStoreId, data.manifest, data.location, data.portBindings || null, data.accessRestriction, data.icon || null, function (error) {
@@ -256,9 +253,6 @@ function updateApp(req, res, next) {
if ('icon' in data && typeof data.icon !== 'string') return next(new HttpError(400, 'icon is not a string'));
if ('force' in data && typeof data.force !== 'boolean') return next(new HttpError(400, 'force must be a boolean'));
// addons is optional
data.manifest.addons = data.manifest.addons || {};
debug('Update app id:%s to manifest:%j', req.params.id, data.manifest);
apps.update(req.params.id, data.force || false, data.manifest, data.portBindings, data.icon, function (error) {