X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b8f6dbd403507edd14f04f3151c285e232607360..315d1dab540ad5c11e7a22201387327525578229:/app/models/oauth_token.rb diff --git a/app/models/oauth_token.rb b/app/models/oauth_token.rb index 5fca40ce2..0fe0bea30 100644 --- a/app/models/oauth_token.rb +++ b/app/models/oauth_token.rb @@ -1,16 +1,20 @@ class OauthToken < ActiveRecord::Base belongs_to :client_application belongs_to :user + + scope :authorized, -> { where("authorized_at IS NOT NULL and invalidated_at IS NULL") } + validates_uniqueness_of :token - validates_presence_of :client_application, :token, :secret - before_validation_on_create :generate_keys + 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? @@ -24,8 +28,7 @@ class OauthToken < ActiveRecord::Base protected def generate_keys - @oauth_token = client_application.oauth_server.generate_credentials - self.token = @oauth_token[0] - self.secret = @oauth_token[1] + self.token = OAuth::Helper.generate_key(40)[0,40] + self.secret = OAuth::Helper.generate_key(40)[0,40] end end