Merge branch 'release/3.0.4'

Author: electerious

CHANGELOG.md

@@ -4,6 +4,12 @@ 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).
 
+## [3.0.4] - 2021-02-21
+
+### Fixed
+
+- Unable to set Access-Control-Allow-Credentials Header on Platforms-As-A-Service Deployments (#223)
+
 ## [3.0.3] - 2021-01-24
 
 ### Added

dist/index.js

@@ -19,7 +19,7 @@ The event type specifies how Ackee will show the aggregated data in the UI. It c
 - **Chart with total sums**: Shows the aggregated data as a chart. Each day, month or year (depending on the chosen interval) includes the total sum of values.
 - **Chart with average values**: Shows the aggregated data as a chart. Each day, month or year (depending on the chosen interval) includes the average value.
 - **List with total sums**: Shows the aggregated data as a list. Each entry includes the total sum of values. Perfect when an event contains different actions (e.g. tracking choices).
-- **List with average values**: Shows the aggregated data as a list. Each entry includes the total sum of values. Perfect when an event contains different actions (e.g. tracking choices).
+- **List with average values**: Shows the aggregated data as a list. Each entry includes the average value. Perfect when an event contains different actions (e.g. tracking choices).
 
 ### Adding actions
 

docs/Events.md

@@ -0,0 +1,35 @@
+# Upgrade guide
+
+## Upgrading from version 2 to 3
+
+### `Access-Control-Allow-Origin: "*"` not recommended
+
+> This change is relevant for you when using a wildcard as the Access-Control-Allow-Origin.
+
+Using a wildcard (`*`) for the `Access-Control-Allow-Origin` header was never recommended as it's neither a secure solution nor does it allow Ackee to ignore your own visits. Please disable the `ignoreOwnVisits` option in ackee-tracker if you're currently using a wildcard. The [SSL and HTTPS](docs/SSL%20and%20HTTPS.md) guide contains better alternatives.
+
+`ignoreOwnVisits` is now enabled by default and won't work when using a wildcard.
+
+### New `Access-Control-Allow-Credentials` header
+
+> This change is relevant for everyone.
+
+Ackee requires [a new `Access-Control-Allow-Credentials` header](docs/CORS%20headers.md#credentials) which was previously optional. Make sure to add this header in your server or reverse proxy configuration.
+
+### ackee-tracker with new `.create` and `.record` syntax
+
+> This change is only relevant for you when using ackee-tracker in the [Manually](https://github.com/electerious/ackee-tracker/blob/master/README.md#manually) or [Programmatic](https://github.com/electerious/ackee-tracker/blob/master/README.md#programmatic) way.
+
+The [changelog of ackee-tracker](https://github.com/electerious/ackee-tracker/blob/master/CHANGELOG.md) contains everything you need to know when updating to the newest version.
+
+### Referrers require `ReferrerType` in GraphQL API
+
+> This change is relevant for you when using the GraphQL API.
+
+A new parameter is required when requesting referrers via the GraphQL API. The parameter is called `ReferrerType` and can be `WITH_SOURCE`, `NO_SOURCE` or `ONLY_SOURCE`.
+
+### Referrers can return non URL ids via GraphQL API
+
+> This change is relevant for you when using the GraphQL API.
+
+The `id` of requested referrers was always a URL, but has been changed to a string. That's because [referrers can now include parameters](docs/Enhancing%20referrers.md) (e.g. `source` when using `ackee-tracker`).

docs/Upgrade guide.md

@@ -1,7 +1,7 @@
 {
   "name": "ackee",
   "private": true,
-  "version": "3.0.3",
+  "version": "3.0.4",
   "authors": [
     "Tobias Reich <tobias@electerious.com>"
   ],
@@ -34,22 +34,22 @@
   },
   "dependencies": {
     "ackee-tracker": "^5.0.1",
-    "apollo-server-lambda": "^2.19.2",
-    "apollo-server-micro": "^2.19.2",
+    "apollo-server-lambda": "^2.21.0",
+    "apollo-server-micro": "^2.21.0",
     "apollo-server-plugin-http-headers": "^0.1.4",
-    "date-fns": "^2.16.1",
-    "date-fns-tz": "^1.0.10",
+    "date-fns": "^2.17.0",
+    "date-fns-tz": "^1.1.2",
     "debounce-promise": "^3.1.2",
     "dotenv": "^8.2.0",
-    "graphql": "^15.4.0",
-    "graphql-scalars": "^1.7.0",
-    "graphql-tools": "^7.0.2",
+    "graphql": "^15.5.0",
+    "graphql-scalars": "^1.7.1",
+    "graphql-tools": "^7.0.4",
     "is-url": "^1.2.4",
     "micro": "^9.3.4",
     "microrouter": "^3.1.3",
-    "mongoose": "^5.11.13",
+    "mongoose": "^5.11.17",
     "node-fetch": "^2.6.1",
-    "node-schedule": "^1.3.2",
+    "node-schedule": "^2.0.0",
     "normalize-url": "^5.0.0",
     "request-ip": "^2.1.3",
     "sanitize-filename": "^1.6.3",
@@ -61,7 +61,7 @@
     "ava": "3.15.0",
     "classnames": "^2.2.6",
     "coveralls": "^3.1.0",
-    "eslint": "^7.18.0",
+    "eslint": "^7.20.0",
     "eslint-plugin-import": "^2.22.0",
     "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^4.2.0",
@@ -81,9 +81,9 @@
     "react-dom": "^17.0.1",
     "react-error-boundary": "^3.1.0",
     "react-fast-compare": "^3.2.0",
-    "react-hotkeys-hook": "^3.0.3",
+    "react-hotkeys-hook": "^3.1.0",
     "react-redux": "^7.2.2",
-    "react-use": "^15.3.8",
+    "react-use": "^17.1.1",
     "redux": "^4.0.5",
     "redux-devtools-extension": "^2.13.8",
     "redux-thunk": "^2.3.0",
@@ -119,6 +119,6 @@
     }
   },
   "engines": {
-    "node": ">= 12"
+    "node": ">= 14"
   }
 }

package.json

@@ -30,6 +30,7 @@ const origin = (() => {
 exports.handler = apolloServer.createHandler({
 	cors: {
 		origin,
+		credentials: true,
 		methods: 'GET,POST,PATCH,OPTIONS',
 		allowedHeaders: 'Content-Type, Authorization, Time-Zone'
 	}