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

Fix signature of checkForPortBindingsConflict

Browse Source
This commit is contained in:
Girish Ramakrishnan
2024-07-16 19:31:54 +02:00
parent 6d73dfdb40
commit 620c49cf76
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/apps.js
View File

@@ -794,13 +794,13 @@ function accessLevel(app, user) {
return canAccess(app, user) ? 'user' : null;
}
async function checkForPortBindingConflict(portBindings, id = '') {
async function checkForPortBindingConflict(portBindings, options) {
assert.strictEqual(typeof portBindings, 'object');
assert.strictEqual(typeof id, 'string');
assert.strictEqual(typeof options, 'object');
let existingPortBindings;
if (id) existingPortBindings = await database.query('SELECT * FROM appPortBindings WHERE appId != ?', [ id ]);
else existingPortBindings = await database.query('SELECT * FROM appPortBindings', []);
const existingPortBindings = options.appId
? await database.query('SELECT * FROM appPortBindings WHERE appId != ?', [ options.appId ])
: await database.query('SELECT * FROM appPortBindings', []);
if (existingPortBindings.length === 0) return;
@@ -863,7 +863,7 @@ async function add(id, appStoreId, manifest, subdomain, domain, portBindings, da
enableRedis = 'enableRedis' in data ? data.enableRedis : true,
icon = data.icon || null;
await checkForPortBindingConflict(portBindings);
await checkForPortBindingConflict(portBindings, {});
const queries = [];
@@ -955,7 +955,7 @@ async function updateWithConstraints(id, app, constraints) {
if ('portBindings' in app) {
const portBindings = app.portBindings || { };
await checkForPortBindingConflict(portBindings, id);
await checkForPortBindingConflict(portBindings, { appId: id });
// replace entries by app id
queries.push({ query: 'DELETE FROM appPortBindings WHERE appId = ?', args: [ id ] });