workflow changes

This commit is contained in:
SPRINX0\prochazka
2024-10-22 17:06:56 +02:00
parent 634bea1bda
commit a46e592cfb
2 changed files with 8 additions and 4 deletions

View File

@@ -91,7 +91,12 @@ module.exports = {
const { amoid, login, password, isAdminPage } = params; const { amoid, login, password, isAdminPage } = params;
if (isAdminPage) { if (isAdminPage) {
if (process.env.ADMIN_PASSWORD && process.env.ADMIN_PASSWORD == password) { let adminPassword = process.env.ADMIN_PASSWORD;
if (!adminPassword) {
const adminConfig = await storage.readConfig({ group: 'admin' });
adminPassword = adminConfig?.adminPassword;
}
if (adminPassword && adminPassword == password) {
return { return {
accessToken: jwt.sign( accessToken: jwt.sign(
{ {

View File

@@ -91,9 +91,8 @@ module.exports = {
isBasicAuth: !!process.env.BASIC_AUTH, isBasicAuth: !!process.env.BASIC_AUTH,
isAdminLoginForm: !!( isAdminLoginForm: !!(
process.env.STORAGE_DATABASE && process.env.STORAGE_DATABASE &&
process.env.ADMIN_PASSWORD && (process.env.ADMIN_PASSWORD || adminConfig?.adminPasswordState == 'set') &&
!process.env.BASIC_AUTH && !process.env.BASIC_AUTH
checkedLicense?.type == 'premium'
), ),
isAdminPasswordMissing, isAdminPasswordMissing,
isInvalidToken: req.isInvalidToken, isInvalidToken: req.isInvalidToken,