Skip to content

Commit

Permalink
Merge pull request #85 from electerious/develop
Browse files Browse the repository at this point in the history
v1.6.1
  • Loading branch information
electerious authored Mar 25, 2020
2 parents 6393198 + 8e5238e commit 27509fc
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [1.6.1] - 2020-03-25

### Fixed

- Origin header check for multiple hosts (#84, thanks @jaryl)

## [1.6.0] - 2020-03-06

### Added

- Switch between daily, weekly and yearly views
- Switch between daily, monthly and yearly views
- `ACKEE_ALLOW_ORIGIN` now supports multiple domains (#79 #82, thanks @jaryl)

### Improved
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,4 @@ More documentation and guides are located in [the /docs folder](docs/). Also tak
- [gatsby-plugin-ackee-tracker](https://github.com/Burnsy/gatsby-plugin-ackee-tracker) - Gatsby plugin for Ackee
- [Soapberry](https://wordpress.org/plugins/soapberry/) - WordPress plugin for Ackee
- [use-ackee](https://github.com/electerious/use-ackee) - Use Ackee in React
- [nuxt-ackee](https://github.com/bdrtsky/nuxt-ackee) - Nuxt.js module for Ackee
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ackee",
"private": true,
"version": "1.6.0",
"version": "1.6.1",
"authors": [
"Tobias Reich <tobias@electerious.com>"
],
Expand Down
2 changes: 1 addition & 1 deletion src/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const attachCorsHeaders = (fn) => async (req, res) => {

if (process.env.ACKEE_ALLOW_ORIGIN) {
const origins = process.env.ACKEE_ALLOW_ORIGIN.split(',')
return origins.find((origin) => origin.includes(req.headers.host))
return origins.find((origin) => origin.includes(req.headers.origin) || origin.includes(req.headers.host))
}

})()
Expand Down

0 comments on commit 27509fc

Please sign in to comment.