Merge pull request #3 from KilianB/main

Fixes #1 addError is undefined when added as middleware to Elysia 0.8.9
eelkevdbos · Feb 6, 2024 · 119f332 · 119f332
2 parents 7887e1a + 590e2ff
commit 119f332
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 28 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -32,6 +32,6 @@
   },
   "peerDependencies": {
     "typescript": "^5.0.0",
-    "elysia": "^0.8.1"
+    "elysia": "^0.8.16"
   }
 }
diff --git a/src/index.ts b/src/index.ts
@@ -29,6 +29,8 @@ export type BasicAuthOptions = {
 }
 
 class BasicAuthError extends Error {
+  public code = 'BASIC_AUTH_ERROR'
+
   constructor(
     readonly message: string,
     readonly realm: string
@@ -183,33 +185,35 @@ export function basicAuth(userOptions: Partial<BasicAuthOptions> = {}) {
   const skipRequest = (request: Request) =>
     options.skipCorsPreflight && isCORSPreflightRequest(request)
 
-  return (app: Elysia) =>
-    app
-      .state('basicAuthRealm', null as string | null)
-      .state('basicAuthUser', null as string | null)
-      .addError({ BASIC_AUTH_ERROR: BasicAuthError })
-      .onError(({ code, error }) => {
-        if (code === 'BASIC_AUTH_ERROR' && error.realm === options.realm) {
-          return new Response(options.unauthorizedMessage, {
-            status: options.unauthorizedStatus,
-            headers: { 'WWW-Authenticate': `Basic realm="${options.realm}"` },
-          })
+  return new Elysia({
+    name: 'elysia-basic-auth',
+    seed: options,
+  })
+    .state('basicAuthRealm', null as string | null)
+    .state('basicAuthUser', null as string | null)
+    .error({ BASIC_AUTH_ERROR: BasicAuthError })
+    .onError(({ code, error }) => {
+      if (code === 'BASIC_AUTH_ERROR' && error.realm === options.realm) {
+        return new Response(options.unauthorizedMessage, {
+          status: options.unauthorizedStatus,
+          headers: { 'WWW-Authenticate': `Basic realm="${options.realm}"` },
+        })
+      }
+    })
+    .onRequest(ctx => {
+      if (options.enabled && inScope(ctx) && !skipRequest(ctx.request)) {
+        const authHeader = ctx.request.headers.get(options.header)
+        if (!authHeader || !authHeader.toLowerCase().startsWith('basic ')) {
+          throw new BasicAuthError('Invalid header', options.realm)
         }
-      })
-      .onRequest(ctx => {
-        if (options.enabled && inScope(ctx) && !skipRequest(ctx.request)) {
-          const authHeader = ctx.request.headers.get(options.header)
-          if (!authHeader || !authHeader.toLowerCase().startsWith('basic ')) {
-            throw new BasicAuthError('Invalid header', options.realm)
-          }
-
-          const credentials = getCredentials(authHeader)
-          if (!checkCredentials(credentials, credentialsMap)) {
-            throw new BasicAuthError('Invalid credentials', options.realm)
-          }
-
-          ctx.store.basicAuthRealm = options.realm
-          ctx.store.basicAuthUser = credentials.username
+
+        const credentials = getCredentials(authHeader)
+        if (!checkCredentials(credentials, credentialsMap)) {
+          throw new BasicAuthError('Invalid credentials', options.realm)
         }
-      })
+
+        ctx.store.basicAuthRealm = options.realm
+        ctx.store.basicAuthUser = credentials.username
+      }
+    })
 }