diff --git a/Gemfile.lock b/Gemfile.lock index 69e7dc8a..4e998d90 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - oauth2 (0.1.0) + oauth2 (0.1.1) faraday (~> 0.5.0) multi_json (~> 0.0.4) diff --git a/lib/oauth2/access_token.rb b/lib/oauth2/access_token.rb index 0b33e104..e53d15fa 100644 --- a/lib/oauth2/access_token.rb +++ b/lib/oauth2/access_token.rb @@ -1,6 +1,7 @@ module OAuth2 class AccessToken attr_reader :client, :token, :refresh_token, :expires_in, :expires_at + attr_accessor :token_param def initialize(client, token, refresh_token = nil, expires_in = nil, params = {}) @client = client @@ -9,6 +10,7 @@ def initialize(client, token, refresh_token = nil, expires_in = nil, params = {} @expires_in = (expires_in.nil? || expires_in == '') ? nil : expires_in.to_i @expires_at = Time.now + @expires_in if @expires_in @params = params + @token_param = 'access_token' end def [](key) @@ -21,7 +23,9 @@ def expires? end def request(verb, path, params = {}, headers = {}) - @client.request(verb, path, params.merge('access_token' => @token), headers.merge('Authorization' => "Token token=\"#{@token}\"")) + params = params.merge token_param => @token + headers = headers.merge 'Authorization' => "OAuth #{@token}" + @client.request(verb, path, params, headers) end def get(path, params = {}, headers = {})