diff --git a/backend/authentication/auth.js b/backend/authentication/auth.js index 0ab6e00..360e7c3 100644 --- a/backend/authentication/auth.js +++ b/backend/authentication/auth.js @@ -221,7 +221,7 @@ exports.returnAuthResponse = async function(req, res) { user: req.user, token: req.token, permissions: await exports.userPermissions(req.user.uid), - available_permissions: consts['AVAILABLE_PERMISSIONS'] + available_permissions: CONSTS.AVAILABLE_PERMISSIONS }); } @@ -392,8 +392,8 @@ exports.userPermissions = async function(user_uid) { const role_obj = await db_api.getRecord('roles', {key: role}); const role_permissions = role_obj['permissions']; - for (let i = 0; i < consts['AVAILABLE_PERMISSIONS'].length; i++) { - let permission = consts['AVAILABLE_PERMISSIONS'][i]; + for (let i = 0; i < CONSTS.AVAILABLE_PERMISSIONS.length; i++) { + let permission = CONSTS.AVAILABLE_PERMISSIONS[i]; const user_has_explicit_permission = user_obj['permissions'].includes(permission); const permission_in_overrides = user_obj['permission_overrides'].includes(permission); diff --git a/backend/tasks.js b/backend/tasks.js index 11c2b70..b5c899e 100644 --- a/backend/tasks.js +++ b/backend/tasks.js @@ -280,7 +280,6 @@ async function autoDeleteFiles(data) { async function rebuildDB() { await db_api.backupDB(); let subs_to_add = await guessSubscriptions(false); - let subs_to_add = await guessSubscriptions(true); subs_to_add = subs_to_add.concat(await guessSubscriptions(true)); const users_to_add = await guessUsers(); for (const user_to_add of users_to_add) { @@ -288,7 +287,7 @@ async function rebuildDB() { const user_exists = await db_api.getRecord('users', {uid: user_to_add}); if (!user_exists) { - await auth_api.registerUser(user_to_add, user_to_add, ''); + await auth_api.registerUser(user_to_add, user_to_add, 'password'); logger.info(`Regenerated user ${user_to_add}`); }