From 2a5eb74b66ab23408a1c11ea673031193a11230a Mon Sep 17 00:00:00 2001
From: William Oldham <wegg7250@gmail.com>
Date: Sat, 4 Nov 2023 10:42:44 +0000
Subject: [PATCH] Tidy namespaced imports

---
 src/services/challenge.ts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/services/challenge.ts b/src/services/challenge.ts
index 0499898..b74eed5 100644
--- a/src/services/challenge.ts
+++ b/src/services/challenge.ts
@@ -7,6 +7,11 @@ import { StatusError } from '@/services/error';
 import { EntityManager } from '@mikro-orm/core';
 import forge from 'node-forge';
 
+const {
+  pki: { ed25519 },
+  util: { ByteStringBuffer },
+} = forge;
+
 export async function assertChallengeCode(
   em: EntityManager,
   code: string,
@@ -33,14 +38,10 @@ export async function assertChallengeCode(
     throw new StatusError('Challenge Code Expired', 401);
 
   try {
-    const verifiedChallenge = forge.pki.ed25519.verify({
-      publicKey: new forge.util.ByteStringBuffer(
-        Buffer.from(publicKey, 'base64url'),
-      ),
+    const verifiedChallenge = ed25519.verify({
+      publicKey: new ByteStringBuffer(Buffer.from(publicKey, 'base64url')),
       encoding: 'utf8',
-      signature: new forge.util.ByteStringBuffer(
-        Buffer.from(signature, 'base64url'),
-      ),
+      signature: new ByteStringBuffer(Buffer.from(signature, 'base64url')),
       message: code,
     });