diff --git a/src/apps.js b/src/apps.js index 600652036..97aa9fb81 100644 --- a/src/apps.js +++ b/src/apps.js @@ -433,7 +433,7 @@ function install(appId, appStoreId, manifest, location, portBindings, accessRest purchase(appStoreId, function (error) { if (error) return callback(error); - appdb.add(appId, appStoreId, manifest, location.toLowerCase(), portBindings, accessRestriction, false, memoryLimit, function (error) { + appdb.add(appId, appStoreId, manifest, location.toLowerCase(), portBindings, accessRestriction, memoryLimit, function (error) { if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location.toLowerCase(), portBindings, error)); if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error)); diff --git a/src/routes/test/backups-test.js b/src/routes/test/backups-test.js index ff1c3fd2b..695827c3f 100644 --- a/src/routes/test/backups-test.js +++ b/src/routes/test/backups-test.js @@ -51,7 +51,7 @@ function setup(done) { function addApp(callback) { var manifest = { version: '0.0.1', manifestVersion: 1, dockerImage: 'foo', healthCheckPath: '/', httpPort: 3, title: 'ok', addons: { } }; - appdb.add('appid', 'appStoreId', manifest, 'location', [ ] /* portBindings */, null /* accessRestriction */, false /* oauthProxy */, 0 /* memoryLimit */, callback); + appdb.add('appid', 'appStoreId', manifest, 'location', [ ] /* portBindings */, null /* accessRestriction */, 0 /* memoryLimit */, callback); }, function createSettings(callback) { diff --git a/src/routes/test/oauth2-test.js b/src/routes/test/oauth2-test.js index bcd6590fd..7381646ac 100644 --- a/src/routes/test/oauth2-test.js +++ b/src/routes/test/oauth2-test.js @@ -155,7 +155,6 @@ describe('OAuth2', function () { location: 'test', portBindings: {}, accessRestriction: null, - oauthProxy: true, memoryLimit: 0 }; @@ -166,7 +165,6 @@ describe('OAuth2', function () { location: 'test1', portBindings: {}, accessRestriction: { users: [ 'foobar' ] }, - oauthProxy: true, memoryLimit: 0 }; @@ -177,7 +175,6 @@ describe('OAuth2', function () { location: 'test2', portBindings: {}, accessRestriction: { users: [ USER_0.id ] }, - oauthProxy: true, memoryLimit: 0 }; @@ -188,7 +185,6 @@ describe('OAuth2', function () { location: 'test3', portBindings: {}, accessRestriction: { groups: [ 'someothergroup', 'admin', 'anothergroup' ] }, - oauthProxy: true, memoryLimit: 0 }; @@ -312,10 +308,10 @@ describe('OAuth2', function () { clientdb.add.bind(null, CLIENT_7.id, CLIENT_7.appId, CLIENT_7.type, CLIENT_7.clientSecret, CLIENT_7.redirectURI, CLIENT_7.scope), clientdb.add.bind(null, CLIENT_8.id, CLIENT_8.appId, CLIENT_8.type, CLIENT_8.clientSecret, CLIENT_8.redirectURI, CLIENT_8.scope), clientdb.add.bind(null, CLIENT_9.id, CLIENT_9.appId, CLIENT_9.type, CLIENT_9.clientSecret, CLIENT_9.redirectURI, CLIENT_9.scope), - appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.oauthProxy, APP_0.memoryLimit), - appdb.add.bind(null, APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, APP_1.portBindings, APP_1.accessRestriction, APP_1.oauthProxy, APP_1.memoryLimit), - appdb.add.bind(null, APP_2.id, APP_2.appStoreId, APP_2.manifest, APP_2.location, APP_2.portBindings, APP_2.accessRestriction, APP_2.oauthProxy, APP_2.memoryLimit), - appdb.add.bind(null, APP_3.id, APP_3.appStoreId, APP_3.manifest, APP_3.location, APP_3.portBindings, APP_3.accessRestriction, APP_3.oauthProxy, APP_3.memoryLimit), + appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.memoryLimit), + appdb.add.bind(null, APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, APP_1.portBindings, APP_1.accessRestriction, APP_1.memoryLimit), + appdb.add.bind(null, APP_2.id, APP_2.appStoreId, APP_2.manifest, APP_2.location, APP_2.portBindings, APP_2.accessRestriction, APP_2.memoryLimit), + appdb.add.bind(null, APP_3.id, APP_3.appStoreId, APP_3.manifest, APP_3.location, APP_3.portBindings, APP_3.accessRestriction, APP_3.memoryLimit), function (callback) { user.create(USER_0.username, USER_0.password, USER_0.email, USER_0.displayName, function (error, userObject) { expect(error).to.not.be.ok(); diff --git a/src/routes/test/settings-test.js b/src/routes/test/settings-test.js index 8478cfd7b..635630780 100644 --- a/src/routes/test/settings-test.js +++ b/src/routes/test/settings-test.js @@ -56,7 +56,7 @@ function setup(done) { function addApp(callback) { var manifest = { version: '0.0.1', manifestVersion: 1, dockerImage: 'foo', healthCheckPath: '/', httpPort: 3, title: 'ok' }; - appdb.add('appid', 'appStoreId', manifest, 'location', [ ] /* portBindings */, null /* accessRestriction */, false /* oauthProxy */, 0 /* memoryLimit */, callback); + appdb.add('appid', 'appStoreId', manifest, 'location', [ ] /* portBindings */, null /* accessRestriction */, 0 /* memoryLimit */, callback); } ], done); } diff --git a/src/routes/test/simpleauth-test.js b/src/routes/test/simpleauth-test.js index 17a8d0935..9cde9e775 100644 --- a/src/routes/test/simpleauth-test.js +++ b/src/routes/test/simpleauth-test.js @@ -30,7 +30,6 @@ describe('SimpleAuth API', function () { location: 'test0', portBindings: {}, accessRestriction: { users: [ 'foobar', 'someone'] }, - oauthProxy: true, memoryLimit: 0 }; @@ -41,7 +40,6 @@ describe('SimpleAuth API', function () { location: 'test1', portBindings: {}, accessRestriction: { users: [ 'foobar', USERNAME, 'someone' ] }, - oauthProxy: true, memoryLimit: 0 }; @@ -52,7 +50,6 @@ describe('SimpleAuth API', function () { location: 'test2', portBindings: {}, accessRestriction: null, - oauthProxy: true, memoryLimit: 0 }; @@ -63,7 +60,6 @@ describe('SimpleAuth API', function () { location: 'test3', portBindings: {}, accessRestriction: { groups: [ 'someothergroup', 'admin', 'anothergroup' ] }, - oauthProxy: true, memoryLimit: 0 }; @@ -152,10 +148,10 @@ describe('SimpleAuth API', function () { clientdb.add.bind(null, CLIENT_3.id, CLIENT_3.appId, CLIENT_3.type, CLIENT_3.clientSecret, CLIENT_3.redirectURI, CLIENT_3.scope), clientdb.add.bind(null, CLIENT_4.id, CLIENT_4.appId, CLIENT_4.type, CLIENT_4.clientSecret, CLIENT_4.redirectURI, CLIENT_4.scope), clientdb.add.bind(null, CLIENT_5.id, CLIENT_5.appId, CLIENT_5.type, CLIENT_5.clientSecret, CLIENT_5.redirectURI, CLIENT_5.scope), - appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.oauthProxy, APP_0.memoryLimit), - appdb.add.bind(null, APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, APP_1.portBindings, APP_1.accessRestriction, APP_1.oauthProxy, APP_1.memoryLimit), - appdb.add.bind(null, APP_2.id, APP_2.appStoreId, APP_2.manifest, APP_2.location, APP_2.portBindings, APP_2.accessRestriction, APP_2.oauthProxy, APP_2.memoryLimit), - appdb.add.bind(null, APP_3.id, APP_3.appStoreId, APP_3.manifest, APP_3.location, APP_3.portBindings, APP_3.accessRestriction, APP_3.oauthProxy, APP_3.memoryLimit) + appdb.add.bind(null, APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.memoryLimit), + appdb.add.bind(null, APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, APP_1.portBindings, APP_1.accessRestriction, APP_1.memoryLimit), + appdb.add.bind(null, APP_2.id, APP_2.appStoreId, APP_2.manifest, APP_2.location, APP_2.portBindings, APP_2.accessRestriction, APP_2.memoryLimit), + appdb.add.bind(null, APP_3.id, APP_3.appStoreId, APP_3.manifest, APP_3.location, APP_3.portBindings, APP_3.accessRestriction, APP_3.memoryLimit) ], done); });