X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/52e5fa6ad78f375cec5a207a123a4aa3939c8ddf..34e3e51456774127d43408b7ab65c24f41373f62:/app/models/oauth_token.rb diff --git a/app/models/oauth_token.rb b/app/models/oauth_token.rb index b38fe0ec0..bd3d57496 100644 --- a/app/models/oauth_token.rb +++ b/app/models/oauth_token.rb @@ -2,31 +2,31 @@ class OauthToken < ActiveRecord::Base belongs_to :client_application belongs_to :user - scope :authorized, where("authorized_at IS NOT NULL and invalidated_at IS NULL") + scope :authorized, -> { where("authorized_at IS NOT NULL and invalidated_at IS NULL") } validates_uniqueness_of :token validates_presence_of :client_application, :token before_validation :generate_keys, :on => :create - + def invalidated? invalidated_at != nil end - + def invalidate! - update_attribute(:invalidated_at, Time.now) + update_attributes(:invalidated_at => Time.now) end - + def authorized? authorized_at != nil && !invalidated? end - + def to_query "oauth_token=#{token}&oauth_token_secret=#{secret}" end - + protected - + def generate_keys self.token = OAuth::Helper.generate_key(40)[0,40] self.secret = OAuth::Helper.generate_key(40)[0,40]