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

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

diff --git a/app/models/oauth2_token.rb b/app/models/oauth2_token.rb
index 6dd421ab13c80255f075a7a28d457cc29b1ca4c4..2c0b1f50814b63e283f868df060ffba4c56ecf34 100644 (file)
--- a/app/models/oauth2_token.rb
+++ b/app/models/oauth2_token.rb
@@ -2,16 +2,16 @@ class Oauth2Token < AccessToken
   attr_accessor :state
 
   def as_json(_options = {})
-    d = { :access_token => token, :token_type => 'bearer' }
+    d = { :access_token => token, :token_type => "bearer" }
     d[:expires_in] = expires_in if expires_at
     d
   end
 
   def to_query
     q = "access_token=#{token}&token_type=bearer"
-    q << "&state=#{URI.escape(state)}" if @state
+    q << "&state=#{CGI.escape(state)}" if @state
     q << "&expires_in=#{expires_in}" if expires_at
-    q << "&scope=#{URI.escape(scope)}" if scope
+    q << "&scope=#{CGI.escape(scope)}" if scope
     q
   end