feat: add decodeFullUrl option

README.md

@@ -28,6 +28,9 @@ loss or incorrect handling. But this time is over!
   modules: [
     ['@nuxtjs/redirect-module', {
       // Redirect option here
+      rules: [
+        // redirect rules here
+      ]
     }]
   ]
 }
@@ -40,9 +43,12 @@ loss or incorrect handling. But this time is over!
   modules: [
     '@nuxtjs/redirect-module'
   ],
-  redirect: [
+  redirect: {
     // Redirect options here
-  ]
+    rules: [
+      // redirect rules here
+    ]
+  }
 }
 ```
 
@@ -54,11 +60,39 @@ loss or incorrect handling. But this time is over!
 
 Rules of your redirects.
 
+### `decodeFullUrl`
+
+- Default: `false`
+
+If enabled, protocol and host will also be considered for redirecting rules so you can have non-www to www or http to https redirects for example. Note that you likely have to adopt your rules when enabling this, e.g. `{ from: '^/myoldurl', to: '/mynewurl' }` will no longer work because the `from` regex no longer matches when proto and host are prepended.
+
 ### `onDecode`
 
-- Default: `(req, res, next) => decodeURI(req.url)`
+Default:
+
+```js
+// This will trust proxy headers. You can change this behaviour
+// by providing your own onDecode function.
+(req, options) => {
+  if (options.decodeFullUrl) {
+    return decodeURI(req.url)
+  } else {
+    let proto = req.headers['x-forwarded-proto']
+    if (proto === undefined) {
+      proto = req.connection.encrypted ? 'https' : 'http'
+    }
+
+    let host = req.headers['x-forwarded-host']
+    if (host === undefined) {
+      host = req.httpVersionMajor >= 2 ? req.headers[':authority'] : req.headers.host
+    }
+
+    return `${proto}://${host}${decodeURI(req.url)}`
+  }
+}
+```
 
-You can set decode.
+Allows you to change how the url is decoded.
 
 ### `onDecodeError`
 
@@ -126,6 +160,21 @@ redirect: async () => {
 }
 ```
 
+For redirecting http to https:
+
+```js
+redirect: {
+  decodeFullUrl: true,
+  rules: [
+    {
+      from: 'http://example.com/(.*)$',
+      to: 'https://example.com/$1',
+      statusCode: 301,
+    } 
+  ]
+}
+```
+
 Now, if you want to customize your redirects, how your decode is done
 or when there is some error in the decode, you can also:
 

lib/middleware.js

@@ -4,7 +4,7 @@ module.exports = function (options) {
     let decodedBaseUrl
 
     try {
-      decodedBaseUrl = options.onDecode(req, res, next)
+      decodedBaseUrl = options.onDecode(req, options)
     } catch (error) {
       return options.onDecodeError(error, req, res, next)
     }

lib/module.js

@@ -1,7 +1,24 @@
 async function redirectModule (moduleOptions) {
   const defaults = {
     rules: [],
-    onDecode: (req, res, next) => decodeURI(req.url),
+    decodeFullUrl: false,
+    onDecode: (req, options) => {
+      if (!options.decodeFullUrl) {
+        return decodeURI(req.url)
+      } else {
+        let proto = req.headers['x-forwarded-proto']
+        if (proto === undefined) {
+          proto = req.connection.encrypted ? 'https' : 'http'
+        }
+
+        let host = req.headers['x-forwarded-host']
+        if (host === undefined) {
+          host = req.httpVersionMajor >= 2 ? req.headers[':authority'] : req.headers.host
+        }
+
+        return `${proto}://${host}${decodeURI(req.url)}`
+      }
+    },
     onDecodeError: (error, req, res, next) => next(error),
     statusCode: 302
   }

test/module.test.js

@@ -212,3 +212,35 @@ describe('error', () => {
     })
   })
 })
+
+describe('decodeFullUrl', () => {
+  beforeAll(async () => {
+    nuxt = await setupNuxt({
+      ...config,
+      redirect: {
+        rules: [{
+          from: `http://localhost:([0-9]+)/(.*)$`,
+          to: `https://localhost:$1/$2`,
+          statusCode: 301
+        }],
+        decodeFullUrl: true
+      }
+    })
+  })
+
+  afterAll(async () => {
+    await nuxt.close()
+  })
+
+  test('301 Moved Permanently', async () => {
+    try {
+      await request({
+        uri: url('/'),
+        resolveWithFullResponse: true,
+        followRedirect: false
+      })
+    } catch (e) {
+      expect(e.statusCode).toBe(301)
+    }
+  })
+})