diff --git a/src/api/routes/users/@me/mfa/codes-verification.ts b/src/api/routes/users/@me/mfa/codes-verification.ts
deleted file mode 100644
index 3411605b..00000000
--- a/src/api/routes/users/@me/mfa/codes-verification.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Router, Request, Response } from "express";
-import { route } from "@fosscord/api";
-import {
- BackupCode,
- generateMfaBackupCodes,
- User,
- CodesVerificationSchema,
-} from "@fosscord/util";
-
-const router = Router();
-
-router.post(
- "/",
- route({ body: "CodesVerificationSchema" }),
- async (req: Request, res: Response) => {
- const { key, nonce, regenerate } = req.body as CodesVerificationSchema;
-
- // TODO: We don't have email/etc etc, so can't send a verification code.
- // Once that's done, this route can verify `key`
-
- const user = await User.findOneOrFail({ where: { id: req.user_id } });
-
- var codes: BackupCode[];
- if (regenerate) {
- await BackupCode.update(
- { user: { id: req.user_id } },
- { expired: true },
- );
-
- codes = generateMfaBackupCodes(req.user_id);
- await Promise.all(codes.map((x) => x.save()));
- } else {
- codes = await BackupCode.find({
- where: {
- user: {
- id: req.user_id,
- },
- expired: false,
- },
- });
- }
-
- return res.json({
- backup_codes: codes.map((x) => ({ ...x, expired: undefined })),
- });
- },
-);
-
-export default router;
diff --git a/src/api/routes/users/@me/mfa/codes.ts b/src/api/routes/users/@me/mfa/codes.ts
deleted file mode 100644
index 33053028..00000000
--- a/src/api/routes/users/@me/mfa/codes.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { Router, Request, Response } from "express";
-import { route } from "@fosscord/api";
-import {
- BackupCode,
- FieldErrors,
- generateMfaBackupCodes,
- User,
- MfaCodesSchema,
-} from "@fosscord/util";
-import bcrypt from "bcrypt";
-
-const router = Router();
-
-// TODO: This route is replaced with users/@me/mfa/codes-verification in newer clients
-
-router.post(
- "/",
- route({ body: "MfaCodesSchema" }),
- async (req: Request, res: Response) => {
- const { password, regenerate } = req.body as MfaCodesSchema;
-
- const user = await User.findOneOrFail({
- where: { id: req.user_id },
- select: ["data"],
- });
-
- if (!(await bcrypt.compare(password, user.data.hash || ""))) {
- throw FieldErrors({
- password: {
- message: req.t("auth:login.INVALID_PASSWORD"),
- code: "INVALID_PASSWORD",
- },
- });
- }
-
- var codes: BackupCode[];
- if (regenerate) {
- await BackupCode.update(
- { user: { id: req.user_id } },
- { expired: true },
- );
-
- codes = generateMfaBackupCodes(req.user_id);
- await Promise.all(codes.map((x) => x.save()));
- } else {
- codes = await BackupCode.find({
- where: {
- user: {
- id: req.user_id,
- },
- expired: false,
- },
- });
- }
-
- return res.json({
- backup_codes: codes.map((x) => ({ ...x, expired: undefined })),
- });
- },
-);
-
-export default router;
diff --git a/src/api/routes/users/@me/mfa/totp/disable.ts b/src/api/routes/users/@me/mfa/totp/disable.ts
deleted file mode 100644
index 7916e598..00000000
--- a/src/api/routes/users/@me/mfa/totp/disable.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Router, Request, Response } from "express";
-import { route } from "@fosscord/api";
-import { verifyToken } from "node-2fa";
-import { HTTPError } from "lambert-server";
-import {
- User,
- generateToken,
- BackupCode,
- TotpDisableSchema,
-} from "@fosscord/util";
-
-const router = Router();
-
-router.post(
- "/",
- route({ body: "TotpDisableSchema" }),
- async (req: Request, res: Response) => {
- const body = req.body as TotpDisableSchema;
-
- const user = await User.findOneOrFail({
- where: { id: req.user_id },
- select: ["totp_secret"],
- });
-
- const backup = await BackupCode.findOne({ where: { code: body.code } });
- if (!backup) {
- const ret = verifyToken(user.totp_secret!, body.code);
- if (!ret || ret.delta != 0)
- throw new HTTPError(
- req.t("auth:login.INVALID_TOTP_CODE"),
- 60008,
- );
- }
-
- await User.update(
- { id: req.user_id },
- {
- mfa_enabled: false,
- totp_secret: "",
- },
- );
-
- await BackupCode.update(
- { user: { id: req.user_id } },
- {
- expired: true,
- },
- );
-
- return res.json({
- token: await generateToken(user.id),
- });
- },
-);
-
-export default router;
diff --git a/src/api/routes/users/@me/mfa/totp/enable.ts b/src/api/routes/users/@me/mfa/totp/enable.ts
deleted file mode 100644
index 2c7044da..00000000
--- a/src/api/routes/users/@me/mfa/totp/enable.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Router, Request, Response } from "express";
-import {
- User,
- generateToken,
- generateMfaBackupCodes,
- TotpEnableSchema,
-} from "@fosscord/util";
-import { route } from "@fosscord/api";
-import bcrypt from "bcrypt";
-import { HTTPError } from "lambert-server";
-import { verifyToken } from "node-2fa";
-
-const router = Router();
-
-router.post(
- "/",
- route({ body: "TotpEnableSchema" }),
- async (req: Request, res: Response) => {
- const body = req.body as TotpEnableSchema;
-
- const user = await User.findOneOrFail({
- where: { id: req.user_id },
- select: ["data", "email"],
- });
-
- // TODO: Are guests allowed to enable 2fa?
- if (user.data.hash) {
- if (!(await bcrypt.compare(body.password, user.data.hash))) {
- throw new HTTPError(req.t("auth:login.INVALID_PASSWORD"));
- }
- }
-
- if (!body.secret)
- throw new HTTPError(req.t("auth:login.INVALID_TOTP_SECRET"), 60005);
-
- if (!body.code)
- throw new HTTPError(req.t("auth:login.INVALID_TOTP_CODE"), 60008);
-
- if (verifyToken(body.secret, body.code)?.delta != 0)
- throw new HTTPError(req.t("auth:login.INVALID_TOTP_CODE"), 60008);
-
- let backup_codes = generateMfaBackupCodes(req.user_id);
- await Promise.all(backup_codes.map((x) => x.save()));
- await User.update(
- { id: req.user_id },
- { mfa_enabled: true, totp_secret: body.secret },
- );
-
- res.send({
- token: await generateToken(user.id),
- backup_codes: backup_codes.map((x) => ({
- ...x,
- expired: undefined,
- })),
- });
- },
-);
-
-export default router;
|
