jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove oauthProxy usage in the database wrapper

Browse Source
This commit is contained in:
Johannes Zellner
2016-02-19 16:12:58 +01:00
parent 85c92ab0b4
commit d4480ec407
6 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/apps-test.js
+1 -2
View File
@@ -37,7 +37,6 @@ describe('Apps', function () {
portBindings: { PORT: 5678 },
healthy: null,
accessRestriction: null,
oauthProxy: false,
memoryLimit: 0
};
@@ -45,7 +44,7 @@ describe('Apps', function () {
async.series([
database.initialize,
database._clear,
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_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.memoryLimit)
], done);
});
src/test/apptask-test.js
+1 -2
View File
@@ -60,7 +60,6 @@ var APP = {
httpPort: 4567,
portBindings: null,
accessRestriction: null,
oauthProxy: false,
dnsRecordId: 'someDnsRecordId',
memoryLimit: 0
};
@@ -85,7 +84,7 @@ describe('apptask', function () {
config.set('version', '0.5.0');
async.series([
database.initialize,
appdb.add.bind(null, APP.id, APP.appStoreId, APP.manifest, APP.location, APP.portBindings, APP.accessRestriction, APP.oauthProxy, APP.memoryLimit),
appdb.add.bind(null, APP.id, APP.appStoreId, APP.manifest, APP.location, APP.portBindings, APP.accessRestriction, APP.memoryLimit),
settings.setDnsConfig.bind(null, { provider: 'route53', accessKeyId: 'accessKeyId', secretAccessKey: 'secretAccessKey', endpoint: 'http://localhost:5353' }),
settings.setTlsConfig.bind(null, { provider: 'caas' })
], done);
src/test/database-test.js
+3 -7
View File
@@ -476,7 +476,6 @@ describe('database', function () {
portBindings: { port: 5678 },
health: null,
accessRestriction: null,
oauthProxy: false,
lastBackupId: null,
lastBackupConfig: null,
oldConfig: null,
@@ -496,7 +495,6 @@ describe('database', function () {
portBindings: { },
health: null,
accessRestriction: { users: [ 'foobar' ] },
oauthProxy: true,
lastBackupId: null,
lastBackupConfig: null,
oldConfig: null,
@@ -517,7 +515,7 @@ describe('database', function () {
});
it('add succeeds', function (done) {
appdb.add(APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.oauthProxy, APP_0.memoryLimit, function (error) {
appdb.add(APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.memoryLimit, function (error) {
expect(error).to.be(null);
done();
});
@@ -541,7 +539,7 @@ describe('database', function () {
});
it('add of same app fails', function (done) {
appdb.add(APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, [ ], APP_0.accessRestriction, APP_0.oauthProxy, APP_0.memoryLimit, function (error) {
appdb.add(APP_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, [ ], APP_0.accessRestriction, APP_0.memoryLimit, function (error) {
expect(error).to.be.a(DatabaseError);
expect(error.reason).to.be(DatabaseError.ALREADY_EXISTS);
done();
@@ -571,7 +569,6 @@ describe('database', function () {
APP_0.location = 'some-other-location';
APP_0.manifest.version = '0.2';
APP_0.accessRestriction = '';
APP_0.oauthProxy = true;
APP_0.httpPort = 1337;
APP_0.memoryLimit = 1337;
@@ -580,7 +577,6 @@ describe('database', function () {
location: APP_0.location,
manifest: APP_0.manifest,
accessRestriction: APP_0.accessRestriction,
oauthProxy: APP_0.oauthProxy,
httpPort: APP_0.httpPort,
memoryLimit: APP_0.memoryLimit
};
@@ -615,7 +611,7 @@ describe('database', function () {
});
it('add second app succeeds', function (done) {
appdb.add(APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, [ ], APP_1.accessRestriction, APP_0.oauthProxy, APP_1.memoryLimit, function (error) {
appdb.add(APP_1.id, APP_1.appStoreId, APP_1.manifest, APP_1.location, [ ], APP_1.accessRestriction, APP_1.memoryLimit, function (error) {
expect(error).to.be(null);
done();
});
src/test/ldap-test.js
+1 -2
View File
@@ -48,7 +48,6 @@ var APP_0 = {
portBindings: { port: 5678 },
health: null,
accessRestriction: null,
oauthProxy: false,
lastBackupId: null,
lastBackupConfig: null,
oldConfig: null,
@@ -69,7 +68,7 @@ function setup(done) {
database.initialize.bind(null),
database._clear.bind(null),
ldapServer.start.bind(null),
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_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.memoryLimit),
appdb.update.bind(null, APP_0.id, { containerId: APP_0.containerId }),
user.createOwner.bind(null, USER_0.username, USER_0.password, USER_0.email, USER_0.displayName),
user.create.bind(null, USER_1.username, USER_1.password, USER_1.email, USER_0.displayName, { invitor: USER_0 })
src/test/updatechecker-test.js
+1 -2
View File
@@ -196,7 +196,6 @@ describe('updatechecker - checkAppUpdates', function () {
portBindings: { PORT: 5678 },
healthy: null,
accessRestriction: null,
oauthProxy: false,
memoryLimit: 0
};
@@ -206,7 +205,7 @@ describe('updatechecker - checkAppUpdates', function () {
async.series([
database.initialize,
database._clear,
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_0.id, APP_0.appStoreId, APP_0.manifest, APP_0.location, APP_0.portBindings, APP_0.accessRestriction, APP_0.memoryLimit)
], done);
});