Merge remote-tracking branch 'upstream/pull/3482'

[rails.git] / app / models / oauth_token.rb

diff --git a/app/models/oauth_token.rb b/app/models/oauth_token.rb
index fd332723f25c07333cf2ca5d2483ea671887f121..b4519efe21642a0b60693e6279d2eeb32d59fde7 100644 (file)
--- a/app/models/oauth_token.rb
+++ b/app/models/oauth_token.rb
@@ -35,9 +35,9 @@
 #  oauth_tokens_user_id_fkey                (user_id => users.id)
 #
 
-class OauthToken < ActiveRecord::Base
-  belongs_to :client_application
-  belongs_to :user
+class OauthToken < ApplicationRecord
+  belongs_to :client_application, :optional => true
+  belongs_to :user, :optional => true
 
   scope :authorized, -> { where("authorized_at IS NOT NULL and invalidated_at IS NULL") }
 
@@ -52,7 +52,7 @@ class OauthToken < ActiveRecord::Base
   end
 
   def invalidate!
-    update_attributes(:invalidated_at => Time.now)
+    update(:invalidated_at => Time.now)
   end
 
   def authorized?