Skip to content

Fix for empty user_id or anonymous_id not throwing errors #245

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

Merged
pooyaj merged 1 commit into from
Oct 20, 2021
Merged

Fix for empty user_id or anonymous_id not throwing errors #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions lib/segment/analytics/field_parser.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,10 @@ def parse_common_fields(fields)
end

def check_user_id!(fields)
unless fields[:user_id] || fields[:anonymous_id]
raise ArgumentError, 'Must supply either user_id or anonymous_id'
end
return unless blank?(fields[:user_id])
return unless blank?(fields[:anonymous_id])

raise ArgumentError, 'Must supply either user_id or anonymous_id'
end

def check_timestamp!(timestamp)
Expand All @@ -178,11 +179,15 @@ def add_context!(context)
# obj - String|Number that must be non-blank
# name - Name of the validated value
def check_presence!(obj, name)
if obj.nil? || (obj.is_a?(String) && obj.empty?)
if blank?(obj)
raise ArgumentError, "#{name} must be given"
end
end

def blank?(obj)
obj.nil? || (obj.is_a?(String) && obj.empty?)
end

def check_is_hash!(obj, name)
raise ArgumentError, "#{name} must be a Hash" unless obj.is_a? Hash
end
Expand Down
2 changes: 2 additions & 0 deletions spec/segment/analytics_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ class Analytics

it 'errors without user_id or anonymous_id' do
expect { analytics.track :event => 'event' }.to raise_error(ArgumentError)
expect { analytics.track :event => 'event', user_id: ''}.to raise_error(ArgumentError)
expect { analytics.track :event => 'event', anonymous_id:''}.to raise_error(ArgumentError)
expect { analytics.track :event => 'event', user_id: '1234' }.to_not raise_error(ArgumentError)
expect { analytics.track :event => 'event', anonymous_id: '2345' }.to_not raise_error(ArgumentError)
end
Expand Down