Remove some DeviceTracking namespace classes

app/controllers/events_controller.rb

@@ -22,9 +22,13 @@ def show
 
   def device_and_events
     user_id = current_user.id
-    @events = DeviceTracking::ListDeviceEvents.call(user_id, device_id, 0, EVENTS_PAGE_SIZE).
-              map(&:decorate)
-    @device = Device.where(user_id: user_id).find(device_id)
+    device = Device.where(user_id: user_id).find(device_id)
+    return if !device
+
+    @events = Event.where(user_id: user_id, device_id: device.id).order(created_at: :desc).
+      limit(EVENTS_PAGE_SIZE).
+      map(&:decorate)
+    @device = device.decorate
   end
 
   def device_id

app/controllers/users/forget_all_browsers_controller.rb

@@ -7,7 +7,7 @@ def show
     end
 
     def destroy
-      DeviceTracking::ForgetAllBrowsers.new(current_user).call
+      ForgetAllBrowsers.new(current_user).call
 
       analytics.track_event(Analytics::FORGET_ALL_BROWSERS_SUBMITTED)
 

app/decorators/device_decorator.rb

@@ -1,5 +1,5 @@
 DeviceDecorator = Struct.new(:device) do
-  delegate :nice_name, :last_used_at, :id, to: :device
+  delegate :last_used_at, :id, to: :device
 
   def last_sign_in_location_and_ip
     I18n.t('account.index.sign_in_location_and_ip', location: last_location, ip: device.last_ip)
@@ -12,4 +12,13 @@ def last_location
   def happened_at
     device.last_used_at.utc
   end
+
+  def nice_name
+    browser = BrowserCache.parse(device.user_agent)
+    I18n.t(
+      'account.index.device',
+      browser: "#{browser.name} #{browser.version}",
+      os: "#{browser.platform.name} #{browser.platform.version.split('.').first}",
+    )
+  end
 end

app/decorators/user_decorator.rb

@@ -143,7 +143,8 @@ def identity_events
   end
 
   def recent_devices
-    DeviceTracking::ListDevices.call(user.id, 0, MAX_RECENT_DEVICES).map(&:decorate)
+    @recent_devices ||= user.devices.order(last_used_at: :desc).limit(MAX_RECENT_DEVICES).
+      map(&:decorate)
   end
 
   def devices?

app/models/device.rb

@@ -13,7 +13,11 @@ def decorate
     DeviceDecorator.new(self)
   end
 
-  def device_name
-    DeviceTracking::DeviceName.call(self)
+  # @return [Device]
+  def update_last_used_ip(remote_ip, now: Time.zone.now)
+    self.last_used_at = now
+    self.last_ip = remote_ip
+    save
+    self
   end
 end

app/services/forget_all_browsers.rb

@@ -0,0 +1,17 @@
+class ForgetAllBrowsers
+  attr_reader :user, :remember_device_revoked_at
+
+  def initialize(user, remember_device_revoked_at: nil)
+    @user = user
+    @remember_device_revoked_at = remember_device_revoked_at || Time.zone.now
+  end
+
+  def call
+    UpdateUser.new(
+      user: user,
+      attributes: {
+        remember_device_revoked_at: remember_device_revoked_at,
+      },
+    ).call
+  end
+end

app/services/reset_user_password.rb

@@ -20,7 +20,7 @@ def reset_user_password
   end
 
   def forget_all_browsers
-    DeviceTracking::ForgetAllBrowsers.new(
+    ForgetAllBrowsers.new(
       user,
       remember_device_revoked_at: remember_device_revoked_at,
     ).call

app/services/user_event_creator.rb

@@ -1,4 +1,6 @@
 class UserEventCreator
+  COOKIE_LENGTH = 128
+
   attr_reader :request, :current_user
 
   def initialize(current_user:, request: nil)
@@ -8,7 +10,7 @@ def initialize(current_user:, request: nil)
 
   def create_user_event(event_type, user = current_user)
     return unless user&.id
-    existing_device = DeviceTracking::LookupDeviceForUser.call(user.id, cookies[:device])
+    existing_device = Device.find_by(user_id: user.id, cookie_uuid: cookies[:device])
     if existing_device.present?
       create_event_for_existing_device(event_type: event_type, user: user, device: existing_device)
     else
@@ -30,7 +32,7 @@ def create_user_event_with_disavowal(event_type, user = current_user)
   private
 
   def create_event_for_existing_device(event_type:, user:, device:)
-    DeviceTracking::UpdateDevice.call(device, request.remote_ip)
+    device.update_last_used_ip(request.remote_ip)
     create_event_for_device(event_type: event_type, user: user, device: device)
   end
 
@@ -47,8 +49,14 @@ def create_event_for_new_device(event_type:, user:)
   end
 
   def create_device_for_user(user)
-    device = DeviceTracking::CreateDevice.call(
-      user.id, request.remote_ip, request.user_agent, cookies[:device]
+    cookie_uuid = cookies[:device].presence || SecureRandom.hex(COOKIE_LENGTH / 2)
+
+    device = Device.create!(
+      user: user,
+      user_agent: request.user_agent.to_s,
+      cookie_uuid: cookie_uuid,
+      last_used_at: Time.zone.now,
+      last_ip: request.remote_ip,
     )
     assign_device_cookie(device.cookie_uuid)
     device

app/views/events/show.html.erb

@@ -11,7 +11,7 @@
 <div class="margin-bottom-4 card profile-info-box">
   <div class="border-bottom border-primary-light">
     <h2 class="margin-top-0">
-      <%= @device.device_name %>
+      <%= @device.nice_name %>
     </h2>
 
     <% @events.each do |event| %>

spec/decorators/device_decorator_spec.rb

@@ -0,0 +1,12 @@
+require 'rails_helper'
+
+RSpec.describe DeviceDecorator do
+  let(:device) { create(:device) }
+  subject(:decorator) { DeviceDecorator.new(device) }
+
+  describe '#nice_name' do
+    it 'gives a shortened os and browser name' do
+      expect(decorator.nice_name).to eq('Chrome 58 on Windows 10')
+    end
+  end
+end

spec/models/device_spec.rb

@@ -15,4 +15,20 @@
       expect(device).to be_valid
     end
   end
+
+  describe '#update_last_used_ip' do
+    let(:user) { create(:user) }
+    let(:remote_ip) { '1.2.3.4' }
+    let(:user_agent) { 'Chrome/58.0.3029.110 Safari/537.36' }
+    let(:uuid) { 'abc123' }
+    let(:now) { Time.zone.now }
+    let(:old_timestamp) { now - 1.hour }
+    let(:device) { create(:device, last_used_at: old_timestamp) }
+
+    it 'updates the last ip and last_used_at' do
+      expect { device.update_last_used_ip(remote_ip) }.
+        to(change { device.reload.last_used_at.to_i }.from(old_timestamp.to_i).to(now.to_i).
+          and(change { device.reload.last_ip }.to(remote_ip)))
+    end
+  end
 end