mirror of
https://github.com/Mastermindzh/react-cookie-consent.git
synced 2025-01-20 18:41:44 +01:00
bugfix issue#68
This commit is contained in:
parent
22bb46981d
commit
e7c2b5b39a
14
CHANGELOG.md
14
CHANGELOG.md
@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
|
|||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [5.0.1]
|
||||||
|
|
||||||
|
- Fixed [Issue
|
||||||
|
69](https://github.com/Mastermindzh/react-cookie-consent/issues/69) by
|
||||||
|
removing location from the proptypes to avoid build-time issues
|
||||||
|
|
||||||
|
## [5.0.0]
|
||||||
|
|
||||||
|
### added
|
||||||
|
|
||||||
|
- CookieSecurity prop - allows securing the cookie
|
||||||
|
- sameSite prop - allows you to set sameSite properties so browser won't warn
|
||||||
|
about non-secure cookies :)
|
||||||
|
|
||||||
## [4.1.0]
|
## [4.1.0]
|
||||||
|
|
||||||
### changed
|
### changed
|
||||||
|
@ -90,7 +90,7 @@ If the decline button is enabled then the (onDecline) prop function can be used,
|
|||||||
## Props
|
## Props
|
||||||
|
|
||||||
| Prop | Type | Default value | Description |
|
| Prop | Type | Default value | Description |
|
||||||
| ------------------------ | :-------------------------------: | ------------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------- |
|
| ------------------------ | :-------------------------------: | ------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------- |
|
||||||
| location | string, "top", "bottom" or "none" | "bottom" | Syntactic sugar to easily enable you to place the bar at the top or the bottom of the browser window. Use "none" to disable. |
|
| location | string, "top", "bottom" or "none" | "bottom" | Syntactic sugar to easily enable you to place the bar at the top or the bottom of the browser window. Use "none" to disable. |
|
||||||
| children | string or React component | | Content to appear inside the bar |
|
| children | string or React component | | Content to appear inside the bar |
|
||||||
| disableStyles | boolean | false | If enabled the component will have no default style. (you can still supply style through props) |
|
| disableStyles | boolean | false | If enabled the component will have no default style. (you can still supply style through props) |
|
||||||
@ -124,7 +124,7 @@ If the decline button is enabled then the (onDecline) prop function can be used,
|
|||||||
| flipButtons | boolean | false | If enabled the accept and decline buttons will be flipped |
|
| flipButtons | boolean | false | If enabled the accept and decline buttons will be flipped |
|
||||||
| ButtonComponent | React component | button | React Component to render as a button. |
|
| ButtonComponent | React component | button | React Component to render as a button. |
|
||||||
| sameSite | string, "strict", "lax" or "none" | none | Cookies sameSite attribute value |
|
| sameSite | string, "strict", "lax" or "none" | none | Cookies sameSite attribute value |
|
||||||
| cookieSecurity | boolean | location ? location.protocol === "https:" : true | Cookie security level. Defaults to true unless running on http. |
|
| cookieSecurity | boolean | undefined | Cookie security level. Defaults to true unless running on http. |
|
||||||
|
|
||||||
## Debugging it
|
## Debugging it
|
||||||
|
|
||||||
|
@ -729,10 +729,14 @@ var CookieConsent = function (_Component) {
|
|||||||
var _props3 = this.props,
|
var _props3 = this.props,
|
||||||
extraCookieOptions = _props3.extraCookieOptions,
|
extraCookieOptions = _props3.extraCookieOptions,
|
||||||
expires = _props3.expires,
|
expires = _props3.expires,
|
||||||
sameSite = _props3.sameSite,
|
sameSite = _props3.sameSite;
|
||||||
cookieSecurity = _props3.cookieSecurity;
|
var cookieSecurity = this.props.cookieSecurity;
|
||||||
|
|
||||||
|
|
||||||
|
if (cookieSecurity === undefined) {
|
||||||
|
cookieSecurity = location ? location.protocol === "https:" : true;
|
||||||
|
}
|
||||||
|
|
||||||
var cookieOptions = _extends({ expires: expires }, extraCookieOptions, { sameSite: sameSite, secure: cookieSecurity });
|
var cookieOptions = _extends({ expires: expires }, extraCookieOptions, { sameSite: sameSite, secure: cookieSecurity });
|
||||||
|
|
||||||
// Fallback for older browsers where can not set SameSite=None, SEE: https://web.dev/samesite-cookie-recipes/#handling-incompatible-clients
|
// Fallback for older browsers where can not set SameSite=None, SEE: https://web.dev/samesite-cookie-recipes/#handling-incompatible-clients
|
||||||
@ -962,7 +966,6 @@ CookieConsent.defaultProps = {
|
|||||||
enableDeclineButton: false,
|
enableDeclineButton: false,
|
||||||
flipButtons: false,
|
flipButtons: false,
|
||||||
sameSite: SAME_SITE_OPTIONS.NONE,
|
sameSite: SAME_SITE_OPTIONS.NONE,
|
||||||
cookieSecurity: location ? location.protocol === "https:" : true,
|
|
||||||
ButtonComponent: function ButtonComponent(_ref2) {
|
ButtonComponent: function ButtonComponent(_ref2) {
|
||||||
var children = _ref2.children,
|
var children = _ref2.children,
|
||||||
props = _objectWithoutProperties(_ref2, ["children"]);
|
props = _objectWithoutProperties(_ref2, ["children"]);
|
||||||
|
@ -165,7 +165,12 @@ class CookieConsent extends Component {
|
|||||||
* https://web.dev/samesite-cookie-recipes/#handling-incompatible-clients
|
* https://web.dev/samesite-cookie-recipes/#handling-incompatible-clients
|
||||||
*/
|
*/
|
||||||
setCookie(cookieName, cookieValue) {
|
setCookie(cookieName, cookieValue) {
|
||||||
const { extraCookieOptions, expires, sameSite, cookieSecurity } = this.props;
|
const { extraCookieOptions, expires, sameSite } = this.props;
|
||||||
|
let { cookieSecurity } = this.props;
|
||||||
|
|
||||||
|
if (cookieSecurity === undefined) {
|
||||||
|
cookieSecurity = location ? location.protocol === "https:" : true;
|
||||||
|
}
|
||||||
|
|
||||||
let cookieOptions = { expires, ...extraCookieOptions, sameSite, secure: cookieSecurity };
|
let cookieOptions = { expires, ...extraCookieOptions, sameSite, secure: cookieSecurity };
|
||||||
|
|
||||||
@ -382,7 +387,6 @@ CookieConsent.defaultProps = {
|
|||||||
enableDeclineButton: false,
|
enableDeclineButton: false,
|
||||||
flipButtons: false,
|
flipButtons: false,
|
||||||
sameSite: SAME_SITE_OPTIONS.NONE,
|
sameSite: SAME_SITE_OPTIONS.NONE,
|
||||||
cookieSecurity: location ? location.protocol === "https:" : true,
|
|
||||||
ButtonComponent: ({ children, ...props }) => <button {...props}>{children}</button>,
|
ButtonComponent: ({ children, ...props }) => <button {...props}>{children}</button>,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user