diff --git a/sites/backend/src/models/pattern.mjs b/sites/backend/src/models/pattern.mjs index 63657a4cee5..d45d24c88c2 100644 --- a/sites/backend/src/models/pattern.mjs +++ b/sites/backend/src/models/pattern.mjs @@ -572,7 +572,7 @@ const v2lut = { * This is a special route not available for API users */ PatternModel.prototype.import = async function (v2user, lut, userId) { - for (const [handle, pattern] of Object.entries(v2user.patterns)) { + for (const pattern of Object.values(v2user.patterns)) { let skip = false const data = { ...migratePattern(pattern, userId), userId } if (lut[pattern.person]) data.setId = lut[pattern.person] diff --git a/sites/backend/src/models/user.mjs b/sites/backend/src/models/user.mjs index 7a7d6fcbc68..f23ebee3830 100644 --- a/sites/backend/src/models/user.mjs +++ b/sites/backend/src/models/user.mjs @@ -74,7 +74,7 @@ UserModel.prototype.find = async function (body) { * Failed to run database query. Log warning and return 404 */ log.warn({ err, body }, `Error while trying to find user: ${body.username}`) - return setResponse(404) + return this.setResponse(404) } /* @@ -111,8 +111,8 @@ UserModel.prototype.loadAuthenticatedUser = async function (user) { /* * Failed to run database query. Log warning and return 404 */ - log.warn({ err, body }, `Error while trying to find user: ${user.uid}`) - return setResponse(404) + log.warn({ err, user }, `Error while trying to find user: ${user.uid}`) + return this.setResponse(404) } return this @@ -144,8 +144,8 @@ UserModel.prototype.revealAuthenticatedUser = async function (user) { /* * Failed to run database query. Log warning and return 404 */ - log.warn({ err, body }, `Error while trying to find and reveal user: ${user.uid}`) - return setResponse(404) + log.warn({ err, user }, `Error while trying to find and reveal user: ${user.uid}`) + return this.setResponse(404) } return this.reveal() @@ -849,9 +849,9 @@ UserModel.prototype.guardedUpdate = async function ({ body, user }) { }) } } else if ( - /* - * Could be an email change confirmation - */ + /* + * Could be an email change confirmation + */ typeof body.confirmation === 'string' && body.confirm === 'emailchange' && typeof body.check === 'string' @@ -1003,9 +1003,9 @@ UserModel.prototype.guardedMfaUpdate = async function ({ body, user, ip }) { return this.setResponse(401, 'authenticationFailed') } } else if (body.mfa === true && body.token && body.secret) { - /* - * Option 2/3: Is this is a confirmation after enabling MFA? - */ + /* + * Option 2/3: Is this is a confirmation after enabling MFA? + */ /* * Verify secret and token */ @@ -1035,9 +1035,9 @@ UserModel.prototype.guardedMfaUpdate = async function ({ body, user, ip }) { * Secret and/or token don't match. Return 403 */ } else if (body.mfa === true && this.record.mfaEnabled === false) { - /* - * Option 3/3: Is this an initial request to enable MFA? - */ + /* + * Option 3/3: Is this an initial request to enable MFA? + */ /* * Setup MFA */ diff --git a/sites/backend/src/utils/cloudflare-images.mjs b/sites/backend/src/utils/cloudflare-images.mjs index f92815ca642..10da092488e 100644 --- a/sites/backend/src/utils/cloudflare-images.mjs +++ b/sites/backend/src/utils/cloudflare-images.mjs @@ -70,7 +70,6 @@ export async function replaceImage(props, isTest = false) { export async function ensureImage(props, isTest = false) { if (isTest) return props.id || false const form = getFormData(props) - let result try { await axios.post(config.api, form, { headers }) } catch (err) { diff --git a/sites/backend/src/utils/model-decorator.mjs b/sites/backend/src/utils/model-decorator.mjs index a4ccc5794ed..97264ab4865 100644 --- a/sites/backend/src/utils/model-decorator.mjs +++ b/sites/backend/src/utils/model-decorator.mjs @@ -341,10 +341,10 @@ export function decorateModel(Model, tools, modelConfig) { */ Model.time = function (key) { if (this.timer) - log.info(`Timer split [${key ? key : modalConfig.name}] ${Date.now() - this.timer}ms`) + log.info(`Timer split [${key ? key : modelConfig.name}] ${Date.now() - this.timer}ms`) else { this.timer = Date.now() - log.info(`Timer start [${key ? key : modalConfig.name}] 0ms`) + log.info(`Timer start [${key ? key : modelConfig.name}] 0ms`) } return this diff --git a/sites/backend/v2-v3/import.mjs b/sites/backend/v2-v3/import.mjs index b4308fe3f23..0c4e1565ddd 100644 --- a/sites/backend/v2-v3/import.mjs +++ b/sites/backend/v2-v3/import.mjs @@ -89,7 +89,7 @@ const importUsers = async () => { let total = 0 const batches = splitArray(todo, batchSize) for (const batch of batches) { - const result = await fetch(`${BACKEND}/import/users`, { + await fetch(`${BACKEND}/import/users`, { method: 'POST', headers: { 'Content-Type': 'application/json', diff --git a/sites/backend/v2-v3/inactive.mjs b/sites/backend/v2-v3/inactive.mjs index c571d538634..6d8461f1eca 100644 --- a/sites/backend/v2-v3/inactive.mjs +++ b/sites/backend/v2-v3/inactive.mjs @@ -1,13 +1,5 @@ import users from '../dump/v2-users.json' assert { type: 'json' } -const lastLoginInDays = (user) => { - if (!user.time?.login) return 1000 - const now = new Date() - const then = new Date(user.time.login) - - return Math.floor((now - then) / (1000 * 60 * 60 * 24)) -} - const usersToNotImport = () => users.filter((user) => user.status !== 'active') // Commented out for linter //const usersToImport = () =>