diff --git a/admin/app/admin/jam_ruby_users.rb b/admin/app/admin/jam_ruby_users.rb index 0fe3c29d9..61a1d3db7 100644 --- a/admin/app/admin/jam_ruby_users.rb +++ b/admin/app/admin/jam_ruby_users.rb @@ -32,6 +32,7 @@ ActiveAdmin.register JamRuby::User, :as => 'Users' do row :birth_date row :gender row :email_confirmed + row :remember_token row :image do user.photo_url ? image_tag(user.photo_url) : '' end end active_admin_comments diff --git a/ruby/lib/jam_ruby/models/jam_track_right.rb b/ruby/lib/jam_ruby/models/jam_track_right.rb index b59fdcee6..7e5a491d8 100644 --- a/ruby/lib/jam_ruby/models/jam_track_right.rb +++ b/ruby/lib/jam_ruby/models/jam_track_right.rb @@ -255,7 +255,7 @@ module JamRuby if match && match.user != current_user AdminMailer.alerts(subject: "'All' fingerprint collision by #{current_user.name}", - body: "MachineFingerprint #{match.inspect}\n\nCurrent User: #{current_user.admin_url}") + body: "MachineFingerprint #{match.inspect}\n\nCurrent User: #{current_user.admin_url}").deliver # try to record the other fingerprint MachineFingerprint.create(running_fingerprint, current_user, MachineFingerprint::TAKEN_ON_FRAUD_CONFLICT, MachineFingerprint::PRINT_TYPE_ACTIVE, remote_ip, self) @@ -266,7 +266,7 @@ module JamRuby if match && match.user != current_user AdminMailer.alerts(subject: "'Running' fingerprint collision by #{current_user.name}", - body: "MachineFingerprint #{match.inspect}\n\nCurrent User: #{current_user.admin_url}") + body: "MachineFingerprint #{match.inspect}\n\nCurrent User: #{current_user.admin_url}").deliver # try to record the other fingerprint MachineFingerprint.create(all_fingerprint, current_user, MachineFingerprint::TAKEN_ON_FRAUD_CONFLICT, MachineFingerprint::PRINT_TYPE_ALL, remote_ip, self) return "other user has 'running' fingerprint" diff --git a/web/config/environments/development.rb b/web/config/environments/development.rb index 52ebbcd08..6567e404e 100644 --- a/web/config/environments/development.rb +++ b/web/config/environments/development.rb @@ -95,4 +95,5 @@ SampleApp::Application.configure do config.video_available= ENV['VIDEO_AVAILABILITY'] || "none" config.email_generic_from = 'nobody-dev@jamkazam.com' config.email_alerts_alias = ENV['ALERT_EMAIL'] || 'alerts-dev@jamkazam.com' + config.guard_against_fraud = true end