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

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

diff --git a/app/models/access_token.rb b/app/models/access_token.rb
index 3aa6f9daf7fddfd587f5ae6f81b77942b9755d00..d2c0dba1ce85a93e39b7838f0e6b1bcbd24f88e5 100644 (file)
--- a/app/models/access_token.rb
+++ b/app/models/access_token.rb
@@ -1,16 +1,57 @@
+# == Schema Information
+#
+# Table name: oauth_tokens
+#
+#  id                    :integer          not null, primary key
+#  user_id               :integer
+#  type                  :string(20)
+#  client_application_id :integer
+#  token                 :string(50)
+#  secret                :string(50)
+#  authorized_at         :datetime
+#  invalidated_at        :datetime
+#  created_at            :datetime
+#  updated_at            :datetime
+#  allow_read_prefs      :boolean          default(FALSE), not null
+#  allow_write_prefs     :boolean          default(FALSE), not null
+#  allow_write_diary     :boolean          default(FALSE), not null
+#  allow_write_api       :boolean          default(FALSE), not null
+#  allow_read_gpx        :boolean          default(FALSE), not null
+#  allow_write_gpx       :boolean          default(FALSE), not null
+#  callback_url          :string
+#  verifier              :string(20)
+#  scope                 :string
+#  valid_to              :datetime
+#  allow_write_notes     :boolean          default(FALSE), not null
+#
+# Indexes
+#
+#  index_oauth_tokens_on_token    (token) UNIQUE
+#  index_oauth_tokens_on_user_id  (user_id)
+#
+# Foreign Keys
+#
+#  oauth_tokens_client_application_id_fkey  (client_application_id => client_applications.id)
+#  oauth_tokens_user_id_fkey                (user_id => users.id)
+#
+

 class AccessToken < OauthToken
 class AccessToken < OauthToken

-  belongs_to :user
-  belongs_to :client_application
+  belongs_to :user, :optional => true
+  belongs_to :client_application, :optional => true

 
   scope :valid, -> { where(:invalidated_at => nil) }
 
 
   scope :valid, -> { where(:invalidated_at => nil) }
 

-  validates_presence_of :user, :secret
+  validates :user, :secret, :presence => true

 
   before_create :set_authorized_at
 
   before_create :set_authorized_at

-  
-protected 
-  
+
+  def includes_scope?(scope)
+    self[:"allow_#{scope}"]
+  end
+
+  protected
+

   def set_authorized_at
   def set_authorized_at

-    self.authorized_at = Time.now
+    self.authorized_at = Time.now.utc

   end
 end
   end
 end