Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FEAT: Open ID Cconnect authentication #2630

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
fix: add oidc-config setting via setup.js rather than migrations
marekful committed Mar 6, 2023

Verified

This commit was signed with the committer’s verified signature.
marekful Marcell Fülöp
commit d0d36a95ec96396b81aa428c6332d3b6546c1cb4
40 changes: 0 additions & 40 deletions backend/migrations/20230226135501_add_oidc_config_segging.js

This file was deleted.

42 changes: 27 additions & 15 deletions backend/setup.js
Original file line number Diff line number Diff line change
@@ -131,7 +131,7 @@ const setupDefaultUser = () => {
* @returns {Promise}
*/
const setupDefaultSettings = () => {
return settingModel
return Promise.all([settingModel
.query()
.select(settingModel.raw('COUNT(`id`) as `count`'))
.where({id: 'default-site'})
@@ -148,25 +148,37 @@ const setupDefaultSettings = () => {
meta: {},
})
.then(() => {
logger.info('Default settings added');
});
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: {},
})
.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
.query()
.insert({
id: 'oidc-config',
name: 'Open ID Connect',
description: 'Sign in to Nginx Proxy Manager with an external Identity Provider',
value: 'metadata',
meta: {},
})
.then(() => {
logger.info('Added oidc-config setting');
});
}
if (debug_mode) {
logger.debug('Default setting setup not required');
}
})]);
};

/**