suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:travis-ci/travis-api

Browse Source
This commit is contained in:
Sven Fuchs 2012-09-27 22:54:26 +02:00
commit 5271f21d3c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/travis/api/app/endpoint/authorization.rb
View File

@ -126,13 +126,18 @@ class Travis::Api::App
private private
def oauth_endpoint
proxy = Travis.config.oauth2.proxy
proxy ? File.join(proxy, request.fullpath) : url
end
def handshake def handshake
config = Travis.config.oauth2 config = Travis.config.oauth2
endpoint = Addressable::URI.parse(config.authorization_server) endpoint = Addressable::URI.parse(config.authorization_server)
values = { values = {
client_id: config.client_id, client_id: config.client_id,
scope: config.scope, scope: config.scope,
redirect_uri: url redirect_uri: oauth_endpoint
} }
if params[:code] and state_ok?(params[:state]) if params[:code] and state_ok?(params[:state])