From c77d00e243f7cf104b8b0f8b26f339849dbd040f Mon Sep 17 00:00:00 2001 From: Rory& Date: Thu, 11 Jun 2026 22:16:07 +0200 Subject: Move entities to database --- src/api/routes/users/@me/mfa/codes-verification.ts | 5 +++-- src/api/routes/users/@me/mfa/codes.ts | 5 +++-- src/api/routes/users/@me/mfa/totp/disable.ts | 5 +++-- src/api/routes/users/@me/mfa/totp/enable.ts | 5 +++-- src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts | 2 +- src/api/routes/users/@me/mfa/webauthn/credentials/index.ts | 6 ++++-- 6 files changed, 17 insertions(+), 11 deletions(-) (limited to 'src/api/routes/users/@me/mfa') diff --git a/src/api/routes/users/@me/mfa/codes-verification.ts b/src/api/routes/users/@me/mfa/codes-verification.ts index 94213037..ca6447f3 100644 --- a/src/api/routes/users/@me/mfa/codes-verification.ts +++ b/src/api/routes/users/@me/mfa/codes-verification.ts @@ -16,9 +16,10 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api"; -import { BackupCode, DiscordApiErrors, User, generateMfaBackupCodes } from "@spacebar/util"; import { Request, Response, Router } from "express"; +import { route } from "@spacebar/api"; +import { BackupCode, generateMfaBackupCodes, User } from "@spacebar/database"; +import { DiscordApiErrors } from "@spacebar/util"; import { CodesVerificationSchema } from "@spacebar/schemas"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/mfa/codes.ts b/src/api/routes/users/@me/mfa/codes.ts index 0b1b94da..26f555bd 100644 --- a/src/api/routes/users/@me/mfa/codes.ts +++ b/src/api/routes/users/@me/mfa/codes.ts @@ -16,10 +16,11 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api"; -import { BackupCode, FieldErrors, generateMfaBackupCodes, User } from "@spacebar/util"; import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; +import { route } from "@spacebar/api"; +import { BackupCode, generateMfaBackupCodes, User } from "@spacebar/database"; +import { FieldErrors } from "@spacebar/util"; import { MfaCodesSchema } from "@spacebar/schemas"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/mfa/totp/disable.ts b/src/api/routes/users/@me/mfa/totp/disable.ts index b26161a3..c75365ac 100644 --- a/src/api/routes/users/@me/mfa/totp/disable.ts +++ b/src/api/routes/users/@me/mfa/totp/disable.ts @@ -16,11 +16,12 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api"; -import { BackupCode, User, generateToken } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { verifyToken } from "node-2fa"; +import { route } from "@spacebar/api"; +import { BackupCode, User } from "@spacebar/database"; +import { generateToken } from "@spacebar/util"; import { TotpDisableSchema } from "@spacebar/schemas"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/mfa/totp/enable.ts b/src/api/routes/users/@me/mfa/totp/enable.ts index e626a736..fd098c2d 100644 --- a/src/api/routes/users/@me/mfa/totp/enable.ts +++ b/src/api/routes/users/@me/mfa/totp/enable.ts @@ -16,12 +16,13 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api"; -import { User, generateMfaBackupCodes, generateToken } from "@spacebar/util"; import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server/HTTPError"; import { verifyToken } from "node-2fa"; +import { route } from "@spacebar/api"; +import { User, generateMfaBackupCodes } from "@spacebar/database"; +import { generateToken } from "@spacebar/util"; import { TotpEnableSchema } from "@spacebar/schemas"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts b/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts index 65c01806..c15a0144 100644 --- a/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts +++ b/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts @@ -17,7 +17,7 @@ */ import { route } from "@spacebar/api"; -import { SecurityKey, User } from "@spacebar/util"; +import { SecurityKey, User } from "@spacebar/database"; import { Request, Response, Router } from "express"; const router = Router({ mergeParams: true }); diff --git a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts index 6c877189..774c4138 100644 --- a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts +++ b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts @@ -16,13 +16,15 @@ along with this program. If not, see . */ -import { route } from "@spacebar/api"; -import { DiscordApiErrors, FieldErrors, generateWebAuthnTicket, SecurityKey, User, verifyWebAuthnToken, WebAuthn } from "@spacebar/util"; import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; import { ExpectedAttestationResult } from "fido2-lib"; import { HTTPError } from "lambert-server/HTTPError"; +import { route } from "@spacebar/api"; +import { SecurityKey, User } from "@spacebar/database"; +import { DiscordApiErrors, FieldErrors, generateWebAuthnTicket, verifyWebAuthnToken, WebAuthn } from "@spacebar/util"; import { CreateWebAuthnCredentialSchema, GenerateWebAuthnCredentialsSchema, WebAuthnPostSchema } from "@spacebar/schemas"; + const router = Router({ mergeParams: true }); const isGenerateSchema = (body: WebAuthnPostSchema): body is GenerateWebAuthnCredentialsSchema => "password" in body; -- cgit 1.5.1