From ec3c2ed4bb0b06694c282a74556fb91d8b95f3d3 Mon Sep 17 00:00:00 2001 From: Pranav Raj S Date: Sun, 9 Aug 2020 18:13:17 +0530 Subject: [PATCH] chore: Use 'Lax' instead of 'None' (#1129) fixes: #919 Signed-off-by: Pranav Raj Sreepuram --- app/javascript/dashboard/store/utils/api.js | 2 ++ config/initializers/session_store.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/javascript/dashboard/store/utils/api.js b/app/javascript/dashboard/store/utils/api.js index 1a8a71a07..03a517df8 100644 --- a/app/javascript/dashboard/store/utils/api.js +++ b/app/javascript/dashboard/store/utils/api.js @@ -3,6 +3,8 @@ import moment from 'moment'; import Cookies from 'js-cookie'; import { frontendURL } from '../../helper/URLHelper'; +Cookies.defaults = { sameSite: 'Lax' }; + export const getLoadingStatus = state => state.fetchAPIloadingStatus; export const setLoadingStatus = (state, status) => { state.fetchAPIloadingStatus = status; diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index dbb766290..9d0d1f35b 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,3 +1,3 @@ # Be sure to restart your server when you modify this file. -Rails.application.config.session_store :cookie_store, key: '_chatwoot_session' +Rails.application.config.session_store :cookie_store, key: '_chatwoot_session', same_site: :lax