breaking: req.origin should display the origin header if it exists, not the current hostname closes #1008

Author: jonathanong

__tests__/request/origin.test.js

@@ -11,15 +11,17 @@ describe('ctx.origin', () => {
     const req = {
       url: '/users/1?next=/dashboard',
       headers: {
-        host: 'localhost'
+        host: 'localhost',
+        origin: 'http://example.com'
       },
       socket,
       __proto__: Stream.Readable.prototype
     }
     const ctx = context(req)
-    assert.strictEqual(ctx.origin, 'http://localhost')
+    assert.strictEqual(ctx.origin, 'http://example.com')
+
     // change it also work
     ctx.url = '/foo/users/1?next=/dashboard'
-    assert.strictEqual(ctx.origin, 'http://localhost')
+    assert.strictEqual(ctx.origin, 'http://example.com')
   })
 })

lib/request.js

@@ -89,14 +89,14 @@ module.exports = {
   },
 
   /**
-   * Get origin of URL.
+   * Get the origin header.
    *
    * @return {String}
    * @api public
    */
 
   get origin () {
-    return `${this.protocol}://${this.host}`
+    return this.req.headers.origin || null
   },
 
   /**
@@ -109,7 +109,7 @@ module.exports = {
   get href () {
     // support: `GET http://example.com/foo`
     if (/^https?:\/\//i.test(this.originalUrl)) return this.originalUrl
-    return this.origin + this.originalUrl
+    return this.protocol + '://' + this.host + this.originalUrl
   },
 
   /**
@@ -288,7 +288,7 @@ module.exports = {
     if (!this.memoizedURL) {
       const originalUrl = this.originalUrl || '' // avoid undefined in template string
       try {
-        this.memoizedURL = new URL(`${this.origin}${originalUrl}`)
+        this.memoizedURL = new URL(`${this.protocol}://${this.host}${originalUrl}`)
       } catch (err) {
         this.memoizedURL = Object.create(null)
       }