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

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

diff --git a/app/models/oauth2_verifier.rb b/app/models/oauth2_verifier.rb
index 4dcce5588ff8756b451d80cdeeed20918e7dc58c..1613eabeb516701976889d4550a8fa715126f074 100644 (file)
--- a/app/models/oauth2_verifier.rb
+++ b/app/models/oauth2_verifier.rb
@@ -1,5 +1,43 @@
+# == 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 Oauth2Verifier < OauthToken
 class Oauth2Verifier < OauthToken

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

   attr_accessor :state
 
   def exchange!(_params = {})
   attr_accessor :state
 
   def exchange!(_params = {})


@@ -20,7 +58,7 @@ class Oauth2Verifier < OauthToken
 
   def to_query
     q = "code=#{token}"
 
   def to_query
     q = "code=#{token}"

-    q << "&state=#{URI.escape(state)}" if @state
+    q << "&state=#{CGI.escape(state)}" if @state

     q
   end
 
     q
   end
 


@@ -29,6 +67,6 @@ class Oauth2Verifier < OauthToken
   def generate_keys
     self.token = OAuth::Helper.generate_key(20)[0, 20]
     self.expires_at = 10.minutes.from_now
   def generate_keys
     self.token = OAuth::Helper.generate_key(20)[0, 20]
     self.expires_at = 10.minutes.from_now

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

   end
 end
   end
 end