From e52c2373264c9c0735107fe06cea515a2b1cf1a0 Mon Sep 17 00:00:00 2001 From: Rory& Date: Wed, 15 Oct 2025 08:04:23 +0200 Subject: Reorganise schemas a little bit --- src/api/routes/users/@me/mfa/codes-verification.ts | 2 +- src/api/routes/users/@me/mfa/codes.ts | 2 +- src/api/routes/users/@me/mfa/totp/disable.ts | 2 +- src/api/routes/users/@me/mfa/totp/enable.ts | 2 +- src/api/routes/users/@me/mfa/webauthn/credentials/index.ts | 4 +--- 5 files changed, 5 insertions(+), 7 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 953648fb..6dba4bb0 100644 --- a/src/api/routes/users/@me/mfa/codes-verification.ts +++ b/src/api/routes/users/@me/mfa/codes-verification.ts @@ -19,12 +19,12 @@ import { route } from "@spacebar/api"; import { BackupCode, - CodesVerificationSchema, DiscordApiErrors, User, generateMfaBackupCodes, } from "@spacebar/util"; import { Request, Response, Router } from "express"; +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 48f3d268..389dc01d 100644 --- a/src/api/routes/users/@me/mfa/codes.ts +++ b/src/api/routes/users/@me/mfa/codes.ts @@ -21,11 +21,11 @@ import { BackupCode, FieldErrors, generateMfaBackupCodes, - MfaCodesSchema, User, } from "@spacebar/util"; import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; +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 8ec65736..b266fcfe 100644 --- a/src/api/routes/users/@me/mfa/totp/disable.ts +++ b/src/api/routes/users/@me/mfa/totp/disable.ts @@ -19,13 +19,13 @@ import { route } from "@spacebar/api"; import { BackupCode, - TotpDisableSchema, User, generateToken, } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server"; import { verifyToken } from "node-2fa"; +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 774c7487..3d6f4a80 100644 --- a/src/api/routes/users/@me/mfa/totp/enable.ts +++ b/src/api/routes/users/@me/mfa/totp/enable.ts @@ -18,7 +18,6 @@ import { route } from "@spacebar/api"; import { - TotpEnableSchema, User, generateMfaBackupCodes, generateToken, @@ -27,6 +26,7 @@ import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server"; import { verifyToken } from "node-2fa"; +import { TotpEnableSchema } from "@spacebar/schemas" 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 78c7470d..1225cd34 100644 --- a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts +++ b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts @@ -18,21 +18,19 @@ import { route } from "@spacebar/api"; import { - CreateWebAuthnCredentialSchema, DiscordApiErrors, FieldErrors, - GenerateWebAuthnCredentialsSchema, generateWebAuthnTicket, SecurityKey, User, verifyWebAuthnToken, WebAuthn, - WebAuthnPostSchema, } from "@spacebar/util"; import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; import { ExpectedAttestationResult } from "fido2-lib"; import { HTTPError } from "lambert-server"; +import { CreateWebAuthnCredentialSchema, GenerateWebAuthnCredentialsSchema, WebAuthnPostSchema } from "@spacebar/schemas" const router = Router({ mergeParams: true }); const isGenerateSchema = ( -- cgit 1.5.1