Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correlates client-side and server segment anonymous_id's #254

Merged
merged 9 commits into from
Apr 4, 2016
Merged

Correlates client-side and server segment anonymous_id's #254

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
60d15b7
Uses the session.id as an anonymous id for correlating client and ser…
discorick Mar 28, 2016
86b9da0
Tracks anonymousId on logged in payloads also
discorick Mar 28, 2016
d8e444d
Overrides the Warden::Proxy.set_user method to removing a line that f…
discorick Mar 28, 2016
53367cb
Removes Warden method override as makes us vulernable to session fixa…
discorick Mar 30, 2016
f7905a5
Try different approach to set anonymousId client-side
dahlbyk Mar 31, 2016
9b0fee9
Revert "Try different approach to set anonymousId client-side"
dahlbyk Mar 31, 2016
fa328e0
Try yet another approach to set anonymousId client-side
dahlbyk Mar 31, 2016
264d998
Removes logging out on scope change to maintain session creds
discorick Mar 31, 2016
807c918
Merge branch 'discorick/correlates_client_and_server_analytics_with_a…
discorick Mar 31, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def queue_job

job_params['current_user'] = (current_user.attribs || {}).to_h
job_params['action_controller.params'] = params
job_params['session_id'] = session.id

#TODO: make sure you can safely serialize the params
JobResolver.find_jobs(params).each do |job|
Expand Down
3 changes: 2 additions & 1 deletion app/views/shared/_analytics.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
window.analytics.identify('<%= current_user.id %>', {})
window.analytics.page({ userId: '<% current_user.id %>' });
<% else %>
window.analytics.page();
window.analytics.identify({ anonymousId: '<%= session.id %>' });
window.analytics.page({ anonymousId: '<%= session.id %>' });
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also set anonymousId when logged_in??

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I think so.

<% end %>
<% end %>
</script>
Expand Down
1 change: 1 addition & 0 deletions vendor/engines/saas/app/jobs/analytics/identify_user_job.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ class IdentifyUserJob < AnalyticsJob
def payload(params)
{
user_id: params['current_user']['id'] || "Anonymous",
anonymous_id: params['session_id'],
traits: params['data']
}
end
Expand Down
1 change: 1 addition & 0 deletions vendor/engines/saas/app/jobs/analytics/page_job.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ def payload(params)
user = params['current_user'] ? params['current_user']['id'] : "Anonymous"
{
user_id: user,
anonymous_id: params['session_id'],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be anonymousId rather than anonymous_id? Same question for IdentifyUserJob.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind, checked docs.

name: params['url'],
properties: { url: params['url'] }
}
Expand Down
3 changes: 2 additions & 1 deletion vendor/engines/saas/app/jobs/base_login_job.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ def map_user(params)

{
'current_user' => params['user'],
'data' => params['user']
'data' => params['user'],
'session_id' => params['session_id']
}
end
end
3 changes: 2 additions & 1 deletion vendor/engines/saas/lib/saas/engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ def page_job
auth_request = request.params['code'] && request.params['state']
if request.referer !~ /github\.com/ && !logged_in? && !auth_request
Analytics::PageJob.perform_later({
'url' => "/login/#{params['action']}"
'url' => "/login/#{params['action']}",
'session_id' => request.session.id
})
end
end
Expand Down