summary refs log tree commit diff
path: root/src/api
diff options
context:
space:
mode:
authorCyber <mateusz.hf18@gmail.com>2024-11-14 07:58:16 +0100
committerGitHub <noreply@github.com>2024-11-14 07:58:16 +0100
commit9384138dd4fec4279c41ce8375e041c070370e15 (patch)
tree4f5c4729adb161d0191905bd0dbff272d84dccda /src/api
parentfix: return user profile theme colors as numbers (diff)
parentMerge pull request #1232 from dank074/patch/eslintConfig (diff)
downloadserver-ts-9384138dd4fec4279c41ce8375e041c070370e15.tar.xz
Merge branch 'master' into fix/user-profile-colors
Diffstat (limited to 'src/api')
-rw-r--r--src/api/middlewares/Authentication.ts1
-rw-r--r--src/api/routes/auth/reset.ts1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/api/middlewares/Authentication.ts b/src/api/middlewares/Authentication.ts

index b5204ffcf..b4f484776 100644 --- a/src/api/middlewares/Authentication.ts +++ b/src/api/middlewares/Authentication.ts
@@ -108,7 +108,6 @@ export async function Authentication( req.rights = new Rights(Number(user.rights)); return next(); } catch (error) { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion return next(new HTTPError(error!.toString(), 400)); } } diff --git a/src/api/routes/auth/reset.ts b/src/api/routes/auth/reset.ts
index b3ca1e9e2..da4d3334b 100644 --- a/src/api/routes/auth/reset.ts +++ b/src/api/routes/auth/reset.ts
@@ -72,7 +72,6 @@ router.post( await User.update({ id: user.id }, data); // come on, the user has to have an email to reset their password in the first place - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion await Email.sendPasswordChanged(user, user.email!); res.json({ token: await generateToken(user.id) });