refactor: relay trustProxy value as it is in normalizedConfig

adonisjs · May 21, 2024 · 87d7fc9 · 87d7fc9
1 parent 912fd1e
commit 87d7fc9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/define_config.ts b/src/define_config.ts
@@ -74,6 +74,8 @@ export function defineConfig(config: UserDefinedServerConfig): ServerConfig {
   } else if (typeof trustProxy === 'string') {
     const tpValue = trustProxy
     normalizedConfig.trustProxy = proxyAddr.compile(tpValue)
+  } else if (trustProxy) {
+    normalizedConfig.trustProxy = trustProxy
   }
 
   return normalizedConfig

diff --git a/tests/define_config.spec.ts b/tests/define_config.spec.ts
@@ -9,6 +9,7 @@
 
 import { test } from '@japa/runner'
 import { defineConfig } from '../index.js'
+import proxyAddr from 'proxy-addr'
 
 test.group('Define config', () => {
   test('define server config', ({ assert }) => {
@@ -58,4 +59,10 @@ test.group('Define config', () => {
 
     assert.typeOf(config.trustProxy, 'function')
   })
+
+  test('compile trustProxy config when a function', ({ assert }) => {
+    const fn = proxyAddr.compile(['192.168.1.2'])
+    const config = defineConfig({ trustProxy: fn })
+    assert.strictEqual(config.trustProxy, fn)
+  })
 })