fix: add oidc-config setting via setup.js rather than migrations

This commit is contained in:
Marcell Fülöp 2023-03-06 09:33:01 +00:00
parent fd49644f21
commit d0d36a95ec
No known key found for this signature in database
GPG Key ID: F0D4F153995E73BB
2 changed files with 27 additions and 55 deletions

View File

@ -1,40 +0,0 @@
const migrate_name = 'oidc_config_setting';
const settingModel = require('../models/setting');
const logger = require('../logger').migrate;
/**
* Migrate
*
* @see http://knexjs.org/#Schema
*
* @param {Promise} Promise
* @returns {Promise}
*/
exports.up = function () {
logger.info('[' + migrate_name + '] Migrating Up...');
return settingModel
.query()
.insert({
id: 'oidc-config',
name: 'Open ID Connect',
description: 'Sign in to Nginx Proxy Manager with an external Identity Provider',
value: 'metadata',
meta: {},
});
};
/**
* Undo Migrate
*
* @param {Promise} Promise
* @returns {Promise}
*/
exports.down = function () {
logger.info('[' + migrate_name + '] Migrating Down...');
return settingModel
.query()
.delete()
.where('setting_id', 'oidc-config');
};

View File

@ -131,7 +131,7 @@ const setupDefaultUser = () => {
* @returns {Promise} * @returns {Promise}
*/ */
const setupDefaultSettings = () => { const setupDefaultSettings = () => {
return settingModel return Promise.all([settingModel
.query() .query()
.select(settingModel.raw('COUNT(`id`) as `count`')) .select(settingModel.raw('COUNT(`id`) as `count`'))
.where({id: 'default-site'}) .where({id: 'default-site'})
@ -148,8 +148,20 @@ const setupDefaultSettings = () => {
meta: {}, meta: {},
}) })
.then(() => { .then(() => {
logger.info('Default settings added'); logger.info('Added default-site setting');
}); });
}
if (debug_mode) {
logger.debug('Default setting setup not required');
}
}),
settingModel
.query()
.select(settingModel.raw('COUNT(`id`) as `count`'))
.where({id: 'oidc-config'})
.first()
.then((row) => {
if (!row.count) {
settingModel settingModel
.query() .query()
.insert({ .insert({
@ -160,13 +172,13 @@ const setupDefaultSettings = () => {
meta: {}, meta: {},
}) })
.then(() => { .then(() => {
logger.info('Default settings added'); logger.info('Added oidc-config setting');
}); });
} }
if (debug_mode) { if (debug_mode) {
logger.debug('Default setting setup not required'); logger.debug('Default setting setup not required');
} }
}); })]);
}; };
/** /**