Add cookie privacy setting to embed via queryString parameter #13510
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
houndci-bot
reviewed
Feb 9, 2018
| @@ -20,7 +20,7 @@ def frontend_config_hash(user = current_user) | |||
| google_analytics_domain: Cartodb.get_config(:google_analytics, 'domain'), | |||
| hubspot_enabled: CartoDB::Hubspot::instance.enabled?, | |||
| intercom_app_id: Cartodb.get_config(:intercom, 'app_id'), | |||
| fullstory_enabled: Cartodb.get_config(:fullstory, 'org').present? && user && user.account_type.casecmp('FREE').zero?, | |||
| fullstory_enabled: Cartodb.get_config(:fullstory, 'org').present? && user && user.account_type.casecmp('FREE').zero? && params[:cookies] != '0', | |||
app/helpers/application_helper.rb
Outdated
| @@ -119,7 +119,7 @@ def insert_hubspot_form(form = 'newsletter') | |||
| end | |||
|
|
|||
| def insert_fullstory | |||
| if Cartodb.get_config(:fullstory, 'org').present? && current_user && current_user.account_type.casecmp('FREE').zero? | |||
| if Cartodb.get_config(:fullstory, 'org').present? && current_user && current_user.account_type.casecmp('FREE').zero? && params[:cookies] != '0' | |||
houndci-bot
reviewed
Feb 9, 2018
| @@ -20,7 +20,7 @@ def frontend_config_hash(user = current_user) | |||
| google_analytics_domain: Cartodb.get_config(:google_analytics, 'domain'), | |||
| hubspot_enabled: CartoDB::Hubspot::instance.enabled?, | |||
| intercom_app_id: Cartodb.get_config(:intercom, 'app_id'), | |||
| fullstory_enabled: Cartodb.get_config(:fullstory, 'org').present? && user && user.account_type.casecmp('FREE').zero?, | |||
| fullstory_enabled: Cartodb.get_config(:fullstory, 'org').present? && user && user.account_type.casecmp('FREE').zero? && params[:cookies] != '0', | |||
app/helpers/application_helper.rb
Outdated
| @@ -119,7 +119,7 @@ def insert_hubspot_form(form = 'newsletter') | |||
| end | |||
|
|
|||
| def insert_fullstory | |||
| if Cartodb.get_config(:fullstory, 'org').present? && current_user && current_user.account_type.casecmp('FREE').zero? | |||
| if Cartodb.get_config(:fullstory, 'org').present? && current_user && current_user.account_type.casecmp('FREE').zero? && params[:cookies] != '0' | |||
alrocar
approved these changes
Feb 9, 2018
There was a problem hiding this comment.
LGTM
I don't think this is affecting this use case, but there are some html with the analytics and hubspot scripts hardcoded, tracked in this issue
jesusbotella
force-pushed
the
1296-embed-no-tracking
branch
2 times, most recently
from
f0d127a
to
500409a
Compare
javitonino
suggested changes
Feb 9, 2018
package.json
Outdated
| @@ -1,6 +1,6 @@ | |||
| { | |||
| "name": "cartodb-ui", | |||
| "version": "4.11.32", | |||
| "version": "4.11.32-1296", | |||
There was a problem hiding this comment.
No need if you only touch backend files 😄
| @@ -195,6 +195,14 @@ def stub_passwords(password) | |||
| response.body.should_not include("maps.google.com/maps/api/js") | |||
| end | |||
|
|
|||
| it 'does not include 3rd party scripts if cookies=0 query param is present' do | |||
There was a problem hiding this comment.
This tests passes in the current version of master (or if you remove cookies: '0' here), which leads me to think that is not actually testing anything 😅
We probably need to set some configuration (Cartodb.with_config) to temporarily enable these services in the testing environment.
There was a problem hiding this comment.
Yes, I thought it was working because made it fail first but I enabled these services in my app_config.yml, so you are right. I am going to change the test :)
jesusbotella
force-pushed
the
1296-embed-no-tracking
branch
from
0f38cba
to
9b8c919
Compare
|
@javitonino I have just changed the test, it should be correct now. 😀 |
javitonino
approved these changes
Feb 12, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds the possibility to opt out of cookies in Builder embed.
When this
Do not trackmode is enabled via the query string parameter (cookies=0), we do not include either the Google Analytics script or the TrackJS script.I talked to @javitonino and he told me that the best way to do it was to prevent the script from inserting, instead of conditional insertion in the template as I thought at first. This behaviour will allow us to share the same behaviour in all of our views by inserting
cookies=0query parameter.The services adding cookies in our platform are Google Analytics, Hubspot, FullStory and TrackJS. FullStory script is not currently being rendered in our embed views, but as we need to be GDPR compliant I thought it was a good idea to disable it as well.
Related to https://github.com/CartoDB/support/issues/1296