Make use of LOGINS and OAUTH_PERMISSIONS exclusive

This commit is contained in:
michael-pattern
2024-05-15 12:40:09 -04:00
parent 471fcdc131
commit cb9921918f

View File

@@ -39,7 +39,7 @@ function getLogins() {
permissions: process.env.PERMISSIONS, permissions: process.env.PERMISSIONS,
}); });
} }
if (process.env.LOGINS || process.env.OAUTH_PERMISSIONS) { if (process.env.LOGINS) {
const logins = _.compact(process.env.LOGINS.split(',').map(x => x.trim())); const logins = _.compact(process.env.LOGINS.split(',').map(x => x.trim()));
for (const login of logins) { for (const login of logins) {
const password = process.env[`LOGIN_PASSWORD_${login}`]; const password = process.env[`LOGIN_PASSWORD_${login}`];
@@ -51,7 +51,13 @@ function getLogins() {
permissions, permissions,
}); });
} }
if (process.env.OAUTH_PERMISSIONS) { }
}
else if (process.env.OAUTH_PERMISSIONS) {
const login_permission_keys = Object.keys(process.env).filter((key) => _.startsWith(key, 'LOGIN_PERMISSIONS_'))
for (const permissions_key of login_permission_keys) {
const login = permissions_key.replace('LOGIN_PERMISSIONS_', '');
const permissions = process.env[permissions_key];
res.push({ res.push({
login, login,
password: null, password: null,
@@ -59,7 +65,6 @@ function getLogins() {
}) })
} }
} }
}
loginsCache = res.length > 0 ? res : null; loginsCache = res.length > 0 ? res : null;
loginsLoaded = true; loginsLoaded = true;